diff --git a/.github/scripts/portrait-avd.sh b/.github/scripts/portrait-avd.sh
new file mode 100755
index 000000000..caf84da96
--- /dev/null
+++ b/.github/scripts/portrait-avd.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+#
+# Turns the AVD panel portrait, as the pre-emulator-launch-script of
+# android-emulator-runner. The tablet panels are landscape and rely on
+# hw.initialOrientation, which the emulator ignores with -no-window.
+
+set -euo pipefail
+
+CONFIG="$HOME/.android/avd/${AVD_NAME:-test}.avd/config.ini"
+
+width=$(grep '^hw.lcd.width=' "$CONFIG" | cut -d= -f2)
+height=$(grep '^hw.lcd.height=' "$CONFIG" | cut -d= -f2)
+
+# config.ini is an unordered list of key=value, so dropping the old line and
+# appending the new one is enough, and unlike sed -i that behaves the same
+# on a runner and on a Mac
+set_property() {
+  grep -v "^$1=" "$CONFIG" > "$CONFIG.tmp" || true
+  echo "$1=$2" >> "$CONFIG.tmp"
+  mv "$CONFIG.tmp" "$CONFIG"
+}
+
+# Short edge first, which leaves an already portrait panel as it is
+set_property hw.lcd.width "$((width < height ? width : height))"
+set_property hw.lcd.height "$((width < height ? height : width))"
+
+grep -E '^hw\.lcd\.(width|height)' "$CONFIG"
diff --git a/.github/scripts/take-screenshots.sh b/.github/scripts/take-screenshots.sh
new file mode 100755
index 000000000..b05009dc4
--- /dev/null
+++ b/.github/scripts/take-screenshots.sh
@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+#
+# Drives the screenshot test in blocks of languages, a whole run's screenshots
+# do not survive the hand-over to the driver. See integration_test/README.md.
+
+set -euo pipefail
+
+blocks=5
+attempts=3
+block_timeout=10m
+
+# Homebrew installs coreutils under the g-prefixed names only
+timeout=$(command -v timeout || command -v gtimeout) || {
+  echo "Found neither timeout nor gtimeout, install coreutils"
+  exit 1
+}
+
+device_type=${1:?Usage: take-screenshots.sh <device type> [flutter drive args]}
+shift
+
+# flutter drive gives up within seconds on an offline device, so wait for it
+# to come back instead of burning the next attempt on it
+wait_for_device() {
+  adb devices | tail -n +2 | grep -q . || return 0
+  adb reconnect offline || true
+  "$timeout" 120s adb wait-for-device shell \
+    'while [ "$(getprop sys.boot_completed)" != 1 ]; do sleep 2; done' || true
+}
+
+for block in $(seq "$blocks"); do
+  for attempt in $(seq "$attempts"); do
+    status=0
+    # Both the Xcode build and the driver's connect retry forever on their own.
+    # timeout signals the whole process group, so no dart child survives.
+    "$timeout" --kill-after=30s "$block_timeout" flutter drive \
+      --driver=test_driver/screenshot_driver.dart \
+      --target=integration_test/make_screenshots_test.dart \
+      --dart-define=DEVICE_TYPE="$device_type" \
+      --dart-define=LANGUAGES="$block/$blocks" \
+      "$@" || status=$?
+
+    if [ "$status" -eq 0 ]; then
+      break
+    fi
+
+    if [ "$attempt" -eq "$attempts" ]; then
+      echo "Block $block still fails after $attempts attempts, giving up"
+      exit 1
+    fi
+
+    # Usually the device went offline while handing the images over
+    echo "Block $block failed with $status, attempt $((attempt + 1)) of $attempts"
+    wait_for_device
+  done
+done
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/build-linux.yml b/.github/workflows/build-linux.yml
index 72c57b692..3124bab7e 100644
--- a/.github/workflows/build-linux.yml
+++ b/.github/workflows/build-linux.yml
@@ -97,8 +97,8 @@ jobs:
 
       - name: Push updated config to flathub repository
         run: |
-          git config user.name "github-actions"
-          git config user.email "github-actions@github.com"
+          git config user.name git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git checkout -b release-${{ inputs.ref }}
           git add -A
           git commit -m "Update to ${{ inputs.ref }}"
diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml
index 5f7205ea9..4daecacaa 100644
--- a/.github/workflows/bump-version.yml
+++ b/.github/workflows/bump-version.yml
@@ -52,8 +52,8 @@ jobs:
 
       - name: Tag release and commit pubspec
         run: |
-          git config user.name Github-Actions
-          git config user.email github-actions@github.com
+          git config user.name git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git add pubspec.yaml flatpak/de.wger.flutter.metainfo.xml
           git commit -m "Bump version to ${{ inputs.app_version }}"
           git tag ${{ inputs.app_version }}
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/.github/workflows/linter.yml.bak b/.github/workflows/linter.yml.bak
index e3665a58c..34742cb74 100644
--- a/.github/workflows/linter.yml.bak
+++ b/.github/workflows/linter.yml.bak
@@ -31,8 +31,8 @@ jobs:
       - name: Push a commit with the changed files
         continue-on-error: true
         run: |
-          git config user.name Github-actions
-          git config user.email github-actions@github.com
+          git config user.name git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git add .
           git commit -m "Automatic linting"
           git push
diff --git a/.github/workflows/screenshots.yml b/.github/workflows/screenshots.yml
index 2cc55955d..98083c6bc 100644
--- a/.github/workflows/screenshots.yml
+++ b/.github/workflows/screenshots.yml
@@ -12,8 +12,26 @@ permissions:
 
 jobs:
   screenshots_apple:
-    name: 'iOS'
+    name: 'Apple - ${{ matrix.device.name }}'
     runs-on: macos-latest
+    # A clean run takes about 30 minutes, the script may retry a block twice
+    timeout-minutes: 75
+    strategy:
+      # The jobs write into separate folders and a flaky one should not take
+      # the healthy ones down with it
+      fail-fast: false
+      matrix:
+        device:
+          # Apple only needs the largest device per family, the smaller ones
+          # are scaled down by App Store Connect
+          - name: "iPhone 6.9in"
+            simulator: iPhone 17 Pro Max
+            device_type: iOSPhoneBig
+            folder: iPhone 6.9
+          - name: "iPad 13in"
+            simulator: iPad Pro 13-inch
+            device_type: iOSTabletBig
+            folder: iPad 13
     steps:
       - uses: actions/checkout@v7
 
@@ -23,34 +41,50 @@ jobs:
       - name: Boot iOS simulator
         id: boot
         run: |
-          SIMULATOR=$(xcrun simctl list devices available | awk -F '[()]' '/iPhone 17/{print $2; exit}')
+          # Match the UDID explicitly, some device names contain parentheses themselves
+          SIMULATOR=$(xcrun simctl list devices available \
+            | grep -m1 '${{ matrix.device.simulator }}' \
+            | grep -oE '[0-9A-F]{8}(-[0-9A-F]{4}){3}-[0-9A-F]{12}')
+          if [ -z "$SIMULATOR" ]; then
+            echo "No available simulator matching '${{ matrix.device.simulator }}'"
+            xcrun simctl list devices available
+            exit 1
+          fi
           echo "SIMULATOR=$SIMULATOR" >> $GITHUB_ENV
           xcrun simctl boot "$SIMULATOR" || true
           open -a Simulator || true
           n=0; until xcrun simctl bootstatus "$SIMULATOR" -b || [ $n -ge 60 ]; do sleep 1; n=$((n+1)); done
 
+      # The image ships no GNU coreutils, take-screenshots.sh needs gtimeout
+      - name: Install coreutils
+        run: brew install coreutils
+
       - name: Generate screenshots
-        run: |
-          flutter drive --driver=test_driver/screenshot_driver.dart --target=integration_test/make_screenshots_test.dart --dart-define=DEVICE_TYPE=iOSPhoneBig -d "$SIMULATOR"
+        run: .github/scripts/take-screenshots.sh ${{ matrix.device.device_type }} -d "$SIMULATOR"
 
       - name: Upload screenshots
         uses: actions/upload-artifact@v7
         with:
-          name: screenshots-ios
-          path: fastlane/metadata/ios/**/images/iPhone 6.9/*.png
+          name: screenshots-ios-${{ matrix.device.device_type }}
+          path: fastlane/metadata/ios/**/images/${{ matrix.device.folder }}/*.png
 
   screenshots_android:
     name: 'Android - ${{ matrix.device.name }}'
     runs-on: ubuntu-latest
+    # A clean run takes about 25 minutes, the script may retry a block twice
+    timeout-minutes: 60
     strategy:
+      # The jobs write into separate folders and a flaky one should not take
+      # the healthy ones down with it
+      fail-fast: false
       matrix:
         device:
           - name: "Phone"
-            profile: pixel_7_pro
+            profile: pixel_10
             device_type: androidPhone
             folder: phoneScreenshots
           - name: "Tablet 7in"
-            profile: 7in WSVGA (Tablet)
+            profile: small_tablet
             device_type: androidTabletSmall
             folder: sevenInchScreenshots
           - name: "Tablet 10in"
@@ -70,7 +104,23 @@ jobs:
           sudo udevadm trigger --name-match=kvm
 
       - name: Accept Android SDK licenses
-        run: yes | sdkmanager --licenses || true
+        run: yes | "${ANDROID_HOME:?}/cmdline-tools/latest/bin/sdkmanager" --licenses || true
+
+      # The runner image ships command line tools 12.0, which does not have the
+      # device definitions we need.
+      - name: Install current SDK command line tools
+        run: |
+          SDK="${ANDROID_HOME:?}/cmdline-tools"
+          yes | "$SDK/latest/bin/sdkmanager" --install "cmdline-tools;22.0"
+          rm -rf "$SDK/latest"
+          mv "$SDK/22.0" "$SDK/latest"
+          "$SDK/latest/bin/sdkmanager" --version
+
+      # Fail here rather than after the system image download
+      - name: Check the device profile exists
+        run: |
+          "${ANDROID_HOME:?}/cmdline-tools/latest/bin/avdmanager" list device --compact \
+            | grep -qx '${{ matrix.device.profile }}'
 
       # Free up disk space on the runner. List taken from
       # https://github.com/flathub-infra/vorarbeiter/blob/main/.github/workflows/build.yml
@@ -109,15 +159,16 @@ jobs:
           target: google_apis
           arch: x86_64
           profile: ${{ matrix.device.profile }}
-          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          emulator-options: -no-snapshot-save -no-window -no-metrics -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: true
-          script: |           
-            flutter drive --driver=test_driver/screenshot_driver.dart --target=integration_test/make_screenshots_test.dart --dart-define=DEVICE_TYPE=${{ matrix.device.device_type }}
+          pre-emulator-launch-script: .github/scripts/portrait-avd.sh
+          # The action runs every line of this as its own sh -c, so no loops here
+          script: .github/scripts/take-screenshots.sh ${{ matrix.device.device_type }}
 
       - name: Upload screenshots
         uses: actions/upload-artifact@v7
         with:
-          name: screenshots-android-${{ matrix.device.folder }}
+          name: screenshots-android-${{ matrix.device.device_type }}
           path: fastlane/metadata/android/**/images/${{ matrix.device.folder }}/*.png
 
   commit_screenshots:
@@ -141,17 +192,19 @@ jobs:
       - name: Merge artifacts into fastlane/metadata
         run: |
           set -euo pipefail
-          rsync --archive --checksum --itemize-changes "screenshots/screenshots-android-phoneScreenshots/" fastlane/metadata/android/
-          rsync --archive --checksum --itemize-changes "screenshots/screenshots-android-sevenInchScreenshots/" fastlane/metadata/android/
-          rsync --archive --checksum --itemize-changes "screenshots/screenshots-android-tenInchScreenshots/" fastlane/metadata/android/
-          rsync --archive --checksum --itemize-changes "screenshots/screenshots-ios/" fastlane/metadata/ios/
+          for artifact in screenshots/screenshots-android-*/; do
+            rsync --archive --checksum --itemize-changes "$artifact" fastlane/metadata/android/
+          done
+          for artifact in screenshots/screenshots-ios-*/; do
+            rsync --archive --checksum --itemize-changes "$artifact" fastlane/metadata/ios/
+          done
 
       - name: Commit screenshots to a dated branch
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           git config user.name "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git add fastlane/metadata/android fastlane/metadata/ios || true
           if git diff --staged --quiet; then
             echo "No new or changed screenshots to commit."
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..e915ca00c 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,58 @@
 package de.wger.flutter
 
-import io.flutter.embedding.android.FlutterActivity
+import android.content.ActivityNotFoundException
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import io.flutter.embedding.android.FlutterFragmentActivity
 
-class MainActivity: FlutterActivity() {
+class MainActivity: FlutterFragmentActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        // Started only to show the policy, so there is nothing to come back to
+        if (isPrivacyPolicyRequest(intent) && openPrivacyPolicy()) {
+            finish()
+        }
+    }
+
+    override fun onNewIntent(intent: Intent) {
+        super.onNewIntent(intent)
+
+        // The app was already running, it stays open behind the browser
+        if (isPrivacyPolicyRequest(intent)) {
+            openPrivacyPolicy()
+        }
+    }
+
+    private fun isPrivacyPolicyRequest(intent: Intent?): Boolean {
+        val action = intent?.action ?: return false
+        return action in PRIVACY_POLICY_ACTIONS
+    }
+
+    /** Returns false when no browser took the intent, so the app stays open. */
+    private fun openPrivacyPolicy(): Boolean {
+        return try {
+            startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(PRIVACY_POLICY_URL)))
+            true
+        } catch (e: ActivityNotFoundException) {
+            false
+        }
+    }
+
+    companion object {
+        // Health Connect starts the app with these when the user asks for its
+        // privacy policy: from the permission dialog, and from the system
+        // settings on Android 14 and later. Both are declared in the manifest.
+        private val PRIVACY_POLICY_ACTIONS = setOf(
+            "androidx.health.ACTION_SHOW_PERMISSIONS_RATIONALE",
+            "android.intent.action.VIEW_PERMISSION_USAGE",
+        )
+
+        // The page of PRIVACY_POLICY_URL in lib/core/consts.dart, at the
+        // section describing the health import
+        private const val PRIVACY_POLICY_URL =
+            "https://wger.de/software/terms-of-service#health-data"
+    }
 }
diff --git a/fastlane/metadata/android/ar/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/ar/images/phoneScreenshots/06 - weight.png
deleted file mode 100644
index e1326c3f6..000000000
--- a/fastlane/metadata/android/ar/images/phoneScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:01f66cebfa4d565ec94c1146e417a509a211096d1290f5f2db010c326e3ca903
-size 218281
diff --git a/fastlane/metadata/android/ar/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/ar/images/sevenInchScreenshots/06 - weight.png
deleted file mode 100644
index 81ec52a1f..000000000
--- a/fastlane/metadata/android/ar/images/sevenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:39cea85d70313976f170cb5d9b16c4d6e86f9d8e1add6550a1667fcc2d3055bb
-size 53482
diff --git a/fastlane/metadata/android/ar/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/ar/images/tenInchScreenshots/06 - weight.png
deleted file mode 100644
index e2d0e4928..000000000
--- a/fastlane/metadata/android/ar/images/tenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:61dccd251a0451278a96aa6380b7d0a97c458b00e667cc64e36dcfdd8e3f4712
-size 142935
diff --git a/fastlane/metadata/android/ca/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/ca/images/phoneScreenshots/06 - weight.png
deleted file mode 100644
index 5377dd533..000000000
--- a/fastlane/metadata/android/ca/images/phoneScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:025f6df558768eb1fc1f6b57c327867da8e00dded7679d1df1f3a31600aa55f3
-size 187951
diff --git a/fastlane/metadata/android/ca/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/ca/images/sevenInchScreenshots/06 - weight.png
deleted file mode 100644
index 9573d0290..000000000
--- a/fastlane/metadata/android/ca/images/sevenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:489c56691e2d2b976f2e0a5861a55e8a9ca37676149a2d745bbb30afdcd602c0
-size 52491
diff --git a/fastlane/metadata/android/ca/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/ca/images/tenInchScreenshots/06 - weight.png
deleted file mode 100644
index caf640f9e..000000000
--- a/fastlane/metadata/android/ca/images/tenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:15ed751b0e8ebf81357e51d388973a8ad967c337f2a10bb69a94dfe2cd05dbc3
-size 131743
diff --git a/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/06 - weight.png
deleted file mode 100644
index 3d9cc5226..000000000
--- a/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:46a66b00f5b2d725ffba8a70b7d495609655e00531e59d4a5e872d7b8e71a973
-size 186422
diff --git a/fastlane/metadata/android/cs-CZ/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/cs-CZ/images/sevenInchScreenshots/06 - weight.png
deleted file mode 100644
index 174fe7faf..000000000
--- a/fastlane/metadata/android/cs-CZ/images/sevenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:79a5935dc81bd05a8945bd84b182e970ead19f9e31fbaa4463b840e86c6613c3
-size 50568
diff --git a/fastlane/metadata/android/cs-CZ/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/cs-CZ/images/tenInchScreenshots/06 - weight.png
deleted file mode 100644
index f6809c691..000000000
--- a/fastlane/metadata/android/cs-CZ/images/tenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a802fcc40bdecb47f6c6b65d736ea5d8d741ac9706ef2b41b19e00c99c0fe78a
-size 127564
diff --git a/fastlane/metadata/android/de-DE/images/phoneScreenshots/01 - dashboard.png b/fastlane/metadata/android/de-DE/images/phoneScreenshots/01 - dashboard.png
index dd5840eb7..1cd6a63bd 100644
--- a/fastlane/metadata/android/de-DE/images/phoneScreenshots/01 - dashboard.png	
+++ b/fastlane/metadata/android/de-DE/images/phoneScreenshots/01 - dashboard.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7e49fdbcc47934120b3be3233aa5162dd223390f98db6ac8db645d9e607bcf61
-size 298290
+oid sha256:f7d4871d99b1372c33304b4dd7e14c80b696a00523bec7c5397ebae7b388c3e1
+size 494801
diff --git a/fastlane/metadata/android/de-DE/images/phoneScreenshots/02 - workout detail.png b/fastlane/metadata/android/de-DE/images/phoneScreenshots/02 - workout detail.png
index 8dd4f003b..13294c1a2 100644
--- a/fastlane/metadata/android/de-DE/images/phoneScreenshots/02 - workout detail.png	
+++ b/fastlane/metadata/android/de-DE/images/phoneScreenshots/02 - workout detail.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6ed36395f118da38d151d13c124d0bd9ed3b4aea7e6808fd7c2ed4f516834df3
-size 228658
+oid sha256:5bf34d9022280caed29f56e553ac83fc0436f69e11bb01ff42a5c66a27ea7987
+size 504030
diff --git a/fastlane/metadata/android/de-DE/images/phoneScreenshots/03 - gym mode.png b/fastlane/metadata/android/de-DE/images/phoneScreenshots/03 - gym mode.png
index 729086279..ef706491c 100644
--- a/fastlane/metadata/android/de-DE/images/phoneScreenshots/03 - gym mode.png	
+++ b/fastlane/metadata/android/de-DE/images/phoneScreenshots/03 - gym mode.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8d91aaf5ff572c1501762dcbebb4829f75fb6be2a0ec73ea91a2dcb569099d4f
-size 174638
+oid sha256:55344c0df5191f29187904e7eacb780da0ff448c5402f0351f3da731509dfd02
+size 383618
diff --git a/fastlane/metadata/android/de-DE/images/phoneScreenshots/04 - measurements.png b/fastlane/metadata/android/de-DE/images/phoneScreenshots/04 - measurements.png
index 3eb46cc12..57bc6ce40 100644
--- a/fastlane/metadata/android/de-DE/images/phoneScreenshots/04 - measurements.png	
+++ b/fastlane/metadata/android/de-DE/images/phoneScreenshots/04 - measurements.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:de2137e8c8e1e50c5deabbd02c0da06446ed21af637e59b966dba5f5070a5fe7
-size 150996
+oid sha256:3060e5f55f1bdef00ee00c897102f43f82b0519d9f797c0d0e777d8e986b39b2
+size 523325
diff --git a/fastlane/metadata/android/de-DE/images/phoneScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/de-DE/images/phoneScreenshots/05 - nutritional plan.png
index 1368b9acb..92cef6805 100644
--- a/fastlane/metadata/android/de-DE/images/phoneScreenshots/05 - nutritional plan.png	
+++ b/fastlane/metadata/android/de-DE/images/phoneScreenshots/05 - nutritional plan.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8b892d4fdc8f0105a4152a52120a42a033e803081582f5a8e553d678a05e4325
-size 202395
+oid sha256:daa3146fc86a547f715c5debf3c99b7f9342dc2bc07a0ff3b944ad4128c1b5f4
+size 409329
diff --git a/fastlane/metadata/android/de-DE/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/de-DE/images/phoneScreenshots/06 - weight.png
deleted file mode 100644
index 382f8e960..000000000
--- a/fastlane/metadata/android/de-DE/images/phoneScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:33ef6320d892a23b14497fe25cc722a8bdc752774c7d9d21b636cc424f77f306
-size 212124
diff --git a/fastlane/metadata/android/de-DE/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/de-DE/images/sevenInchScreenshots/06 - weight.png
deleted file mode 100644
index 7fb2fbd4c..000000000
--- a/fastlane/metadata/android/de-DE/images/sevenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c37c06998578e2815b1a22a896aa5dabdefc955b240c9043e2d84d86a1687fb1
-size 56609
diff --git a/fastlane/metadata/android/de-DE/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/de-DE/images/tenInchScreenshots/06 - weight.png
deleted file mode 100644
index c8608dfd8..000000000
--- a/fastlane/metadata/android/de-DE/images/tenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:24a7c21b8344e6229033425f358e2595d5c8a6fb4c80e551f83581fd89e0e39c
-size 139277
diff --git a/fastlane/metadata/android/el-GR/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/el-GR/images/phoneScreenshots/06 - weight.png
deleted file mode 100644
index 2fd746066..000000000
--- a/fastlane/metadata/android/el-GR/images/phoneScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:65d392b394532c092b60b3e0995d3e129839c4d7fffc019d5a0aeaa4838b5aec
-size 202098
diff --git a/fastlane/metadata/android/el-GR/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/el-GR/images/sevenInchScreenshots/06 - weight.png
deleted file mode 100644
index 6d61292e0..000000000
--- a/fastlane/metadata/android/el-GR/images/sevenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8b6196781cebbffd4562ed58dd52d4c99dd537fccc5ca74a9fb437db207375e6
-size 54659
diff --git a/fastlane/metadata/android/el-GR/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/el-GR/images/tenInchScreenshots/06 - weight.png
deleted file mode 100644
index 430bbf1ab..000000000
--- a/fastlane/metadata/android/el-GR/images/tenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c2b347cc9942b5be3e8c546bf04e819f862c37b57240b92873174d4c0dd7525f
-size 137479
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/06 - weight.png
deleted file mode 100644
index 81ecb2ad5..000000000
--- a/fastlane/metadata/android/en-US/images/phoneScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:732746887cbf2e19e8172b42a3501f0acd7e16fa40537a7a0d5380d1cecc7b9e
-size 198695
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/06 - weight.png
deleted file mode 100644
index 0070ef9a5..000000000
--- a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cd13903252d81ddd70aedebbe110b81f0bb6a79f000ad52a5522ab517fff498e
-size 54007
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/06 - weight.png
deleted file mode 100644
index 3318384f1..000000000
--- a/fastlane/metadata/android/en-US/images/tenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:75a9cb986f5f8cc101ab8e6acbf44294c352417fb30627983cc2a122d3384596
-size 136336
diff --git a/fastlane/metadata/android/es-ES/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/es-ES/images/phoneScreenshots/06 - weight.png
deleted file mode 100644
index df5900ae7..000000000
--- a/fastlane/metadata/android/es-ES/images/phoneScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:55adc8d1c327149107ec5b379fa3e4e0ab39228ee63303fb8b04727ee5a2ee8b
-size 196169
diff --git a/fastlane/metadata/android/es-ES/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/es-ES/images/sevenInchScreenshots/06 - weight.png
deleted file mode 100644
index c6f46ec86..000000000
--- a/fastlane/metadata/android/es-ES/images/sevenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:38fc8eacbbfd795003e46150ce9cc4c4438cfc8314a78b47dc77d8f9dc9dd990
-size 54716
diff --git a/fastlane/metadata/android/es-ES/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/es-ES/images/tenInchScreenshots/06 - weight.png
deleted file mode 100644
index a3150d170..000000000
--- a/fastlane/metadata/android/es-ES/images/tenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:07319b4326954cdcc509acd0fd9ea384d8b9f984da780b15215acd86f323bbae
-size 136169
diff --git a/fastlane/metadata/android/fa-IR/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/fa-IR/images/phoneScreenshots/06 - weight.png
deleted file mode 100644
index 8f9fa7803..000000000
--- a/fastlane/metadata/android/fa-IR/images/phoneScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:939922ece89f4bdb7f38607a57fe96df2eb04f1f376194011325105cf0c0d1a5
-size 192448
diff --git a/fastlane/metadata/android/fa-IR/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/fa-IR/images/sevenInchScreenshots/06 - weight.png
deleted file mode 100644
index 76cb4fe9e..000000000
--- a/fastlane/metadata/android/fa-IR/images/sevenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dd35146a3c2b93fd0c56be052d439b2ac7caefc2c686f63011fbffa48a242d21
-size 46967
diff --git a/fastlane/metadata/android/fa-IR/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/fa-IR/images/tenInchScreenshots/06 - weight.png
deleted file mode 100644
index fdd150ccc..000000000
--- a/fastlane/metadata/android/fa-IR/images/tenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:22f3e642cf788f2231103e62477c41dd6bf405eebe300024ee48042b0c7a79fc
-size 122395
diff --git a/fastlane/metadata/android/fr-FR/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/fr-FR/images/phoneScreenshots/06 - weight.png
deleted file mode 100644
index 7d875da95..000000000
--- a/fastlane/metadata/android/fr-FR/images/phoneScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5dceb519c8cc2b20c8b3400ce6ad32f730acf9c01bfc93435cb1da744c391e15
-size 205417
diff --git a/fastlane/metadata/android/fr-FR/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/fr-FR/images/sevenInchScreenshots/06 - weight.png
deleted file mode 100644
index 8b59d32e8..000000000
--- a/fastlane/metadata/android/fr-FR/images/sevenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5c2e571d2423a3da1498dfb7e636c290e8f0e0670e87ff9f6440ecc57b45df3f
-size 57573
diff --git a/fastlane/metadata/android/fr-FR/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/fr-FR/images/tenInchScreenshots/06 - weight.png
deleted file mode 100644
index e9e35e2d3..000000000
--- a/fastlane/metadata/android/fr-FR/images/tenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bd3616235bcb1301403c113c65ec768c50b1fba3a1784e4940ca44ba6471414c
-size 138310
diff --git a/fastlane/metadata/android/hi-IN/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/hi-IN/images/phoneScreenshots/06 - weight.png
deleted file mode 100644
index 4f07fd4ee..000000000
--- a/fastlane/metadata/android/hi-IN/images/phoneScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8500f2163ecc473850342a93c6b401b35d0a0816c099ade18ae490a280bc5d18
-size 183899
diff --git a/fastlane/metadata/android/hi-IN/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/hi-IN/images/sevenInchScreenshots/06 - weight.png
deleted file mode 100644
index 754319c93..000000000
--- a/fastlane/metadata/android/hi-IN/images/sevenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eb99c62dc5e03075f5efc1be2b43907fad84c74a66a2ddba74b473b9fdd85561
-size 51141
diff --git a/fastlane/metadata/android/hi-IN/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/hi-IN/images/tenInchScreenshots/06 - weight.png
deleted file mode 100644
index 969072bc3..000000000
--- a/fastlane/metadata/android/hi-IN/images/tenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:007bfebad3aa5b527257c45f575f129b2b15a21274dea2d91023dca5aacabbe7
-size 128540
diff --git a/fastlane/metadata/android/hr/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/hr/images/phoneScreenshots/06 - weight.png
deleted file mode 100644
index ab3cc1c92..000000000
--- a/fastlane/metadata/android/hr/images/phoneScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:16526b4bf3c2f254cea3e9021a6745a657d64f6e3f89bdbcd3d539b16c25d43b
-size 206941
diff --git a/fastlane/metadata/android/hr/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/hr/images/sevenInchScreenshots/06 - weight.png
deleted file mode 100644
index dc277a863..000000000
--- a/fastlane/metadata/android/hr/images/sevenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f1c2af25a8136cb30e7e3d94835191a4bb55c37448a5c8717c3f5e6c640771db
-size 55580
diff --git a/fastlane/metadata/android/hr/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/hr/images/tenInchScreenshots/06 - weight.png
deleted file mode 100644
index 6c5505ea2..000000000
--- a/fastlane/metadata/android/hr/images/tenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:28673131892f33bd6bc77717fcfc9570c565119ec1d3891af328f59dc8aa4f7a
-size 137441
diff --git a/fastlane/metadata/android/it-IT/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/it-IT/images/phoneScreenshots/06 - weight.png
deleted file mode 100644
index 15e6d50ac..000000000
--- a/fastlane/metadata/android/it-IT/images/phoneScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9ae5a1368acb815d2106db84c5d69f9ca5c117ed7febb21e98e81caa5c7ae278
-size 209109
diff --git a/fastlane/metadata/android/it-IT/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/it-IT/images/sevenInchScreenshots/06 - weight.png
deleted file mode 100644
index a70a29c66..000000000
--- a/fastlane/metadata/android/it-IT/images/sevenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:074df039dca8f707d08c87151d01b75b3640b70921c3a81c89bf058f99e0d3ce
-size 57600
diff --git a/fastlane/metadata/android/it-IT/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/it-IT/images/tenInchScreenshots/06 - weight.png
deleted file mode 100644
index b9b5b6442..000000000
--- a/fastlane/metadata/android/it-IT/images/tenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d7543583444b3862d1b5939109fcd7f62622e2b03b44593aa16945c827c09c4a
-size 141404
diff --git a/fastlane/metadata/android/iw-IL/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/iw-IL/images/phoneScreenshots/06 - weight.png
deleted file mode 100644
index bbc7eb878..000000000
--- a/fastlane/metadata/android/iw-IL/images/phoneScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:334035b5bac04243dbea2e6beebf9f886832b08cd835dbd54f93c16c47f7bee7
-size 180721
diff --git a/fastlane/metadata/android/iw-IL/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/iw-IL/images/sevenInchScreenshots/06 - weight.png
deleted file mode 100644
index 4fddae4bb..000000000
--- a/fastlane/metadata/android/iw-IL/images/sevenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:51d1807ccdb0aa9178363a9e8d497534b036e5a02e9aee3b75ee845614809fbe
-size 51723
diff --git a/fastlane/metadata/android/iw-IL/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/iw-IL/images/tenInchScreenshots/06 - weight.png
deleted file mode 100644
index 62ac04474..000000000
--- a/fastlane/metadata/android/iw-IL/images/tenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ea0068a97e45ad06854930f07888d821fb7ca0d62f72a53247fbd75588acd8c0
-size 127237
diff --git a/fastlane/metadata/android/ko-KR/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/ko-KR/images/phoneScreenshots/06 - weight.png
deleted file mode 100644
index 804b9f243..000000000
--- a/fastlane/metadata/android/ko-KR/images/phoneScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8e3d6f099e66721824b478b31631b236fb741aa35e377e844b6c50fc2d34f773
-size 186997
diff --git a/fastlane/metadata/android/ko-KR/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/ko-KR/images/sevenInchScreenshots/06 - weight.png
deleted file mode 100644
index 174f55553..000000000
--- a/fastlane/metadata/android/ko-KR/images/sevenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c4dffe5ec1a0b11cec1f6ff3d97a3cd809a7ac3518de5016b1acd9fb270024dd
-size 51707
diff --git a/fastlane/metadata/android/ko-KR/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/ko-KR/images/tenInchScreenshots/06 - weight.png
deleted file mode 100644
index d3a2fb410..000000000
--- a/fastlane/metadata/android/ko-KR/images/tenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b139b9f2a68598d6cc0a05f5b02e11494f69c57192e8e896ced086c3a95904ff
-size 128244
diff --git a/fastlane/metadata/android/nb-NO/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/nb-NO/images/phoneScreenshots/06 - weight.png
deleted file mode 100644
index 713338149..000000000
--- a/fastlane/metadata/android/nb-NO/images/phoneScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:63f010e1a4ff997e38422ccfc7a6b5df98b6d353cb58272d57cbd5577dfc0c68
-size 191461
diff --git a/fastlane/metadata/android/nb-NO/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/nb-NO/images/sevenInchScreenshots/06 - weight.png
deleted file mode 100644
index 765226576..000000000
--- a/fastlane/metadata/android/nb-NO/images/sevenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:efea3ebd6981291931570c8aeea225ef0cd552458951c1a3cb1b2538a4a29eeb
-size 51657
diff --git a/fastlane/metadata/android/nb-NO/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/nb-NO/images/tenInchScreenshots/06 - weight.png
deleted file mode 100644
index 08ab19b61..000000000
--- a/fastlane/metadata/android/nb-NO/images/tenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:576b6086fa2e9abad4cb6fcbbf683f52d7b48643d16630a365397f06d9f6b94c
-size 129191
diff --git a/fastlane/metadata/android/pl-PL/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/pl-PL/images/phoneScreenshots/06 - weight.png
deleted file mode 100644
index 7f96de914..000000000
--- a/fastlane/metadata/android/pl-PL/images/phoneScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4a2ba1b91f1e4440a07ad6c8051f00ddaf5037cce82503f693e92f7442510380
-size 202585
diff --git a/fastlane/metadata/android/pl-PL/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/pl-PL/images/sevenInchScreenshots/06 - weight.png
deleted file mode 100644
index 61527662c..000000000
--- a/fastlane/metadata/android/pl-PL/images/sevenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8fbd68f6dad717ad213f0ba013aac5398918283a3785c76eba8b0c1bf60f48c6
-size 55232
diff --git a/fastlane/metadata/android/pl-PL/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/pl-PL/images/tenInchScreenshots/06 - weight.png
deleted file mode 100644
index e4e51c9dc..000000000
--- a/fastlane/metadata/android/pl-PL/images/tenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:77f8970bb4b719a3e3b9191778f8592953480d4512dcc10c9f30539da008af42
-size 139018
diff --git a/fastlane/metadata/android/pt-BR/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/pt-BR/images/phoneScreenshots/06 - weight.png
deleted file mode 100644
index 52e1cdc3a..000000000
--- a/fastlane/metadata/android/pt-BR/images/phoneScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:44fbdb5fd69f26d85faff297cf3fba61ad1371cc9fe0f70ac1f7a37c28b747e3
-size 199136
diff --git a/fastlane/metadata/android/pt-BR/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/pt-BR/images/sevenInchScreenshots/06 - weight.png
deleted file mode 100644
index f0097aae7..000000000
--- a/fastlane/metadata/android/pt-BR/images/sevenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e6d19d7aa0e671240458958b1a3b8c7400e577d55edd30db73f6acc421ab2287
-size 55652
diff --git a/fastlane/metadata/android/pt-BR/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/pt-BR/images/tenInchScreenshots/06 - weight.png
deleted file mode 100644
index 0250fb702..000000000
--- a/fastlane/metadata/android/pt-BR/images/tenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3a52d9daba33236e496501d9afe1dc2e5e535ba92fc0dcbedbd31ae2a86b2007
-size 135142
diff --git a/fastlane/metadata/android/pt-PT/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/pt-PT/images/phoneScreenshots/06 - weight.png
deleted file mode 100644
index 8e3b60325..000000000
--- a/fastlane/metadata/android/pt-PT/images/phoneScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cb368d185f586a3f86bebaa1b647df54ebd2f6f3fc3bcc1892bee44b2c39f618
-size 202663
diff --git a/fastlane/metadata/android/pt-PT/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/pt-PT/images/sevenInchScreenshots/06 - weight.png
deleted file mode 100644
index 8e3367150..000000000
--- a/fastlane/metadata/android/pt-PT/images/sevenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:79d89e672adb437fea8b40c4dd7721ea5a685bbfa99987e74a063352b9618adb
-size 55603
diff --git a/fastlane/metadata/android/pt-PT/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/pt-PT/images/tenInchScreenshots/06 - weight.png
deleted file mode 100644
index 668f3c6a8..000000000
--- a/fastlane/metadata/android/pt-PT/images/tenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e1f0b96c0069d47977443b4b8f194a7349be17737e15444f75add17a86e74069
-size 136727
diff --git a/fastlane/metadata/android/ru-RU/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/ru-RU/images/phoneScreenshots/06 - weight.png
deleted file mode 100644
index 5277b3763..000000000
--- a/fastlane/metadata/android/ru-RU/images/phoneScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:02050cdbb2de2156e978921b48c583bdd72296e84ccc318b0082c8e5c65d8882
-size 187487
diff --git a/fastlane/metadata/android/ru-RU/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/ru-RU/images/sevenInchScreenshots/06 - weight.png
deleted file mode 100644
index 2082e8b7e..000000000
--- a/fastlane/metadata/android/ru-RU/images/sevenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:db81702555f7ae16d06154b6573e9032d6be19267c32c6bdb68035c1d44e4691
-size 52690
diff --git a/fastlane/metadata/android/ru-RU/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/ru-RU/images/tenInchScreenshots/06 - weight.png
deleted file mode 100644
index acce92602..000000000
--- a/fastlane/metadata/android/ru-RU/images/tenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1279e1b001c7abfbba4d1ba35ed977a0c639f8641443c95f7bcd4e5bc170a097
-size 130823
diff --git a/fastlane/metadata/android/sr/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/sr/images/phoneScreenshots/06 - weight.png
deleted file mode 100644
index 81ecb2ad5..000000000
--- a/fastlane/metadata/android/sr/images/phoneScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:732746887cbf2e19e8172b42a3501f0acd7e16fa40537a7a0d5380d1cecc7b9e
-size 198695
diff --git a/fastlane/metadata/android/sr/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/sr/images/sevenInchScreenshots/06 - weight.png
deleted file mode 100644
index 0070ef9a5..000000000
--- a/fastlane/metadata/android/sr/images/sevenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cd13903252d81ddd70aedebbe110b81f0bb6a79f000ad52a5522ab517fff498e
-size 54007
diff --git a/fastlane/metadata/android/sr/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/sr/images/tenInchScreenshots/06 - weight.png
deleted file mode 100644
index 3318384f1..000000000
--- a/fastlane/metadata/android/sr/images/tenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:75a9cb986f5f8cc101ab8e6acbf44294c352417fb30627983cc2a122d3384596
-size 136336
diff --git a/fastlane/metadata/android/ta-IN/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/ta-IN/images/phoneScreenshots/06 - weight.png
deleted file mode 100644
index d83e7509d..000000000
--- a/fastlane/metadata/android/ta-IN/images/phoneScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6ae2271670790b3e1f1d13301ce00ab2da19d1b09106fb0925d3d68a96be62f7
-size 281776
diff --git a/fastlane/metadata/android/ta-IN/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/ta-IN/images/sevenInchScreenshots/06 - weight.png
deleted file mode 100644
index fa5288598..000000000
--- a/fastlane/metadata/android/ta-IN/images/sevenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:40f04bf5a65ca6236a271ee56af77c33b3df28c16f4c079a11a2b1eb17ed75e0
-size 77457
diff --git a/fastlane/metadata/android/ta-IN/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/ta-IN/images/tenInchScreenshots/06 - weight.png
deleted file mode 100644
index 0f591b972..000000000
--- a/fastlane/metadata/android/ta-IN/images/tenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d15374edc8c5ef1bf4095b56797db8b5cee1e8c1fff1a4914a63bb8c0cda6a64
-size 188011
diff --git a/fastlane/metadata/android/tr-TR/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/tr-TR/images/phoneScreenshots/06 - weight.png
deleted file mode 100644
index 679eee4dc..000000000
--- a/fastlane/metadata/android/tr-TR/images/phoneScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5d3b74558d969216df53cf188bedd6c1b0e26da3d5229ad82278ad386d474747
-size 194824
diff --git a/fastlane/metadata/android/tr-TR/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/tr-TR/images/sevenInchScreenshots/06 - weight.png
deleted file mode 100644
index 87f128080..000000000
--- a/fastlane/metadata/android/tr-TR/images/sevenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:884195c8f097f5014dbe84581a8709b38eb6341b709db22007f63338a141a8a9
-size 53870
diff --git a/fastlane/metadata/android/tr-TR/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/tr-TR/images/tenInchScreenshots/06 - weight.png
deleted file mode 100644
index a0d69b8c0..000000000
--- a/fastlane/metadata/android/tr-TR/images/tenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f16b9bcfd5381ac695e629c24ab0b55eeb2fb33281a34a7ac267719d535b7d11
-size 134354
diff --git a/fastlane/metadata/android/uk/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/uk/images/phoneScreenshots/06 - weight.png
deleted file mode 100644
index 89aade1fc..000000000
--- a/fastlane/metadata/android/uk/images/phoneScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fd14fbfbeb5081d06909a058c951a75d307410184b1172adbcf1112607bcdcbe
-size 185403
diff --git a/fastlane/metadata/android/uk/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/uk/images/sevenInchScreenshots/06 - weight.png
deleted file mode 100644
index 0d2f147bd..000000000
--- a/fastlane/metadata/android/uk/images/sevenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b571a154e0157b31e44a4c84b7c3405dccf10d13ad82d25b829a70a966ec722d
-size 51764
diff --git a/fastlane/metadata/android/uk/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/uk/images/tenInchScreenshots/06 - weight.png
deleted file mode 100644
index 4aded60f5..000000000
--- a/fastlane/metadata/android/uk/images/tenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c41b90defd0c0ee92d027bb60cd9aacaace7843d7ab59f0ee640864f167c860f
-size 128206
diff --git a/fastlane/metadata/android/zh-CN/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/zh-CN/images/phoneScreenshots/06 - weight.png
deleted file mode 100644
index 096be74fc..000000000
--- a/fastlane/metadata/android/zh-CN/images/phoneScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7132e9605809a38f191e3e9e3307360079eaeb7695e4debd0acdc33daf84194b
-size 208602
diff --git a/fastlane/metadata/android/zh-CN/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/zh-CN/images/sevenInchScreenshots/06 - weight.png
deleted file mode 100644
index bce8b3503..000000000
--- a/fastlane/metadata/android/zh-CN/images/sevenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:576564780277d97e2b51923a26bce65027b0b78548318626d30b1b1f455c3455
-size 63477
diff --git a/fastlane/metadata/android/zh-CN/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/zh-CN/images/tenInchScreenshots/06 - weight.png
deleted file mode 100644
index 3ab3a6e66..000000000
--- a/fastlane/metadata/android/zh-CN/images/tenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7284cb602de8128200cb04545d3a80f43a43bf7a170d22e24690e19ec2515f43
-size 148293
diff --git a/fastlane/metadata/android/zh-TW/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/zh-TW/images/phoneScreenshots/06 - weight.png
deleted file mode 100644
index 096be74fc..000000000
--- a/fastlane/metadata/android/zh-TW/images/phoneScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7132e9605809a38f191e3e9e3307360079eaeb7695e4debd0acdc33daf84194b
-size 208602
diff --git a/fastlane/metadata/android/zh-TW/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/zh-TW/images/sevenInchScreenshots/06 - weight.png
deleted file mode 100644
index bce8b3503..000000000
--- a/fastlane/metadata/android/zh-TW/images/sevenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:576564780277d97e2b51923a26bce65027b0b78548318626d30b1b1f455c3455
-size 63477
diff --git a/fastlane/metadata/android/zh-TW/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/zh-TW/images/tenInchScreenshots/06 - weight.png
deleted file mode 100644
index 3ab3a6e66..000000000
--- a/fastlane/metadata/android/zh-TW/images/tenInchScreenshots/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7284cb602de8128200cb04545d3a80f43a43bf7a170d22e24690e19ec2515f43
-size 148293
diff --git a/fastlane/metadata/ios/ar/images/iPhone 6.9/06 - weight.png b/fastlane/metadata/ios/ar/images/iPhone 6.9/06 - weight.png
deleted file mode 100644
index 1d898ded7..000000000
--- a/fastlane/metadata/ios/ar/images/iPhone 6.9/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:13883d31dd1eed19aa936127e77a3321946f73b18aeec910ff7bc6e9474be2c3
-size 386603
diff --git a/fastlane/metadata/ios/ca/images/iPhone 6.9/06 - weight.png b/fastlane/metadata/ios/ca/images/iPhone 6.9/06 - weight.png
deleted file mode 100644
index a7368cf99..000000000
--- a/fastlane/metadata/ios/ca/images/iPhone 6.9/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f838857b27866da8f32e11ea3d0af1e3b5e55506c34f2370d5fd54e982a3a631
-size 382774
diff --git a/fastlane/metadata/ios/cs-CZ/images/iPhone 6.9/06 - weight.png b/fastlane/metadata/ios/cs-CZ/images/iPhone 6.9/06 - weight.png
deleted file mode 100644
index b200c985e..000000000
--- a/fastlane/metadata/ios/cs-CZ/images/iPhone 6.9/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f145013190730def0b6a56d0d0b63e6233b313384606ed5fdc407dc96acae0fa
-size 381961
diff --git a/fastlane/metadata/ios/de-DE/images/iPhone 6.9/06 - weight.png b/fastlane/metadata/ios/de-DE/images/iPhone 6.9/06 - weight.png
deleted file mode 100644
index f1bace4b9..000000000
--- a/fastlane/metadata/ios/de-DE/images/iPhone 6.9/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3e93c8111441800c91397426975c80c654114287b47df9a03425ce06a13a72aa
-size 405431
diff --git a/fastlane/metadata/ios/el-GR/images/iPhone 6.9/06 - weight.png b/fastlane/metadata/ios/el-GR/images/iPhone 6.9/06 - weight.png
deleted file mode 100644
index f3ef8f067..000000000
--- a/fastlane/metadata/ios/el-GR/images/iPhone 6.9/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7ed89195860ac2278cac3f5cca58f34eb8d8d5ba2fa7c3b9bc31ca3ca30d4dff
-size 391737
diff --git a/fastlane/metadata/ios/en-US/images/iPhone 6.9/06 - weight.png b/fastlane/metadata/ios/en-US/images/iPhone 6.9/06 - weight.png
deleted file mode 100644
index 51a64dd7c..000000000
--- a/fastlane/metadata/ios/en-US/images/iPhone 6.9/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:73562f3b18960f5be3e8503b159e00a38528e9b2f1eb4bcf334c0345c7b8fba0
-size 392374
diff --git a/fastlane/metadata/ios/es-ES/images/iPhone 6.9/06 - weight.png b/fastlane/metadata/ios/es-ES/images/iPhone 6.9/06 - weight.png
deleted file mode 100644
index a68a8ff11..000000000
--- a/fastlane/metadata/ios/es-ES/images/iPhone 6.9/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c68a14e64fd7c6e0a6828a01f05459d006a416d3a85084cebd65b38855b43873
-size 392673
diff --git a/fastlane/metadata/ios/fa-IR/images/iPhone 6.9/06 - weight.png b/fastlane/metadata/ios/fa-IR/images/iPhone 6.9/06 - weight.png
deleted file mode 100644
index e935cc500..000000000
--- a/fastlane/metadata/ios/fa-IR/images/iPhone 6.9/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0b053350668fc6abe934b79938f25f8d0363d57c9221f159632ec6497b059828
-size 373407
diff --git a/fastlane/metadata/ios/fr-FR/images/iPhone 6.9/06 - weight.png b/fastlane/metadata/ios/fr-FR/images/iPhone 6.9/06 - weight.png
deleted file mode 100644
index 21e3c90f1..000000000
--- a/fastlane/metadata/ios/fr-FR/images/iPhone 6.9/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:43f5bd4929898ddc765729fd36598ca970fbb85bb306597924cb133132fc9140
-size 400515
diff --git a/fastlane/metadata/ios/hi-IN/images/iPhone 6.9/06 - weight.png b/fastlane/metadata/ios/hi-IN/images/iPhone 6.9/06 - weight.png
deleted file mode 100644
index 287ff11c7..000000000
--- a/fastlane/metadata/ios/hi-IN/images/iPhone 6.9/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bc4294d5f3a141cf6f4deccc26f0d1b4c1ac1997069cea9a71acec0149a65dca
-size 377618
diff --git a/fastlane/metadata/ios/hr/images/iPhone 6.9/06 - weight.png b/fastlane/metadata/ios/hr/images/iPhone 6.9/06 - weight.png
deleted file mode 100644
index 6393eb8aa..000000000
--- a/fastlane/metadata/ios/hr/images/iPhone 6.9/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bbf2ad6382411724f971c90b59640672a283b46c294ca82dc82aa59c7cc0b8fb
-size 397780
diff --git a/fastlane/metadata/ios/it-IT/images/iPhone 6.9/06 - weight.png b/fastlane/metadata/ios/it-IT/images/iPhone 6.9/06 - weight.png
deleted file mode 100644
index 4ac4332a2..000000000
--- a/fastlane/metadata/ios/it-IT/images/iPhone 6.9/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dff620d4d737f968cfe3e96d237b26a04ac25e9284498f7ea0d84fbec3d120d2
-size 399219
diff --git a/fastlane/metadata/ios/iw-IL/images/iPhone 6.9/06 - weight.png b/fastlane/metadata/ios/iw-IL/images/iPhone 6.9/06 - weight.png
deleted file mode 100644
index 21c01d8c1..000000000
--- a/fastlane/metadata/ios/iw-IL/images/iPhone 6.9/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:85409e24d9c82bcf4c79847f16e6b0afe723b094012aad8327fb410c48eb140d
-size 363953
diff --git a/fastlane/metadata/ios/ko-KR/images/iPhone 6.9/06 - weight.png b/fastlane/metadata/ios/ko-KR/images/iPhone 6.9/06 - weight.png
deleted file mode 100644
index 7d389d5f7..000000000
--- a/fastlane/metadata/ios/ko-KR/images/iPhone 6.9/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6de19d350fae7fa89769da4213f6f152b721167b3bebd5c6fd418ef7700e7509
-size 373853
diff --git a/fastlane/metadata/ios/nb-NO/images/iPhone 6.9/06 - weight.png b/fastlane/metadata/ios/nb-NO/images/iPhone 6.9/06 - weight.png
deleted file mode 100644
index eb762de40..000000000
--- a/fastlane/metadata/ios/nb-NO/images/iPhone 6.9/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3fe7a7e2809f257f7f77e93c4249274a563101b46de6ab8526db0adbbda339bd
-size 383521
diff --git a/fastlane/metadata/ios/pl-PL/images/iPhone 6.9/06 - weight.png b/fastlane/metadata/ios/pl-PL/images/iPhone 6.9/06 - weight.png
deleted file mode 100644
index c47c880e1..000000000
--- a/fastlane/metadata/ios/pl-PL/images/iPhone 6.9/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b824cb5cb111ee1ae851d2387a109392abd67b2e6df6046edd17262c1c86a9e0
-size 395320
diff --git a/fastlane/metadata/ios/pt-BR/images/iPhone 6.9/06 - weight.png b/fastlane/metadata/ios/pt-BR/images/iPhone 6.9/06 - weight.png
deleted file mode 100644
index 93e95315e..000000000
--- a/fastlane/metadata/ios/pt-BR/images/iPhone 6.9/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:91c1ebd0fd28726d21247849056e16acb19a7d81de17f307e0a59364715fdf7f
-size 391939
diff --git a/fastlane/metadata/ios/pt-PT/images/iPhone 6.9/06 - weight.png b/fastlane/metadata/ios/pt-PT/images/iPhone 6.9/06 - weight.png
deleted file mode 100644
index f5781686a..000000000
--- a/fastlane/metadata/ios/pt-PT/images/iPhone 6.9/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d2ea8e5b1659889773e5cd416502526a6fcd2fd0b9a65fd48011c6628bd77b80
-size 393468
diff --git a/fastlane/metadata/ios/ru-RU/images/iPhone 6.9/06 - weight.png b/fastlane/metadata/ios/ru-RU/images/iPhone 6.9/06 - weight.png
deleted file mode 100644
index beaeec550..000000000
--- a/fastlane/metadata/ios/ru-RU/images/iPhone 6.9/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b2fd908b0e8f04a65329844d94061d9a20e8681181b1c99673b921a663f7d74c
-size 382428
diff --git a/fastlane/metadata/ios/sr/images/iPhone 6.9/06 - weight.png b/fastlane/metadata/ios/sr/images/iPhone 6.9/06 - weight.png
deleted file mode 100644
index 51a64dd7c..000000000
--- a/fastlane/metadata/ios/sr/images/iPhone 6.9/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:73562f3b18960f5be3e8503b159e00a38528e9b2f1eb4bcf334c0345c7b8fba0
-size 392374
diff --git a/fastlane/metadata/ios/ta-IN/images/iPhone 6.9/06 - weight.png b/fastlane/metadata/ios/ta-IN/images/iPhone 6.9/06 - weight.png
deleted file mode 100644
index 1618346c3..000000000
--- a/fastlane/metadata/ios/ta-IN/images/iPhone 6.9/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1e7c3d1cee7574f39b432150fedd50d08122a56fa923bebdeeef54cae023d7ed
-size 428130
diff --git a/fastlane/metadata/ios/tr-TR/images/iPhone 6.9/06 - weight.png b/fastlane/metadata/ios/tr-TR/images/iPhone 6.9/06 - weight.png
deleted file mode 100644
index 662ee9f1d..000000000
--- a/fastlane/metadata/ios/tr-TR/images/iPhone 6.9/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5413876ad19c00b6c95c5d0fac1307e9cc9716a0256bd14f89ec80737e15bb1f
-size 391636
diff --git a/fastlane/metadata/ios/uk/images/iPhone 6.9/06 - weight.png b/fastlane/metadata/ios/uk/images/iPhone 6.9/06 - weight.png
deleted file mode 100644
index 92a93edb4..000000000
--- a/fastlane/metadata/ios/uk/images/iPhone 6.9/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9587035ca1d52a23387e0dfb9d8aae986deba1c76f4cbb848e9a1f2ed05abd2c
-size 379234
diff --git a/fastlane/metadata/ios/zh-CN/images/iPhone 6.9/06 - weight.png b/fastlane/metadata/ios/zh-CN/images/iPhone 6.9/06 - weight.png
deleted file mode 100644
index 2999f4d25..000000000
--- a/fastlane/metadata/ios/zh-CN/images/iPhone 6.9/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1c92d38a822ffe46d91b224bb9690112f4d2350d351ad8ad1e03efe82ebd661c
-size 399781
diff --git a/fastlane/metadata/ios/zh-TW/images/iPhone 6.9/06 - weight.png b/fastlane/metadata/ios/zh-TW/images/iPhone 6.9/06 - weight.png
deleted file mode 100644
index 2999f4d25..000000000
--- a/fastlane/metadata/ios/zh-TW/images/iPhone 6.9/06 - weight.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1c92d38a822ffe46d91b224bb9690112f4d2350d351ad8ad1e03efe82ebd661c
-size 399781
diff --git a/flatpak/de.wger.flutter.metainfo.xml b/flatpak/de.wger.flutter.metainfo.xml
index 496b12d35..f45cd1773 100755
--- a/flatpak/de.wger.flutter.metainfo.xml
+++ b/flatpak/de.wger.flutter.metainfo.xml
@@ -79,12 +79,6 @@
                 https://media.githubusercontent.com/media/wger-project/flutter/refs/heads/master/fastlane/metadata/android/en-US/images/phoneScreenshots/05%20-%20nutritional%20plan.png
             </image>
         </screenshot>
-        <screenshot>
-            <caption>Body weight</caption>
-            <image type="source">
-                https://media.githubusercontent.com/media/wger-project/flutter/refs/heads/master/fastlane/metadata/android/en-US/images/phoneScreenshots/06%20-%20weight.png
-            </image>
-        </screenshot>
     </screenshots>
     <releases>
         <release version="2.0.5" date="2026-08-21">
diff --git a/integration_test/README.md b/integration_test/README.md
index 33aff401d..5204c6b53 100644
--- a/integration_test/README.md
+++ b/integration_test/README.md
@@ -1,17 +1,67 @@
-This will generate some screenshots and save them to the Play Store metadata folder.
-
-1) Start the correct emulator/simulator for the device size you want.
-2) Run, selecting the device size via `--dart-define=DEVICE_TYPE`:
-   ```
-   flutter drive \
-       --driver=test_driver/screenshot_driver.dart \
-       --target=integration_test/make_screenshots_test.dart \
-       --dart-define=DEVICE_TYPE=androidPhone
-   ```
-   For the available device types, consult the `DeviceType` enum in
-   `make_screenshots_test.dart`.
-3) If you get errors or the screenshots are not written to disk, edit the
-   `languages` list and comment some of the languages out.
+This will generate the store screenshots and save them to the fastlane metadata
+folders.
+
+The device types are the values of the `DeviceType` enum in
+`make_screenshots_test.dart`. `DEVICE_TYPE` decides which folder the images are
+written to, so it has to match the device you booted. An unknown value silently
+falls back to `androidPhone`.
+
+## 1. Create the emulator, once
+
+Use the same profile the workflow uses, then nothing else needs setting up: the
+resolution that comes out is the one the profile has.
+
+| Device type           | Profile           | Resolution |
+|-----------------------|-------------------|------------|
+| `androidPhone`        | Pixel 10          | 1080x2424  |
+| `androidTabletSmall`  | Small Tablet      | 1200x1920  |
+| `androidTabletBig`    | Pixel Tablet      | 1600x2560  |
+| `iOSPhoneBig`         | iPhone 17 Pro Max | 1320x2868  |
+| `iOSTabletBig`        | iPad Pro 13-inch  | 2064x2752  |
+
+For Android either pick the profile in Android Studio under Device Manager, or
+on the command line. Pixel 10 and Small Tablet need reasonably current SDK
+command line tools; the ones on the CI runner are too old for them, which is why
+the workflow installs its own before creating the AVD.
+
+For the Apple device types just install the matching simulator in Xcode.
+
+## 2. Boot one device and run the driver
+
+Start the emulator or simulator for the device type you want, then:
+
+```bash
+flutter drive \
+    --driver=test_driver/screenshot_driver.dart \
+    --target=integration_test/make_screenshots_test.dart \
+    --dart-define=DEVICE_TYPE=androidPhone \
+    --dart-define=LANGUAGES=de-DE
+```
+
+`LANGUAGES` takes a comma separated subset, or `2/5` for the second of five
+equal blocks. Leave it out for all of them. Add `-d <device id>` if more than
+one device is attached, `flutter devices` lists them. The images land in
+`fastlane/metadata/`, `git status` shows what changed.
+
+A run keeps every screenshot in memory on the device and hands the lot over to
+the driver once the tests are through. Over all 25 languages that is upwards of
+70MB of JSON, and when the app loses its VM service under it the run ends with
+no images at all, so the workflow walks the list in blocks of five.
+
+## In CI
+
+The `Update screenshots` workflow does all of this for every device type and,
+when asked for, commits the result to a dated branch. It creates its own AVDs,
+so the setup above is only needed locally.
+
+## Troubleshooting
+
+If a run ends with `DriverError: ... Service has disappeared` and writes no
+images, it lost the app before it could collect them. The tests themselves
+usually passed, only the hand-over failed, so running that block again is
+enough. A block that instead keeps printing `It is taking an unusually long
+time to connect to the VM` never gives up on its own, kill it. In CI the script
+puts every block on a ten minute leash and retries it up to three times.
 
 See also
 
diff --git a/integration_test/make_screenshots_test.dart b/integration_test/make_screenshots_test.dart
index 32ce8d756..30f5235be 100644
--- a/integration_test/make_screenshots_test.dart
+++ b/integration_test/make_screenshots_test.dart
@@ -30,7 +30,6 @@ import '../test/screenshots/screenshots_02_workout.dart';
 import '../test/screenshots/screenshots_03_gym_mode.dart';
 import '../test/screenshots/screenshots_04_measurements.dart';
 import '../test/screenshots/screenshots_05_nutritional_plan.dart';
-import '../test/screenshots/screenshots_06_weight.dart';
 
 /// Type of device
 ///
@@ -43,8 +42,10 @@ enum DeviceType {
   androidTv('tvScreenshots'),
   androidWear('wearScreenshots'),
 
+  // Apple only needs the largest size per device family, the smaller ones are
+  // scaled down automatically
   iOSPhoneBig('iPhone 6.9', isAndroid: false),
-  iOSPhoneSmall('iPhone 6.7', isAndroid: false);
+  iOSTabletBig('iPad 13', isAndroid: false);
 
   final String folderName;
   final bool isAndroid;
@@ -87,9 +88,7 @@ Future<void> takeScreenshot(
 
 // Available languages in weblate for the fastlane/metadata/android folder (not necessarily
 // those for which the application is translated)
-const languages = [
-  // Note: it seems if too many languages are processed at once, sometimes the process
-  // disappear and no images are written. Doing this in smaller steps works fine
+const allLanguages = [
   'ar',
   'ca',
   'cs-CZ',
@@ -119,7 +118,31 @@ const languages = [
   'zh-TW',
 ];
 
+/// Languages to generate: `de-DE,en-US`, or `2/5` for the second of five equal
+/// blocks. Empty means all of them, which the hand-over rarely survives.
+const _languagesArg = String.fromEnvironment('LANGUAGES');
+
+List<String> _selectedLanguages() {
+  if (_languagesArg.isEmpty) {
+    return allLanguages;
+  }
+  if (!_languagesArg.contains('/')) {
+    return _languagesArg.split(',').map((language) => language.trim()).toList();
+  }
+
+  final [index, count] = _languagesArg.split('/').map(int.parse).toList();
+  final size = (allLanguages.length / count).ceil();
+  return allLanguages.skip((index - 1) * size).take(size).toList();
+}
+
+final languages = _selectedLanguages();
+
 void main() {
+  final unknown = languages.where((language) => !allLanguages.contains(language)).toList();
+  if (unknown.isNotEmpty) {
+    throw ArgumentError('Not in allLanguages: ${unknown.join(', ')}');
+  }
+
   final binding = IntegrationTestWidgetsFlutterBinding.ensureInitialized();
 
   binding.framePolicy = LiveTestWidgetsFlutterBindingFramePolicy.fullyLive;
@@ -179,12 +202,6 @@ void main() {
         await tester.pumpAndSettle();
         await takeScreenshot(tester, binding, language, '05 - nutritional plan');
       });
-
-      testWidgets('body weight screen - $language', (WidgetTester tester) async {
-        await tester.pumpWidget(createWeightScreen(locale: locale));
-        await tester.pumpAndSettle();
-        await takeScreenshot(tester, binding, language, '06 - weight');
-      });
     }
   });
 }
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 8384323ad..87e8fbca4 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;
@@ -494,6 +494,7 @@
 				MARKETING_VERSION = "$(FLUTTER_BUILD_NAME)";
 				PRODUCT_BUNDLE_IDENTIFIER = de.wger.flutter.community;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				STRIP_STYLE = "non-global";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift
index c30b367ec..fa82d5621 100644
--- a/ios/Runner/AppDelegate.swift
+++ b/ios/Runner/AppDelegate.swift
@@ -1,6 +1,54 @@
 import Flutter
 import UIKit
 
+private final class StorageExclusionPlugin: NSObject, FlutterPlugin {
+  static let pluginName = "StorageExclusionPlugin"
+  private static let channelName = "de.wger.flutter/storage"
+
+  static func register(with registrar: FlutterPluginRegistrar) {
+    let channel = FlutterMethodChannel(name: channelName, binaryMessenger: registrar.messenger())
+    let instance = StorageExclusionPlugin()
+    registrar.addMethodCallDelegate(instance, channel: channel)
+  }
+
+  func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
+    guard call.method == "excludeFromBackup" else {
+      result(FlutterMethodNotImplemented)
+      return
+    }
+    guard
+      let arguments = call.arguments as? [String: Any],
+      let path = arguments["path"] as? String,
+      !path.isEmpty
+    else {
+      result(
+        FlutterError(
+          code: "INVALID_ARGUMENT",
+          message: "Expected a non-empty path",
+          details: nil
+        )
+      )
+      return
+    }
+
+    do {
+      var url = URL(fileURLWithPath: path)
+      var values = URLResourceValues()
+      values.isExcludedFromBackup = true
+      try url.setResourceValues(values)
+      result(nil)
+    } catch {
+      result(
+        FlutterError(
+          code: "EXCLUDE_FROM_BACKUP_FAILED",
+          message: "Could not exclude \(path) from backups",
+          details: error.localizedDescription
+        )
+      )
+    }
+  }
+}
+
 @main
 @objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate {
   override func application(
@@ -12,5 +60,14 @@ import UIKit
 
   func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) {
     GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry)
+    guard
+      let registrar = engineBridge.pluginRegistry.registrar(
+        forPlugin: StorageExclusionPlugin.pluginName
+      )
+    else {
+      NSLog("StorageExclusionPlugin registrar unavailable")
+      return
+    }
+    StorageExclusionPlugin.register(with: registrar)
   }
 }
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 82371b5f1..d0932ec39 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 Apple Health data to import measurements and activity such as weight, body fat, blood pressure, heart rate, blood oxygen, sleep, steps, distance, and active energy into your wger account</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..920c31337 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
@@ -54,6 +54,8 @@ const SUBMIT_BUTTON_KEY_NAME = 'submit-button';
 /// Local Preferences keys
 const PREFS_INGREDIENTS = 'ingredientData';
 const PREFS_WORKOUT_UNITS = 'workoutUnits';
+
+/// Pre-JWT credential blob. Only still read to delete it on startup.
 const PREFS_USER = 'userData';
 const PREFS_USER_DARK_THEME = 'userDarkMode';
 const PREFS_USER_LOCALE = 'userLocale';
@@ -69,15 +71,13 @@ const PREFS_LAST_SERVER = 'lastServer';
 const PREFS_USE_DYNAMIC_COLOR = 'useDynamicColor';
 const USE_DYNAMIC_COLOR_DEFAULT = false;
 
-/// Headless JWT auth: SharedPreferences keys.
-///
-/// Read in parallel with the legacy `PREFS_USER` blob during the migration
-/// window; once a user logs in via the headless flow these supersede it.
-/// The refresh token is **not** stored here, it lives in secure storage
-/// (`SECURE_STORAGE_REFRESH_TOKEN`).
+/// The chart range the measurement screens share, held as `ChartRange.name`
+const PREFS_CHART_RANGE = 'measurementChartRange';
+
+/// Headless JWT auth: SharedPreferences keys. The refresh token is **not**
+/// stored here, it lives in secure storage (`SECURE_STORAGE_REFRESH_TOKEN`).
 const PREFS_ACCESS_TOKEN = 'accessToken';
 const PREFS_ACCESS_EXPIRES_AT = 'accessExpiresAt';
-const PREFS_TOKEN_TYPE = 'tokenType';
 const PREFS_SERVER_URL = 'serverUrl';
 
 /// JWT `sub` of the user whose data is materialised in the local PowerSync
@@ -195,6 +195,11 @@ const WEBLATE_URL = 'https://hosted.weblate.org/engage/wger';
 const BUY_ME_A_COFFEE_URL = 'https://buymeacoffee.com/wger';
 const LIBERAPAY_URL = 'https://liberapay.com/wger';
 
+/// Terms of service and privacy policy, served by every instance. What it says
+/// is up to whoever runs the server, upstream ships a placeholder. The Health
+/// Connect entry points in MainActivity.kt use wger.de's copy of this page.
+const TERMS_OF_SERVICE_PATH = 'software/terms-of-service';
+
 /// Factor to multiply / divide in the charts when converting dates to milliseconds
 /// from epoch since fl_charts does not support real time series charts and using
 /// the milliseconds themselves can cause the application to crash since it runs
diff --git a/lib/core/date.dart b/lib/core/date.dart
index bb9ce3dcd..0a1827e88 100644
--- a/lib/core/date.dart
+++ b/lib/core/date.dart
@@ -16,6 +16,27 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import 'package:timezone/timezone.dart' as tz;
+
+/// The calendar day of [instant] in the IANA zone [zoneName], as the plain
+/// year/month/day [DateTime] that [DateTimeExtension.isSameDayAs] compares
+///
+/// A null, empty or unknown name falls back to the device zone, mirroring the
+/// fallback of the server's UserProfile.zone_info.
+DateTime dayIn(DateTime instant, String? zoneName) {
+  if (zoneName != null && zoneName.isNotEmpty) {
+    try {
+      final zoned = tz.TZDateTime.from(instant, tz.getLocation(zoneName));
+      return DateTime(zoned.year, zoned.month, zoned.day);
+    } on tz.LocationNotFoundException {
+      // An unknown name reads like an unreported zone
+    }
+  }
+
+  final local = instant.toLocal();
+  return DateTime(local.year, local.month, local.day);
+}
+
 /// Returns a list of [DateTime] objects from [first] to [last], inclusive.
 ///
 /// Counts calendar days, not elapsed time: the range is measured between the
diff --git a/lib/core/form_screen.dart b/lib/core/form_screen.dart
index ca63ee54c..faf234f92 100644
--- a/lib/core/form_screen.dart
+++ b/lib/core/form_screen.dart
@@ -28,9 +28,10 @@ class FormScreenArguments {
   /// Widget to render, typically a form
   final Widget widget;
 
-  /// Flag indicating whether to render the content has a list view (e.g. larger
-  /// forms that use an autocompleter, etc) or not (smnall forms, content will
-  /// get pushed down)
+  /// Whether [widget] scrolls itself, e.g. because it holds a list or grows
+  /// while it is filled in. It is then given the screen to fill. A form
+  /// without it is laid out at its natural height and pushed to the bottom,
+  /// which only holds as long as it fits.
   final bool hasListView;
 
   /// Padding for the whole content, default 15px on all sides
diff --git a/lib/core/formatting/formatting.dart b/lib/core/formatting/formatting.dart
index 5294e789e..a4bb6bd3a 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,163 @@ DateFormat localizedDate(BuildContext context) =>
 /// A decimal number format bound to the current locale.
 NumberFormat localizedNumberFormat(BuildContext context) =>
     NumberFormat.decimalPattern(Localizations.localeOf(context).toString());
+
+/// The localized label of the profile's weight unit (kg or lb).
+String weightUnit(bool isMetric, BuildContext context) {
+  return isMetric ? AppLocalizations.of(context).kg : AppLocalizations.of(context).lb;
+}
+
+/// 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.
+/// How close the ends of a series have to be for its axis to count as flat:
+/// a spread that only shows up in the last digits of a double.
+const _FLAT_RELATIVE = 1e-9;
+
+/// Room left around a flat series, as a share of the value it sits at.
+const _FLAT_PADDING = 0.05;
+
+/// Bounds and tick interval of a value axis, null where fl_chart may pick them
+/// itself.
+///
+/// Two cases are taken out of its hands. Durations are read in hours, see
+/// [durationAxis]. And a series whose values are all the same leaves a range
+/// of nothing: fl_chart divides that range into steps and walks the axis one
+/// step at a time, so a step below the last value's own precision never
+/// advances the walk, and it generates labels until the heap gives out. A flat
+/// series is ordinary (a weight that did not move, a calculation that stays
+/// put), so the axis gets room around the value instead.
+({double min, double max, double? interval})? valueAxis(
+  String unit,
+  num min,
+  num max,
+) {
+  final duration = durationAxis(unit, min, max);
+  if (duration != null) {
+    return duration;
+  }
+
+  if ((max - min).abs() > max.abs() * _FLAT_RELATIVE) {
+    return null;
+  }
+
+  // A value of zero has no magnitude to take a share of
+  final padding = max.abs() * _FLAT_PADDING;
+  return (
+    min: (max - (padding == 0 ? 1 : padding)).toDouble(),
+    max: (max + (padding == 0 ? 1 : padding)).toDouble(),
+    interval: null,
+  );
+}
+
+({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/helpers.dart b/lib/core/helpers.dart
index 9a8122165..6e0129f0c 100644
--- a/lib/core/helpers.dart
+++ b/lib/core/helpers.dart
@@ -90,6 +90,23 @@ Uri makeUri(
   return uri;
 }
 
+/// Builds the URL of a page the server renders itself, e.g. its terms of
+/// service. Unlike [makeUri] the path is used as given, without the API prefix
+/// and without a trailing slash.
+Uri makePageUri(String serverUrl, String path) {
+  final server = Uri.parse(serverUrl);
+  final basePath = server.path.endsWith('/')
+      ? server.path.substring(0, server.path.length - 1)
+      : server.path;
+
+  return Uri(
+    scheme: server.scheme,
+    host: server.host,
+    port: server.port,
+    path: '$basePath/$path',
+  );
+}
+
 /// Builds a URL for the `allauth.headless` `app` client API at
 /// `/allauth/app/v1/<path>`. Used by the auth notifier for login,
 /// signup, MFA, refresh, etc. The headless API does not use a trailing
diff --git a/lib/core/home_tabs_screen.dart b/lib/core/home_tabs_screen.dart
index f6b5f46ac..d52c04f55 100644
--- a/lib/core/home_tabs_screen.dart
+++ b/lib/core/home_tabs_screen.dart
@@ -21,10 +21,12 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 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/account/providers/timezone_sync.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 +43,25 @@ 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. A no-op unless the user enabled it in the settings, and unless the
+    // last sync is long enough ago.
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!mounted) {
+        return;
+      }
+      ref.read(healthSyncProvider.notifier).syncIfDue();
+
+      // Report the device timezone to the profile, so the server calculates
+      // streaks and trophies in the user's own zone. A no-op when unchanged.
+      ref.read(timezoneSyncProvider).reportIfNeeded();
+    });
+  }
+
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
@@ -59,7 +80,7 @@ class _HomeTabsScreenState extends ConsumerState<HomeTabsScreen>
     const DashboardScreen(),
     const RoutineListScreen(),
     const NutritionalPlansScreen(),
-    const WeightScreen(),
+    const MeasurementCategoriesScreen(),
     const GalleryScreen(),
   ];
 
@@ -80,7 +101,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/api_headers.dart b/lib/core/network/api_headers.dart
new file mode 100644
index 000000000..e09f98e24
--- /dev/null
+++ b/lib/core/network/api_headers.dart
@@ -0,0 +1,47 @@
+/*
+ * 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:io';
+
+import 'package:package_info_plus/package_info_plus.dart';
+
+/// User-agent header string identifying the app/version/platform.
+String getAppNameHeader(PackageInfo? applicationVersion) {
+  String out = '';
+  if (applicationVersion != null) {
+    out =
+        '/${applicationVersion.version} '
+        '(${applicationVersion.packageName}; '
+        'build: ${applicationVersion.buildNumber}; '
+        'platform: ${Platform.operatingSystem})'
+        ' - https://github.com/wger-project';
+  }
+  return 'wger App$out';
+}
+
+/// Standard JSON-API headers for the auth endpoints. The `Accept` header keeps
+/// a bot wall (e.g. Anubis) from serving an HTML challenge to these endpoints
+/// instead of JSON. [extra] adds per-request headers (session token, auth, ...).
+Map<String, String> jsonApiHeaders(PackageInfo? appVersion, [Map<String, String>? extra]) {
+  return {
+    HttpHeaders.contentTypeHeader: 'application/json; charset=utf-8',
+    HttpHeaders.acceptHeader: 'application/json',
+    HttpHeaders.userAgentHeader: getAppNameHeader(appVersion),
+    ...?extra,
+  };
+}
diff --git a/lib/core/network/auth_credential.dart b/lib/core/network/auth_credential.dart
index 2da61a338..b667adb4b 100644
--- a/lib/core/network/auth_credential.dart
+++ b/lib/core/network/auth_credential.dart
@@ -21,54 +21,32 @@ import 'package:wger/core/network/jwt.dart';
 
 part 'auth_credential.freezed.dart';
 
-/// Sealed credential carried inside `AuthState` for every authenticated
-/// caller. Branch via `switch` or `is` to access the variant-specific
-/// fields; the two getters below cover everything the HTTP layer needs.
+/// Credential carried inside `AuthState` for every authenticated caller: a
+/// short-lived access token from `allauth.headless`, sent as
+/// `Authorization: Bearer <jwt>`. The refresh token is not part of it, it
+/// lives in secure storage.
 ///
-/// The app supports two flavours during the migration to `allauth.headless`:
-///
-/// - [LegacyCredential] — permanent DRF token from `/api/v2/login/`, sent
-///   as `Authorization: Token <key>`. This is what existing installs are
-///   running until they re-authenticate on a build that ships the JWT flow.
-/// - [JwtCredential] — short-lived access token from `allauth.headless`,
-///   sent as `Authorization: Bearer <jwt>`. The refresh token lives in
-///   secure storage, not on the credential itself.
-///
-/// New logins (login, signup, MFA completion, pasted-refresh exchange)
-/// always produce a [JwtCredential].
+/// Every entry point (login, signup, MFA completion, pasted-refresh
+/// exchange, auto-login from storage) produces one of these.
 @freezed
-sealed class AuthCredential with _$AuthCredential {
-  const factory AuthCredential.legacy(String token) = LegacyCredential;
-
-  const factory AuthCredential.jwt({
+abstract class JwtCredential with _$JwtCredential {
+  const factory JwtCredential({
     required String accessToken,
     DateTime? expiresAt,
-  }) = JwtCredential;
+  }) = _JwtCredential;
 
-  const AuthCredential._();
+  const JwtCredential._();
 
   /// `Authorization` header value for outgoing authenticated requests.
-  String get authHeaderValue => switch (this) {
-    LegacyCredential(:final token) => 'Token $token',
-    JwtCredential(:final accessToken) => 'Bearer $accessToken',
-  };
+  String get authHeaderValue => 'Bearer $accessToken';
 
-  /// True when this credential is a JWT whose expiry falls within [leeway]
-  /// of now (or is already past). Always false for [LegacyCredential]:
-  /// permanent DRF tokens have no expiry and are never refreshed.
-  bool needsRefresh(Duration leeway) => switch (this) {
-    LegacyCredential() => false,
-    JwtCredential(:final expiresAt) =>
-      expiresAt != null && expiresAt.isBefore(DateTime.now().toUtc().add(leeway)),
-  };
+  /// True when the expiry falls within [leeway] of now, or is already past.
+  /// False when the token carries no expiry at all.
+  bool needsRefresh(Duration leeway) =>
+      expiresAt != null && expiresAt!.isBefore(DateTime.now().toUtc().add(leeway));
 
-  /// User identifier carried by the credential. For [JwtCredential] this is
-  /// the JWT `sub` claim (decoded on every call, so callers should not
-  /// hammer it in tight loops). Null for [LegacyCredential]: permanent DRF
-  /// tokens don't expose the user-id and the app discovers it lazily via
-  /// the user-profile endpoint instead.
-  String? get userId => switch (this) {
-    LegacyCredential() => null,
-    JwtCredential(:final accessToken) => decodeJwtPayload(accessToken)?['sub']?.toString(),
-  };
+  /// User identifier carried by the token: its `sub` claim. Decoded on
+  /// every call, so callers should not hammer it in tight loops. Null when
+  /// the token isn't decodable or carries no `sub`.
+  String? get userId => decodeJwtPayload(accessToken)?['sub']?.toString();
 }
diff --git a/lib/core/network/auth_credential.freezed.dart b/lib/core/network/auth_credential.freezed.dart
index 38306d738..507d8e21a 100644
--- a/lib/core/network/auth_credential.freezed.dart
+++ b/lib/core/network/auth_credential.freezed.dart
@@ -12,37 +12,69 @@ part of 'auth_credential.dart';
 // dart format off
 T _$identity<T>(T value) => value;
 /// @nodoc
-mixin _$AuthCredential {
-
+mixin _$JwtCredential {
 
+ String get accessToken; DateTime? get expiresAt;
+/// Create a copy of JwtCredential
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$JwtCredentialCopyWith<JwtCredential> get copyWith => _$JwtCredentialCopyWithImpl<JwtCredential>(this as JwtCredential, _$identity);
 
 
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is AuthCredential);
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is JwtCredential&&(identical(other.accessToken, accessToken) || other.accessToken == accessToken)&&(identical(other.expiresAt, expiresAt) || other.expiresAt == expiresAt));
 }
 
 
 @override
-int get hashCode => runtimeType.hashCode;
+int get hashCode => Object.hash(runtimeType,accessToken,expiresAt);
 
 @override
 String toString() {
-  return 'AuthCredential()';
+  return 'JwtCredential(accessToken: $accessToken, expiresAt: $expiresAt)';
 }
 
 
 }
 
 /// @nodoc
-class $AuthCredentialCopyWith<$Res>  {
-$AuthCredentialCopyWith(AuthCredential _, $Res Function(AuthCredential) __);
+abstract mixin class $JwtCredentialCopyWith<$Res>  {
+  factory $JwtCredentialCopyWith(JwtCredential value, $Res Function(JwtCredential) _then) = _$JwtCredentialCopyWithImpl;
+@useResult
+$Res call({
+ String accessToken, DateTime? expiresAt
+});
+
+
+
+
 }
+/// @nodoc
+class _$JwtCredentialCopyWithImpl<$Res>
+    implements $JwtCredentialCopyWith<$Res> {
+  _$JwtCredentialCopyWithImpl(this._self, this._then);
 
+  final JwtCredential _self;
+  final $Res Function(JwtCredential) _then;
 
-/// Adds pattern-matching-related methods to [AuthCredential].
-extension AuthCredentialPatterns on AuthCredential {
+/// Create a copy of JwtCredential
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? accessToken = null,Object? expiresAt = freezed,}) {
+  return _then(_self.copyWith(
+accessToken: null == accessToken ? _self.accessToken : accessToken // ignore: cast_nullable_to_non_nullable
+as String,expiresAt: freezed == expiresAt ? _self.expiresAt : expiresAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,
+  ));
+}
+
+}
+
+
+/// Adds pattern-matching-related methods to [JwtCredential].
+extension JwtCredentialPatterns on JwtCredential {
 /// A variant of `map` that fallback to returning `orElse`.
 ///
 /// It is equivalent to doing:
@@ -55,12 +87,11 @@ extension AuthCredentialPatterns on AuthCredential {
 /// }
 /// ```
 
-@optionalTypeArgs TResult maybeMap<TResult extends Object?>({TResult Function( LegacyCredential value)?  legacy,TResult Function( JwtCredential value)?  jwt,required TResult orElse(),}){
+@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _JwtCredential value)?  $default,{required TResult orElse(),}){
 final _that = this;
 switch (_that) {
-case LegacyCredential() when legacy != null:
-return legacy(_that);case JwtCredential() when jwt != null:
-return jwt(_that);case _:
+case _JwtCredential() when $default != null:
+return $default(_that);case _:
   return orElse();
 
 }
@@ -78,12 +109,14 @@ return jwt(_that);case _:
 /// }
 /// ```
 
-@optionalTypeArgs TResult map<TResult extends Object?>({required TResult Function( LegacyCredential value)  legacy,required TResult Function( JwtCredential value)  jwt,}){
+@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _JwtCredential value)  $default,){
 final _that = this;
 switch (_that) {
-case LegacyCredential():
-return legacy(_that);case JwtCredential():
-return jwt(_that);}
+case _JwtCredential():
+return $default(_that);case _:
+  throw StateError('Unexpected subclass');
+
+}
 }
 /// A variant of `map` that fallback to returning `null`.
 ///
@@ -97,12 +130,11 @@ return jwt(_that);}
 /// }
 /// ```
 
-@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>({TResult? Function( LegacyCredential value)?  legacy,TResult? Function( JwtCredential value)?  jwt,}){
+@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _JwtCredential value)?  $default,){
 final _that = this;
 switch (_that) {
-case LegacyCredential() when legacy != null:
-return legacy(_that);case JwtCredential() when jwt != null:
-return jwt(_that);case _:
+case _JwtCredential() when $default != null:
+return $default(_that);case _:
   return null;
 
 }
@@ -119,11 +151,10 @@ return jwt(_that);case _:
 /// }
 /// ```
 
-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>({TResult Function( String token)?  legacy,TResult Function( String accessToken,  DateTime? expiresAt)?  jwt,required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String accessToken,  DateTime? expiresAt)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
-case LegacyCredential() when legacy != null:
-return legacy(_that.token);case JwtCredential() when jwt != null:
-return jwt(_that.accessToken,_that.expiresAt);case _:
+case _JwtCredential() when $default != null:
+return $default(_that.accessToken,_that.expiresAt);case _:
   return orElse();
 
 }
@@ -141,11 +172,13 @@ return jwt(_that.accessToken,_that.expiresAt);case _:
 /// }
 /// ```
 
-@optionalTypeArgs TResult when<TResult extends Object?>({required TResult Function( String token)  legacy,required TResult Function( String accessToken,  DateTime? expiresAt)  jwt,}) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String accessToken,  DateTime? expiresAt)  $default,) {final _that = this;
 switch (_that) {
-case LegacyCredential():
-return legacy(_that.token);case JwtCredential():
-return jwt(_that.accessToken,_that.expiresAt);}
+case _JwtCredential():
+return $default(_that.accessToken,_that.expiresAt);case _:
+  throw StateError('Unexpected subclass');
+
+}
 }
 /// A variant of `when` that fallback to returning `null`
 ///
@@ -159,11 +192,10 @@ return jwt(_that.accessToken,_that.expiresAt);}
 /// }
 /// ```
 
-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>({TResult? Function( String token)?  legacy,TResult? Function( String accessToken,  DateTime? expiresAt)?  jwt,}) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String accessToken,  DateTime? expiresAt)?  $default,) {final _that = this;
 switch (_that) {
-case LegacyCredential() when legacy != null:
-return legacy(_that.token);case JwtCredential() when jwt != null:
-return jwt(_that.accessToken,_that.expiresAt);case _:
+case _JwtCredential() when $default != null:
+return $default(_that.accessToken,_that.expiresAt);case _:
   return null;
 
 }
@@ -174,90 +206,24 @@ return jwt(_that.accessToken,_that.expiresAt);case _:
 /// @nodoc
 
 
-class LegacyCredential extends AuthCredential {
-  const LegacyCredential(this.token): super._();
+class _JwtCredential extends JwtCredential {
+  const _JwtCredential({required this.accessToken, this.expiresAt}): super._();
   
 
- final  String token;
+@override final  String accessToken;
+@override final  DateTime? expiresAt;
 
-/// Create a copy of AuthCredential
+/// Create a copy of JwtCredential
 /// with the given fields replaced by the non-null parameter values.
-@JsonKey(includeFromJson: false, includeToJson: false)
+@override @JsonKey(includeFromJson: false, includeToJson: false)
 @pragma('vm:prefer-inline')
-$LegacyCredentialCopyWith<LegacyCredential> get copyWith => _$LegacyCredentialCopyWithImpl<LegacyCredential>(this, _$identity);
+_$JwtCredentialCopyWith<_JwtCredential> get copyWith => __$JwtCredentialCopyWithImpl<_JwtCredential>(this, _$identity);
 
 
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is LegacyCredential&&(identical(other.token, token) || other.token == token));
-}
-
-
-@override
-int get hashCode => Object.hash(runtimeType,token);
-
-@override
-String toString() {
-  return 'AuthCredential.legacy(token: $token)';
-}
-
-
-}
-
-/// @nodoc
-abstract mixin class $LegacyCredentialCopyWith<$Res> implements $AuthCredentialCopyWith<$Res> {
-  factory $LegacyCredentialCopyWith(LegacyCredential value, $Res Function(LegacyCredential) _then) = _$LegacyCredentialCopyWithImpl;
-@useResult
-$Res call({
- String token
-});
-
-
-
-
-}
-/// @nodoc
-class _$LegacyCredentialCopyWithImpl<$Res>
-    implements $LegacyCredentialCopyWith<$Res> {
-  _$LegacyCredentialCopyWithImpl(this._self, this._then);
-
-  final LegacyCredential _self;
-  final $Res Function(LegacyCredential) _then;
-
-/// Create a copy of AuthCredential
-/// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') $Res call({Object? token = null,}) {
-  return _then(LegacyCredential(
-null == token ? _self.token : token // ignore: cast_nullable_to_non_nullable
-as String,
-  ));
-}
-
-
-}
-
-/// @nodoc
-
-
-class JwtCredential extends AuthCredential {
-  const JwtCredential({required this.accessToken, this.expiresAt}): super._();
-  
-
- final  String accessToken;
- final  DateTime? expiresAt;
-
-/// Create a copy of AuthCredential
-/// with the given fields replaced by the non-null parameter values.
-@JsonKey(includeFromJson: false, includeToJson: false)
-@pragma('vm:prefer-inline')
-$JwtCredentialCopyWith<JwtCredential> get copyWith => _$JwtCredentialCopyWithImpl<JwtCredential>(this, _$identity);
-
-
-
-@override
-bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is JwtCredential&&(identical(other.accessToken, accessToken) || other.accessToken == accessToken)&&(identical(other.expiresAt, expiresAt) || other.expiresAt == expiresAt));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _JwtCredential&&(identical(other.accessToken, accessToken) || other.accessToken == accessToken)&&(identical(other.expiresAt, expiresAt) || other.expiresAt == expiresAt));
 }
 
 
@@ -266,16 +232,16 @@ int get hashCode => Object.hash(runtimeType,accessToken,expiresAt);
 
 @override
 String toString() {
-  return 'AuthCredential.jwt(accessToken: $accessToken, expiresAt: $expiresAt)';
+  return 'JwtCredential(accessToken: $accessToken, expiresAt: $expiresAt)';
 }
 
 
 }
 
 /// @nodoc
-abstract mixin class $JwtCredentialCopyWith<$Res> implements $AuthCredentialCopyWith<$Res> {
-  factory $JwtCredentialCopyWith(JwtCredential value, $Res Function(JwtCredential) _then) = _$JwtCredentialCopyWithImpl;
-@useResult
+abstract mixin class _$JwtCredentialCopyWith<$Res> implements $JwtCredentialCopyWith<$Res> {
+  factory _$JwtCredentialCopyWith(_JwtCredential value, $Res Function(_JwtCredential) _then) = __$JwtCredentialCopyWithImpl;
+@override @useResult
 $Res call({
  String accessToken, DateTime? expiresAt
 });
@@ -285,17 +251,17 @@ $Res call({
 
 }
 /// @nodoc
-class _$JwtCredentialCopyWithImpl<$Res>
-    implements $JwtCredentialCopyWith<$Res> {
-  _$JwtCredentialCopyWithImpl(this._self, this._then);
+class __$JwtCredentialCopyWithImpl<$Res>
+    implements _$JwtCredentialCopyWith<$Res> {
+  __$JwtCredentialCopyWithImpl(this._self, this._then);
 
-  final JwtCredential _self;
-  final $Res Function(JwtCredential) _then;
+  final _JwtCredential _self;
+  final $Res Function(_JwtCredential) _then;
 
-/// Create a copy of AuthCredential
+/// Create a copy of JwtCredential
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') $Res call({Object? accessToken = null,Object? expiresAt = freezed,}) {
-  return _then(JwtCredential(
+@override @pragma('vm:prefer-inline') $Res call({Object? accessToken = null,Object? expiresAt = freezed,}) {
+  return _then(_JwtCredential(
 accessToken: null == accessToken ? _self.accessToken : accessToken // ignore: cast_nullable_to_non_nullable
 as String,expiresAt: freezed == expiresAt ? _self.expiresAt : expiresAt // ignore: cast_nullable_to_non_nullable
 as DateTime?,
diff --git a/lib/core/network/auth_credentials_storage.dart b/lib/core/network/auth_credentials_storage.dart
index 36307b497..12752fefe 100644
--- a/lib/core/network/auth_credentials_storage.dart
+++ b/lib/core/network/auth_credentials_storage.dart
@@ -27,19 +27,19 @@ import 'package:wger/core/network/secure_token_storage.dart';
 import 'package:wger/core/shared_preferences.dart';
 
 /// Credential + server URL pair restored from on-disk storage. The refresh
-/// token (for the JWT path) is intentionally absent: it lives in secure
-/// storage and is only read when a refresh actually runs.
+/// token is intentionally absent: it lives in secure storage and is only
+/// read when a refresh actually runs.
 class StoredAuth {
-  final AuthCredential credential;
+  final JwtCredential credential;
   final String serverUrl;
 
   const StoredAuth({required this.credential, required this.serverUrl});
 }
 
 /// All persistence for the auth flow in one place. Holds the JWT-keyed
-/// shared-preference bundle, the legacy `PREFS_USER` blob, and the
-/// secure-storage refresh token. Lifts the storage layout details out of
-/// the notifier so callers don't have to know which keys back which fact.
+/// shared-preference bundle and the secure-storage refresh token. Lifts the
+/// storage layout details out of the notifier so callers don't have to know
+/// which keys back which fact.
 class AuthCredentialsStorage {
   final SecureTokenStorage _secureStorage;
   final _logger = Logger('AuthCredentialsStorage');
@@ -48,23 +48,10 @@ class AuthCredentialsStorage {
 
   SharedPreferencesAsync get _prefs => PreferenceHelper.asyncPref;
 
-  /// Reads the persisted credential bundle. The headless-JWT keys take
-  /// priority over the legacy `PREFS_USER` blob, so a partial migration
-  /// state still resolves to the JWT path. Returns null when neither
-  /// shape is fully present.
+  /// Reads the persisted credential bundle. Returns null when the access
+  /// token or the server URL is missing, so a half-written bundle resolves
+  /// to logged-out rather than to a session that cannot make requests.
   Future<StoredAuth?> load() async {
-    final jwt = await _readJwt();
-    if (jwt != null) {
-      return jwt;
-    }
-    return _readLegacy();
-  }
-
-  Future<StoredAuth?> _readJwt() async {
-    final tokenType = await _prefs.getString(PREFS_TOKEN_TYPE);
-    if (tokenType != AuthTokenType.headlessJwt.name) {
-      return null;
-    }
     final accessToken = await _prefs.getString(PREFS_ACCESS_TOKEN);
     final serverUrl = await _prefs.getString(PREFS_SERVER_URL);
     if (accessToken == null || accessToken.isEmpty || serverUrl == null || serverUrl.isEmpty) {
@@ -80,34 +67,10 @@ class AuthCredentialsStorage {
     );
   }
 
-  Future<StoredAuth?> _readLegacy() async {
-    if (!(await _prefs.containsKey(PREFS_USER))) {
-      return null;
-    }
-    final raw = await _prefs.getString(PREFS_USER);
-    if (raw == null) {
-      return null;
-    }
-    final Map<String, dynamic> blob;
-    try {
-      blob = json.decode(raw) as Map<String, dynamic>;
-    } catch (e, s) {
-      _logger.warning('Could not decode PREFS_USER blob', e, s);
-      return null;
-    }
-    final token = blob['token'] as String?;
-    final serverUrl = blob['serverUrl'] as String?;
-    if (token == null || serverUrl == null) {
-      return null;
-    }
-    return StoredAuth(credential: LegacyCredential(token), serverUrl: serverUrl);
-  }
-
   /// Persists a fresh JWT bundle. As a side effect this records the
-  /// server URL as the "last server" for the next login screen and wipes
-  /// the legacy `PREFS_USER` blob (legacy users transition to JWT on first
-  /// login through this path). The DB-owner marker is intentionally NOT
-  /// written here; the login flow sets it after any required DB wipe.
+  /// server URL as the "last server" for the next login screen. The
+  /// DB-owner marker is intentionally NOT written here; the login flow sets
+  /// it after any required DB wipe.
   Future<void> saveJwt({
     required JwtCredential credential,
     required String serverUrl,
@@ -120,7 +83,6 @@ class AuthCredentialsStorage {
     } else {
       await _prefs.remove(PREFS_ACCESS_EXPIRES_AT);
     }
-    await _prefs.setString(PREFS_TOKEN_TYPE, AuthTokenType.headlessJwt.name);
     await _prefs.setString(PREFS_SERVER_URL, serverUrl);
 
     if (refreshToken != null) {
@@ -133,13 +95,11 @@ class AuthCredentialsStorage {
         _logger.warning('Could not persist refresh token, auto-login disabled', e, s);
       }
     }
-
-    await clearLegacy();
   }
 
   /// Updates the persisted JWT bundle in place after a successful refresh.
-  /// Identical to [saveJwt] minus the legacy-cleanup and last-server side
-  /// effects (the original login already wrote those).
+  /// Identical to [saveJwt] minus the last-server side effect (the original
+  /// login already wrote it).
   Future<void> updateJwt({
     required JwtCredential credential,
     String? refreshToken,
@@ -162,15 +122,18 @@ class AuthCredentialsStorage {
     }
   }
 
-  /// Wipes the headless-JWT preference bundle and the secure-storage
-  /// refresh token. Used both for involuntary session clears and as part
-  /// of a full [clearAll]. The DB-owner marker is deliberately left intact:
-  /// it tracks who owns the on-disk data, which clearing credentials does
-  /// not change. It is reset only when the DB is actually wiped.
-  Future<void> clearJwt() async {
+  /// Wipes the credential bundle and the secure-storage refresh token, but
+  /// keeps the "has ever synced" flag so the next login takes the
+  /// offline-friendly restored-session path. Used for involuntary session
+  /// loss (refresh token expired, 401 retries exhausted) where the local
+  /// PowerSync DB is preserved, and as part of a full [clearAll].
+  ///
+  /// The DB-owner marker is deliberately left intact: it tracks who owns
+  /// the on-disk data, which clearing credentials does not change. It is
+  /// reset only when the DB is actually wiped.
+  Future<void> clearCredentials() async {
     await _prefs.remove(PREFS_ACCESS_TOKEN);
     await _prefs.remove(PREFS_ACCESS_EXPIRES_AT);
-    await _prefs.remove(PREFS_TOKEN_TYPE);
     await _prefs.remove(PREFS_SERVER_URL);
     try {
       await _secureStorage.deleteRefreshToken();
@@ -181,21 +144,10 @@ class AuthCredentialsStorage {
     }
   }
 
-  /// Wipes only the legacy `PREFS_USER` blob. Used by the JWT-migration
-  /// path on a 401 from the exchange endpoint (DRF token revoked) and as
-  /// a side effect of [saveJwt].
-  Future<void> clearLegacy() async {
-    await _prefs.remove(PREFS_USER);
-  }
-
-  /// Wipes both credential shapes but keeps the "has ever synced" flag,
-  /// so the next login takes the offline-friendly restored-session path.
-  /// Used for involuntary session loss (refresh token expired, 401
-  /// retries exhausted) where the local PowerSync DB is preserved.
-  Future<void> clearCredentials() async {
-    await clearLegacy();
-    await clearJwt();
-  }
+  /// Removes the pre-JWT credential blob left behind by installs that
+  /// upgraded from a build using permanent DRF tokens. Best-effort, runs
+  /// once per app start; can be dropped a couple of releases from now.
+  Future<void> clearLegacyDrfToken() => _prefs.remove(PREFS_USER);
 
   /// Manual-logout wipe: clears credentials plus the "has ever synced"
   /// flag, so the next login takes the full first-run gating path
diff --git a/lib/core/network/auth_http_client.dart b/lib/core/network/auth_http_client.dart
index 2ff13fa24..c329df3fe 100644
--- a/lib/core/network/auth_http_client.dart
+++ b/lib/core/network/auth_http_client.dart
@@ -24,6 +24,7 @@ import 'package:logging/logging.dart';
 import 'package:wger/core/error_dialogs.dart';
 import 'package:wger/core/network/auth_notifier.dart';
 import 'package:wger/core/network/auth_state.dart';
+import 'package:wger/core/network/network_provider.dart';
 
 /// Pre-emptive refresh leeway: if the access JWT will expire within this
 /// window we refresh before sending the request. Chosen to absorb mild
@@ -34,21 +35,19 @@ const refreshLeeway = Duration(seconds: 30);
 /// authenticated request to the wger backend.
 ///
 /// Responsibilities:
-/// - Inject the right `Authorization` value for the current credential
-///   ([AuthCredential.authHeaderValue] does the dispatch).
-/// - For [JwtCredential], pre-emptively refresh when the stored expiry is
-///   within [refreshLeeway] of now.
-/// - On a 401 reply for a *replayable* [http.Request] body that was sent
-///   with a JWT, refresh once and retry. If the retry also returns 401
-///   the session is treated as genuinely revoked: `onSessionExpired`
-///   runs (clear credentials + surface a snackbar) and a synthetic 401
-///   is returned to the caller. Non-replayable bodies (multipart /
-///   streamed) are not retried; the pre-emptive refresh in the happy
-///   path is the primary safeguard.
+/// - Inject the `Authorization` value for the current credential.
+/// - Pre-emptively refresh when the stored expiry is within
+///   [refreshLeeway] of now.
+/// - On a 401 reply for a *replayable* [http.Request] body, refresh once
+///   and retry with the renewed credential. If the refresh kept the old
+///   one (offline carve-out in `_runRefresh`) the 401 goes back without a
+///   retry; a 401 on the retry counts as revoked and runs
+///   `onSessionExpired`. Non-replayable bodies (multipart / streamed) are
+///   not retried.
 ///
 /// Wrapped behind [authenticatedHttpClientProvider] so consumers
 /// (`WgerBaseProvider`, PowerSync's connector) get the auth handling for
-/// free without needing to know about the migration state.
+/// free.
 class AuthHttpClient extends http.BaseClient {
   final http.Client _inner;
   final AuthState? Function() _readAuth;
@@ -79,17 +78,21 @@ class AuthHttpClient extends http.BaseClient {
     _applyAuthHeader(request, credential);
     final response = await _inner.send(request);
 
-    final canRetry =
-        response.statusCode == 401 && credential is JwtCredential && request is http.Request;
+    final canRetry = response.statusCode == 401 && credential != null && request is http.Request;
     if (!canRetry) {
       return response;
     }
 
-    _logger.fine('401 on JWT request, refreshing once and retrying');
+    _logger.fine('401 on authenticated request, refreshing once and retrying');
     await response.stream.drain<void>();
     await _refresh();
     final fresh = _readAuth()?.credential;
-    if (fresh is! JwtCredential) {
+    if (fresh == null) {
+      return _syntheticUnauthorized();
+    }
+    if (fresh == credential) {
+      // Offline carve-out kept the token; the same token would 401 again
+      _logger.fine('Refresh produced no new credential, passing the 401 through');
       return _syntheticUnauthorized();
     }
 
@@ -110,14 +113,14 @@ class AuthHttpClient extends http.BaseClient {
   @override
   void close() => _inner.close();
 
-  void _applyAuthHeader(http.BaseRequest req, AuthCredential? credential) {
+  void _applyAuthHeader(http.BaseRequest req, JwtCredential? credential) {
     if (credential == null) {
       return;
     }
     req.headers[HttpHeaders.authorizationHeader] = credential.authHeaderValue;
   }
 
-  http.Request _cloneRequest(http.Request orig, AuthCredential credential) {
+  http.Request _cloneRequest(http.Request orig, JwtCredential credential) {
     final retry = http.Request(orig.method, orig.url)
       ..bodyBytes = orig.bodyBytes
       ..encoding = orig.encoding
diff --git a/lib/core/network/auth_notifier.dart b/lib/core/network/auth_notifier.dart
index 3d7124c73..f6ade9af5 100644
--- a/lib/core/network/auth_notifier.dart
+++ b/lib/core/network/auth_notifier.dart
@@ -18,28 +18,25 @@
 
 import 'dart:async';
 import 'dart:convert';
-import 'dart:io';
 
 import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:flutter/foundation.dart' show visibleForTesting;
 import 'package:flutter/widgets.dart' show AppLifecycleListener;
-import 'package:flutter_riverpod/flutter_riverpod.dart' show Provider;
 import 'package:http/http.dart' as http;
 import 'package:logging/logging.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:wger/core/consts.dart';
 import 'package:wger/core/error_dialogs.dart';
-import 'package:wger/core/errors.dart';
-import 'package:wger/core/exceptions/http_exception.dart';
 import 'package:wger/core/exceptions/mfa_required_exception.dart';
-import 'package:wger/core/helpers.dart';
 import 'package:wger/core/http_overrides.dart';
 import 'package:wger/core/network/auth_credentials_storage.dart';
 import 'package:wger/core/network/auth_http_client.dart';
 import 'package:wger/core/network/auth_state.dart';
+import 'package:wger/core/network/headless_auth_api.dart';
 import 'package:wger/core/network/jwt.dart';
 import 'package:wger/core/network/network_provider.dart';
+import 'package:wger/core/network/powersync_session.dart';
 import 'package:wger/core/network/server_gating.dart';
 import 'package:wger/core/shared_preferences.dart';
 import 'package:wger/database/powersync/powersync.dart';
@@ -52,36 +49,13 @@ import 'package:wger/features/trophies/providers/trophy_notifier.dart';
 
 part 'auth_notifier.g.dart';
 
-/// `allauth.headless` `app` client endpoints, relative to the
-/// `/allauth/app/v1/` base.
-const HEADLESS_TOKENS_REFRESH_PATH = 'tokens/refresh';
-const HEADLESS_AUTH_LOGIN_PATH = 'auth/login';
-const HEADLESS_AUTH_SIGNUP_PATH = 'auth/signup';
-const HEADLESS_AUTH_MFA_AUTHENTICATE_PATH = 'auth/2fa/authenticate';
-
-/// `/api/v2/<this>` endpoint that mints a headless-JWT refresh token for the
-/// authenticated user. Used by the one-shot legacy-DRF → JWT migration on
-/// app start.
-const ISSUE_REFRESH_TOKEN_PATH = 'issue-refresh-token';
-
-/// Header that carries the short-lived `session_token` returned by
-/// `auth/login` when a follow-up step (currently only 2FA) is still pending.
-const HEADLESS_SESSION_TOKEN_HEADER = 'X-Session-Token';
-
-/// HTTP client used by the auth notifier. Override in tests.
-final authHttpClientProvider = Provider<http.Client>(
-  (ref) => ReachabilityReportingClient(
-    http.Client(),
-    () => ref.read(networkStatusProvider.notifier),
-  ),
-);
-
 @Riverpod(keepAlive: true)
 class AuthNotifier extends _$AuthNotifier {
   final _logger = Logger('AuthNotifier');
-  late http.Client _client;
+  late HeadlessAuthApi _api;
   late AuthCredentialsStorage _storage;
   late ServerGating _gating;
+  late PowerSyncSession _powerSync;
 
   /// Holds the in-flight refresh future so concurrent callers share a single
   /// network roundtrip. Cleared in `whenComplete` so the next refresh starts
@@ -93,23 +67,27 @@ class AuthNotifier extends _$AuthNotifier {
   @visibleForTesting
   Future<void>? revalidationDone;
 
+  /// Listeners armed by [_scheduleRevalidation], replaced on re-arm: the
+  /// provider is keepAlive, so stacked ones would live for good.
+  StreamSubscription<List<ConnectivityResult>>? _connectivitySub;
+  AppLifecycleListener? _lifecycleListener;
+
   /// Number of times the user-switch DB wipe has fired since the notifier
   /// was built. Exposed so tests can assert the user-mismatch path ran
   /// without having to instrument PowerSync or the filesystem.
   @visibleForTesting
   int userSwitchWipeCount = 0;
 
-  /// Stops the PowerSync sync loop on the keep-data session-reset path.
-  /// Injectable because `PowerSyncDatabase` is a `base` class and cannot be
-  /// faked in tests.
-  @visibleForTesting
-  Future<void> Function() disconnectPowerSync = _disconnectBuiltPowerSync;
-
   @override
   Future<AuthState> build() async {
-    _client = ref.read(authHttpClientProvider);
+    _api = ref.read(headlessAuthApiProvider);
     _storage = ref.read(authCredentialsStorageProvider);
     _gating = ref.read(serverGatingProvider);
+    _powerSync = ref.read(powerSyncSessionProvider);
+    ref.onDispose(() {
+      _connectivitySub?.cancel();
+      _lifecycleListener?.dispose();
+    });
     return _tryAutoLogin();
   }
 
@@ -128,17 +106,14 @@ class AuthNotifier extends _$AuthNotifier {
     if (version.tooOld) {
       return LoginActions.update;
     }
-    final body = <String, String>{'username': username, 'password': password};
-    if (email.isNotEmpty) {
-      body['email'] = email;
-    }
-
-    final response = await _client.post(
-      makeHeadlessUri(serverUrl, HEADLESS_AUTH_SIGNUP_PATH),
-      headers: jsonApiHeaders(appVersion, {HttpHeaders.acceptLanguageHeader: locale}),
-      body: json.encode(body),
+    final creds = await _api.signup(
+      username: username,
+      password: password,
+      email: email,
+      serverUrl: serverUrl,
+      appVersion: appVersion,
+      locale: locale,
     );
-    final creds = _consumeHeadlessAuthResponse(response);
     return _completeLogin(creds, serverUrl, appVersion, serverVersion: version.version);
   }
 
@@ -194,12 +169,12 @@ class AuthNotifier extends _$AuthNotifier {
     if (version.tooOld) {
       return LoginActions.update;
     }
-    final response = await _client.post(
-      makeHeadlessUri(serverUrl, HEADLESS_AUTH_MFA_AUTHENTICATE_PATH),
-      headers: jsonApiHeaders(appVersion, {HEADLESS_SESSION_TOKEN_HEADER: sessionToken}),
-      body: json.encode({'code': code}),
+    final creds = await _api.authenticateMfa(
+      sessionToken: sessionToken,
+      code: code,
+      serverUrl: serverUrl,
+      appVersion: appVersion,
     );
-    final creds = _consumeHeadlessAuthResponse(response);
     return _completeLogin(creds, serverUrl, appVersion, serverVersion: version.version);
   }
 
@@ -231,103 +206,29 @@ class AuthNotifier extends _$AuthNotifier {
     return gate;
   }
 
-  Future<_FreshCredentials> _obtainCredentials(
+  /// The credentials a login attempt yields: the pasted refresh token when
+  /// there is one (rotation invalidates it as part of the exchange), else
+  /// username and password.
+  Future<FreshCredentials> _obtainCredentials(
     String username,
     String password,
     String serverUrl,
     String? pastedRefreshToken,
     PackageInfo appVersion,
-  ) async {
+  ) {
     if (pastedRefreshToken != null && pastedRefreshToken.isNotEmpty) {
-      return _exchangePastedRefreshToken(pastedRefreshToken, serverUrl, appVersion);
-    }
-
-    final response = await _client.post(
-      makeHeadlessUri(serverUrl, HEADLESS_AUTH_LOGIN_PATH),
-      headers: jsonApiHeaders(appVersion),
-      body: json.encode({'username': username, 'password': password}),
-    );
-    return _consumeHeadlessAuthResponse(response);
-  }
-
-  /// Exchanges a manually-pasted refresh token for a fresh access + refresh
-  /// bundle. Rotation is on by default server-side, so the pasted token is
-  /// invalidated as part of this call and the new refresh token is what
-  /// ends up persisted in secure storage. Throws [WgerHttpException] when
-  /// the server rejects the pasted token.
-  Future<_FreshCredentials> _exchangePastedRefreshToken(
-    String refreshToken,
-    String serverUrl,
-    PackageInfo appVersion,
-  ) async {
-    final response = await _client.post(
-      makeHeadlessUri(serverUrl, HEADLESS_TOKENS_REFRESH_PATH),
-      headers: jsonApiHeaders(appVersion),
-      body: json.encode({'refresh_token': refreshToken}),
-    );
-    return _consumeHeadlessAuthResponse(response);
-  }
-
-  /// Parses the standard `allauth.headless` auth response envelope.
-  ///
-  /// Returns a populated [_FreshCredentials] on 200 (tokens carried in
-  /// `meta`).
-  ///
-  /// Throws:
-  /// - [MfaRequiredException] on a 401 that carries `meta.session_token`,
-  ///   signalling that the user must complete a second factor before tokens
-  ///   are issued.
-  /// - [WgerHttpException] for any other status, or for malformed / partial
-  ///   bodies on otherwise-successful responses.
-  _FreshCredentials _consumeHeadlessAuthResponse(http.Response response) {
-    final Map<String, dynamic> body;
-    try {
-      body = json.decode(response.body) as Map<String, dynamic>;
-    } catch (_) {
-      throw WgerHttpException(response);
-    }
-
-    if (response.statusCode == 401) {
-      final meta = body['meta'] as Map<String, dynamic>?;
-      final sessionToken = meta?['session_token'] as String?;
-      if (sessionToken != null && sessionToken.isNotEmpty) {
-        final flows = (body['data'] as Map<String, dynamic>?)?['flows'] as List<dynamic>?;
-        final factors =
-            flows
-                ?.whereType<Map<String, dynamic>>()
-                .where(
-                  (f) => f['id'] == 'mfa_authenticate' && (f['is_pending'] as bool? ?? false),
-                )
-                .expand((f) => (f['types'] as List<dynamic>?)?.cast<String>() ?? const <String>[])
-                .toList() ??
-            const <String>[];
-        throw MfaRequiredException(sessionToken: sessionToken, availableFactors: factors);
-      }
-      throw WgerHttpException(response);
-    }
-
-    if (response.statusCode != 200) {
-      throw WgerHttpException(response);
+      return _api.exchangeRefreshToken(
+        refreshToken: pastedRefreshToken,
+        serverUrl: serverUrl,
+        appVersion: appVersion,
+      );
     }
 
-    // auth/login and auth/signup return the tokens under `meta`, while
-    // tokens/refresh returns them under `data` (see allauth.headless source:
-    // base/response.py vs tokens/response.py). Read both so this parser
-    // works for either response shape.
-    final meta = body['meta'] as Map<String, dynamic>?;
-    final data = body['data'] as Map<String, dynamic>?;
-    final accessToken = (meta?['access_token'] ?? data?['access_token']) as String?;
-    if (accessToken == null || accessToken.isEmpty) {
-      // 200 without tokens, likely a still-pending flow we don't know how
-      // to drive. Surface as an HTTP error so the caller renders something.
-      throw WgerHttpException(response);
-    }
-    return (
-      credential: JwtCredential(
-        accessToken: accessToken,
-        expiresAt: jwtExp(decodeJwtPayload(accessToken)),
-      ),
-      refreshToken: (meta?['refresh_token'] ?? data?['refresh_token']) as String?,
+    return _api.login(
+      username: username,
+      password: password,
+      serverUrl: serverUrl,
+      appVersion: appVersion,
     );
   }
 
@@ -341,7 +242,7 @@ class AuthNotifier extends _$AuthNotifier {
   /// be uploaded under the new user's credentials, which is both a leak
   /// and would corrupt data ownership server-side.
   Future<LoginActions> _completeLogin(
-    _FreshCredentials creds,
+    FreshCredentials creds,
     String serverUrl,
     PackageInfo appVersion, {
     String? serverVersion,
@@ -399,7 +300,11 @@ class AuthNotifier extends _$AuthNotifier {
     state = AsyncData(newState);
 
     if (newState.status == AuthStatus.loggedIn) {
-      await _reconnectPowerSyncIfBuilt(serverUrl);
+      _powerSync.reconnect(
+        serverUrl,
+        ref.read(authenticatedHttpClientProvider),
+        ref.read(syncWatchdogProvider),
+      );
       _invalidatePostLoginProviders();
     }
 
@@ -428,12 +333,7 @@ class AuthNotifier extends _$AuthNotifier {
   }
 
   Future<AuthState> _tryAutoLogin() async {
-    // One-shot migration: if a legacy DRF token is still on disk, swap it
-    // for a JWT bundle now so the rest of the auto-login can take the
-    // JWT happy path. On any failure the legacy blob is left alone and the
-    // user falls back to the still-supported legacy code path; the next
-    // start will try again.
-    await _maybeMigrateLegacyToJwt();
+    await _storage.clearLegacyDrfToken();
     final stored = await _storage.load();
     if (stored == null) {
       _logger.info('autologin failed, no saved session');
@@ -443,111 +343,9 @@ class AuthNotifier extends _$AuthNotifier {
     return _resolveStoredSession(stored, appVersion);
   }
 
-  /// Exchanges a legacy DRF API token for a headless-JWT bundle and
-  /// persists the result. No-op when no legacy blob is present.
-  ///
-  /// Sequence:
-  /// 1. POST to [ISSUE_REFRESH_TOKEN_PATH] authenticated with the legacy
-  ///    `Token <key>` header. The server mints a long-lived refresh token
-  ///    backed by a fresh Django session.
-  /// 2. Exchange that refresh token at the standard headless
-  ///    `tokens/refresh` endpoint for the full access bundle (reuses
-  ///    [_exchangePastedRefreshToken]).
-  /// 3. Persist the bundle. [AuthCredentialsStorage.saveJwt] wipes the
-  ///    legacy `PREFS_USER` blob as a side effect, so the next load sees
-  ///    the JWT path.
-  ///
-  /// Failure handling — all branches log and return without touching
-  /// state, so a re-attempt happens on the next app start:
-  /// - Network error: keep the DRF token, the user continues working
-  ///   against the legacy code path until connectivity returns.
-  /// - 401 / 403: the DRF token has been revoked server-side. Wipe the
-  ///   legacy blob so the user is routed to login (they have no usable
-  ///   credential left).
-  /// - 5xx / malformed body / refresh exchange failure: keep the legacy
-  ///   blob and retry on the next start. The server-side session row
-  ///   minted in step 1 stays orphaned but is harmless.
-  Future<void> _maybeMigrateLegacyToJwt() async {
-    final stored = await _storage.load();
-    if (stored == null || stored.credential is! LegacyCredential) {
-      return;
-    }
-    final legacyCred = stored.credential as LegacyCredential;
-    final serverUrl = stored.serverUrl;
-    final appVersion = await PackageInfo.fromPlatform();
-
-    _logger.info('Legacy DRF token present, attempting JWT migration');
-
-    final http.Response response;
-    try {
-      response = await _client.post(
-        makeUri(serverUrl, ISSUE_REFRESH_TOKEN_PATH, trailingSlash: false),
-        headers: jsonApiHeaders(appVersion, {
-          HttpHeaders.authorizationHeader: legacyCred.authHeaderValue,
-        }),
-      );
-    } on Exception catch (e, s) {
-      if (isNetworkError(e)) {
-        _logger.info('Legacy migration: server unreachable, keeping DRF token');
-        return;
-      }
-      _logger.warning('Legacy migration: exchange POST threw', e, s);
-      return;
-    }
-
-    if (_isAuthRejection(response.statusCode)) {
-      _logger.warning(
-        'Legacy migration: DRF token rejected (${response.statusCode}), wiping legacy blob',
-      );
-      await _storage.clearLegacy();
-      return;
-    }
-    if (response.statusCode != 200) {
-      _logger.warning(
-        'Legacy migration: unexpected status ${response.statusCode}, will retry next start',
-      );
-      return;
-    }
-
-    final String refreshToken;
-    try {
-      final body = json.decode(response.body) as Map<String, dynamic>;
-      refreshToken = body['refresh_token'] as String;
-    } catch (e, s) {
-      _logger.warning('Legacy migration: malformed response body', e, s);
-      return;
-    }
-    if (refreshToken.isEmpty) {
-      _logger.warning('Legacy migration: empty refresh_token in response');
-      return;
-    }
-
-    final _FreshCredentials freshCreds;
-    try {
-      freshCreds = await _exchangePastedRefreshToken(refreshToken, serverUrl, appVersion);
-    } on Exception catch (e, s) {
-      _logger.warning('Legacy migration: refresh token exchange failed', e, s);
-      return;
-    }
-
-    await _storage.saveJwt(
-      credential: freshCreds.credential,
-      refreshToken: freshCreds.refreshToken,
-      serverUrl: serverUrl,
-    );
-    // Claim DB ownership for the migrated user: this path logs in without
-    // going through _completeLogin, so otherwise the marker would stay null
-    // and a later different-user login wouldn't wipe.
-    final migratedUserId = freshCreds.credential.userId;
-    if (migratedUserId != null) {
-      await _storage.setDbOwnerUserId(migratedUserId);
-    }
-    _logger.info('Legacy migration: successful, DRF token replaced with JWT');
-  }
-
-  /// Common path for both the headless-JWT and the legacy auto-login flows:
-  /// probe the server, then run the full gating chain. Wipes the matching
-  /// stored credentials on a definitive 4xx so the user is routed to login.
+  /// Auto-login path for a session that has never synced: probe the server,
+  /// then run the full gating chain. Wipes the stored credentials on a
+  /// definitive 4xx so the user is routed to login.
   Future<AuthState> _autoLoginWith(StoredAuth stored, PackageInfo appVersion) async {
     final response = await _gating.probe(
       credential: stored.credential,
@@ -561,12 +359,12 @@ class AuthNotifier extends _$AuthNotifier {
       return _restoredSessionState(stored, appVersion);
     }
 
-    // The server actively rejected our token: wipe the matching credential
-    // bundle and route to login. Only 401/403 count, a transient 5xx must not
-    // log the user out.
+    // The server actively rejected our token: wipe the stored credentials and
+    // route to login. Only 401/403 count, a transient 5xx must not log the
+    // user out.
     if (_isAuthRejection(response.statusCode)) {
       _logger.info('autologin failed, token rejected: ${response.statusCode}');
-      await _clearStoredCredential(stored.credential);
+      await _storage.clearCredentials();
       return AuthState(applicationVersion: appVersion);
     }
 
@@ -613,8 +411,7 @@ class AuthNotifier extends _$AuthNotifier {
     return _restoredSessionState(stored, appVersion);
   }
 
-  /// Builds a logged-in [AuthState] for a stored session. Polymorphism in
-  /// [AuthCredential] keeps this branch-free across credential variants.
+  /// Builds a logged-in [AuthState] for a stored session.
   AuthState _restoredSessionState(StoredAuth stored, PackageInfo appVersion) {
     return AuthState(
       status: AuthStatus.loggedIn,
@@ -628,15 +425,6 @@ class AuthNotifier extends _$AuthNotifier {
   /// opposed to a transient error that must not invalidate the session.
   bool _isAuthRejection(int statusCode) => statusCode == 401 || statusCode == 403;
 
-  /// Clears only the storage rows that back the given credential. Used on a
-  /// definitive auth-rejection by the server so the next start routes the
-  /// user to the login screen without touching the *other* credential
-  /// shape (which a parallel user on the same device might still rely on).
-  Future<void> _clearStoredCredential(AuthCredential credential) => switch (credential) {
-    LegacyCredential() => _storage.clearLegacy(),
-    JwtCredential() => _storage.clearJwt(),
-  };
-
   /// Schedules a non-blocking revalidation of the restored session.
   ///
   /// The first run is deferred to a fresh event-loop task so [build] has
@@ -649,20 +437,21 @@ class AuthNotifier extends _$AuthNotifier {
   void _scheduleRevalidation() {
     revalidationDone = Future(_revalidate);
 
-    final sub = Connectivity().onConnectivityChanged.listen((results) {
+    _connectivitySub?.cancel();
+    _connectivitySub = Connectivity().onConnectivityChanged.listen((results) {
       final online = results.any((r) => r != ConnectivityResult.none);
       if (online) {
         revalidationDone = _revalidate();
       }
     });
-    ref.onDispose(sub.cancel);
 
     // A warm resume must also revalidate: the process can stay alive in the
     // background for days, so the tokens may have expired without any cold
     // start noticing. The app is offline-first, so without this a dead
     // session would only surface once some server-backed action happens to
     // run. Gated on needsRefresh so quick app switches stay request-free.
-    final lifecycleListener = AppLifecycleListener(
+    _lifecycleListener?.dispose();
+    _lifecycleListener = AppLifecycleListener(
       onResume: () {
         final credential = state.asData?.value.credential;
         if (credential?.needsRefresh(refreshLeeway) ?? false) {
@@ -671,7 +460,6 @@ class AuthNotifier extends _$AuthNotifier {
         }
       },
     );
-    ref.onDispose(lifecycleListener.dispose);
   }
 
   /// Revalidates the restored session against the server. Fire-and-forget: it
@@ -688,9 +476,7 @@ class AuthNotifier extends _$AuthNotifier {
       // If the access token has expired (typical after a longer offline
       // period) refresh first, so a still-valid refresh token isn't wasted
       // by a 401 on the probe below. The refresh's own failure paths will
-      // clear the session if the refresh token is also dead. Legacy
-      // credentials are no-op here ([AuthCredential.needsRefresh] returns
-      // false for them).
+      // clear the session if the refresh token is also dead.
       if (current.credential?.needsRefresh(refreshLeeway) ?? false) {
         _logger.fine('revalidation: access token within leeway, refreshing first');
         await refreshAccessToken();
@@ -828,10 +614,10 @@ class AuthNotifier extends _$AuthNotifier {
     final appVersion = current.applicationVersion ?? await PackageInfo.fromPlatform();
     final http.Response response;
     try {
-      response = await _client.post(
-        makeHeadlessUri(serverUrl, HEADLESS_TOKENS_REFRESH_PATH),
-        headers: jsonApiHeaders(appVersion),
-        body: json.encode({'refresh_token': refreshToken}),
+      response = await _api.postTokenRefresh(
+        refreshToken: refreshToken,
+        serverUrl: serverUrl,
+        appVersion: appVersion,
       );
     } on Exception catch (e, s) {
       _logger.warning(
@@ -886,6 +672,16 @@ class AuthNotifier extends _$AuthNotifier {
       'rotated refresh token: ${newRefresh != null}',
     );
 
+    // A logout, user switch or server change while the request was in flight
+    // ended the session this result belongs to; persisting it would replant
+    // the tokens into the freshly cleared storage and republish the session
+    final latest = _currentOrBlank();
+    if (latest.serverUrl != serverUrl ||
+        latest.credential?.accessToken != current.credential?.accessToken) {
+      _logger.warning('refreshAccessToken: session changed while refreshing, discarding result');
+      return;
+    }
+
     final newCred = JwtCredential(accessToken: newAccess, expiresAt: newExp);
     await _storage.updateJwt(credential: newCred, refreshToken: newRefresh);
     state = AsyncData(current.copyWith(credential: newCred));
@@ -934,7 +730,7 @@ class AuthNotifier extends _$AuthNotifier {
     var wiped = true;
     if (wipeLocalData) {
       try {
-        await _wipeLocalDb();
+        await _powerSync.wipe();
       } catch (e, s) {
         _logger.severe('logout wipe failed, keeping owner marker', e, s);
         wiped = false;
@@ -944,7 +740,7 @@ class AuthNotifier extends _$AuthNotifier {
       // refresh future, and the disconnect can block on a sync fetch that is
       // itself awaiting that future (refresh -> disconnect -> sync fetch ->
       // refresh deadlock). The DB is kept, so there is no wipe to race with.
-      unawaited(disconnectPowerSync());
+      unawaited(_powerSync.disconnect());
     }
 
     state = AsyncData(
@@ -969,54 +765,7 @@ class AuthNotifier extends _$AuthNotifier {
   /// Wipes the local PowerSync data when a different user logs in.
   Future<void> _wipeOnUserSwitch() async {
     userSwitchWipeCount++;
-    await _wipeLocalDb();
-  }
-
-  /// Removes the local PowerSync data whether or not the DB has been built:
-  /// when the instance exists we use PowerSync's own `disconnectAndClear`,
-  /// otherwise (cold start, before any data widget has built it) we delete
-  /// the on-disk files directly so no data survives.
-  ///
-  /// Throws if the wipe fails. Callers must abort before advancing the DB
-  /// owner marker, otherwise the previous user's data stay on disk
-  Future<void> _wipeLocalDb() async {
-    final db = builtPowerSyncInstance;
-    if (db != null) {
-      try {
-        await db.disconnectAndClear();
-      } catch (e, s) {
-        _logger.severe('local DB wipe via disconnectAndClear failed', e, s);
-        rethrow;
-      }
-      return;
-    }
-    try {
-      await deletePowerSyncDatabaseFile();
-    } catch (e, s) {
-      _logger.severe('local DB wipe via file delete failed', e, s);
-      rethrow;
-    }
-  }
-
-  /// Reconnects an already-built PowerSync DB with a fresh connector for the
-  /// given [serverUrl]. No-op when PowerSync hasn't been built yet: the next
-  /// access will build it with the current (post-login) auth state.
-  Future<void> _reconnectPowerSyncIfBuilt(String serverUrl) async {
-    final db = builtPowerSyncInstance;
-    if (db == null) {
-      return;
-    }
-    try {
-      connectPowerSync(
-        db,
-        serverUrl,
-        ref.read(authenticatedHttpClientProvider),
-        ref.read(syncWatchdogProvider),
-        reason: 'login completed',
-      );
-    } catch (e, s) {
-      _logger.warning('PowerSync reconnect failed', e, s);
-    }
+    await _powerSync.wipe();
   }
 
   /// Refreshes the server version into the state.
@@ -1040,49 +789,3 @@ class AuthNotifier extends _$AuthNotifier {
     return userData['serverUrl'] as String;
   }
 }
-
-/// In-memory bundle returned by the login / signup flows. Always carries a
-/// [JwtCredential] (fresh logins go through `allauth.headless`); the refresh
-/// token is the one the caller still needs to write to secure storage.
-typedef _FreshCredentials = ({JwtCredential credential, String? refreshToken});
-
-/// Default for [AuthNotifier.disconnectPowerSync]: disconnects an
-/// already-built PowerSync DB but keeps its data on disk. No-op when
-/// PowerSync hasn't been built yet.
-Future<void> _disconnectBuiltPowerSync() async {
-  final db = builtPowerSyncInstance;
-  if (db == null) {
-    return;
-  }
-  try {
-    await db.disconnect();
-  } catch (e, s) {
-    Logger('AuthNotifier').warning('PowerSync disconnect failed', e, s);
-  }
-}
-
-/// User-agent header string identifying the app/version/platform.
-String getAppNameHeader(PackageInfo? applicationVersion) {
-  String out = '';
-  if (applicationVersion != null) {
-    out =
-        '/${applicationVersion.version} '
-        '(${applicationVersion.packageName}; '
-        'build: ${applicationVersion.buildNumber}; '
-        'platform: ${Platform.operatingSystem})'
-        ' - https://github.com/wger-project';
-  }
-  return 'wger App$out';
-}
-
-/// Standard JSON-API headers for the auth endpoints. The `Accept` header keeps
-/// a bot wall (e.g. Anubis) from serving an HTML challenge to these endpoints
-/// instead of JSON. [extra] adds per-request headers (session token, auth, ...).
-Map<String, String> jsonApiHeaders(PackageInfo? appVersion, [Map<String, String>? extra]) {
-  return {
-    HttpHeaders.contentTypeHeader: 'application/json; charset=utf-8',
-    HttpHeaders.acceptHeader: 'application/json',
-    HttpHeaders.userAgentHeader: getAppNameHeader(appVersion),
-    ...?extra,
-  };
-}
diff --git a/lib/core/network/auth_notifier.g.dart b/lib/core/network/auth_notifier.g.dart
index 0251cb9cc..1273b1f08 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'4aa4190b882d8e6708ef6bcc75df232ea73d2e43';
+String _$authNotifierHash() => r'20634c92164a774060760f66edbe3357cf219279';
 
 abstract class _$AuthNotifier extends $AsyncNotifier<AuthState> {
   FutureOr<AuthState> build();
diff --git a/lib/core/network/auth_state.dart b/lib/core/network/auth_state.dart
index 6cc5b3d72..56170b5b8 100644
--- a/lib/core/network/auth_state.dart
+++ b/lib/core/network/auth_state.dart
@@ -45,24 +45,11 @@ enum LoginActions {
   proceed,
 }
 
-/// Storage-layer discriminator for the persisted credential bundle. Lives in
-/// `PREFS_TOKEN_TYPE` so auto-login can tell which set of preference keys to
-/// read on startup. Runtime code should branch on the [AuthCredential]
-/// subtype (`LegacyCredential` / `JwtCredential`) instead.
-enum AuthTokenType {
-  /// Permanent DRF token persisted under `PREFS_USER`.
-  legacyApiToken,
-
-  /// Headless JWT bundle persisted under the `PREFS_ACCESS_TOKEN` family of
-  /// keys; refresh token lives in secure storage.
-  headlessJwt,
-}
-
 @freezed
 sealed class AuthState with _$AuthState {
   const factory AuthState({
     @Default(AuthStatus.loggedOut) AuthStatus status,
-    AuthCredential? credential,
+    JwtCredential? credential,
     String? serverUrl,
     String? serverVersion,
     PackageInfo? applicationVersion,
diff --git a/lib/core/network/auth_state.freezed.dart b/lib/core/network/auth_state.freezed.dart
index 56028625b..f2b2cb40d 100644
--- a/lib/core/network/auth_state.freezed.dart
+++ b/lib/core/network/auth_state.freezed.dart
@@ -14,7 +14,7 @@ T _$identity<T>(T value) => value;
 /// @nodoc
 mixin _$AuthState {
 
- AuthStatus get status; AuthCredential? get credential; String? get serverUrl; String? get serverVersion; PackageInfo? get applicationVersion; bool get serverConfigWarning;/// True when the previous session ended involuntarily (expired or
+ AuthStatus get status; JwtCredential? get credential; String? get serverUrl; String? get serverVersion; PackageInfo? get applicationVersion; bool get serverConfigWarning;/// True when the previous session ended involuntarily (expired or
 /// revoked tokens). The login screen shows a hint so the user knows
 /// why they have to log in again. Reset by the next login, which
 /// builds a fresh state.
@@ -49,11 +49,11 @@ abstract mixin class $AuthStateCopyWith<$Res>  {
   factory $AuthStateCopyWith(AuthState value, $Res Function(AuthState) _then) = _$AuthStateCopyWithImpl;
 @useResult
 $Res call({
- AuthStatus status, AuthCredential? credential, String? serverUrl, String? serverVersion, PackageInfo? applicationVersion, bool serverConfigWarning, bool sessionExpired
+ AuthStatus status, JwtCredential? credential, String? serverUrl, String? serverVersion, PackageInfo? applicationVersion, bool serverConfigWarning, bool sessionExpired
 });
 
 
-$AuthCredentialCopyWith<$Res>? get credential;
+$JwtCredentialCopyWith<$Res>? get credential;
 
 }
 /// @nodoc
@@ -70,7 +70,7 @@ class _$AuthStateCopyWithImpl<$Res>
   return _then(_self.copyWith(
 status: null == status ? _self.status : status // ignore: cast_nullable_to_non_nullable
 as AuthStatus,credential: freezed == credential ? _self.credential : credential // ignore: cast_nullable_to_non_nullable
-as AuthCredential?,serverUrl: freezed == serverUrl ? _self.serverUrl : serverUrl // ignore: cast_nullable_to_non_nullable
+as JwtCredential?,serverUrl: freezed == serverUrl ? _self.serverUrl : serverUrl // ignore: cast_nullable_to_non_nullable
 as String?,serverVersion: freezed == serverVersion ? _self.serverVersion : serverVersion // ignore: cast_nullable_to_non_nullable
 as String?,applicationVersion: freezed == applicationVersion ? _self.applicationVersion : applicationVersion // ignore: cast_nullable_to_non_nullable
 as PackageInfo?,serverConfigWarning: null == serverConfigWarning ? _self.serverConfigWarning : serverConfigWarning // ignore: cast_nullable_to_non_nullable
@@ -82,12 +82,12 @@ as bool,
 /// with the given fields replaced by the non-null parameter values.
 @override
 @pragma('vm:prefer-inline')
-$AuthCredentialCopyWith<$Res>? get credential {
+$JwtCredentialCopyWith<$Res>? get credential {
     if (_self.credential == null) {
     return null;
   }
 
-  return $AuthCredentialCopyWith<$Res>(_self.credential!, (value) {
+  return $JwtCredentialCopyWith<$Res>(_self.credential!, (value) {
     return _then(_self.copyWith(credential: value));
   });
 }
@@ -169,7 +169,7 @@ return $default(_that);case _:
 /// }
 /// ```
 
-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( AuthStatus status,  AuthCredential? credential,  String? serverUrl,  String? serverVersion,  PackageInfo? applicationVersion,  bool serverConfigWarning,  bool sessionExpired)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( AuthStatus status,  JwtCredential? credential,  String? serverUrl,  String? serverVersion,  PackageInfo? applicationVersion,  bool serverConfigWarning,  bool sessionExpired)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _AuthState() when $default != null:
 return $default(_that.status,_that.credential,_that.serverUrl,_that.serverVersion,_that.applicationVersion,_that.serverConfigWarning,_that.sessionExpired);case _:
@@ -190,7 +190,7 @@ return $default(_that.status,_that.credential,_that.serverUrl,_that.serverVersio
 /// }
 /// ```
 
-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( AuthStatus status,  AuthCredential? credential,  String? serverUrl,  String? serverVersion,  PackageInfo? applicationVersion,  bool serverConfigWarning,  bool sessionExpired)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( AuthStatus status,  JwtCredential? credential,  String? serverUrl,  String? serverVersion,  PackageInfo? applicationVersion,  bool serverConfigWarning,  bool sessionExpired)  $default,) {final _that = this;
 switch (_that) {
 case _AuthState():
 return $default(_that.status,_that.credential,_that.serverUrl,_that.serverVersion,_that.applicationVersion,_that.serverConfigWarning,_that.sessionExpired);}
@@ -207,7 +207,7 @@ return $default(_that.status,_that.credential,_that.serverUrl,_that.serverVersio
 /// }
 /// ```
 
-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( AuthStatus status,  AuthCredential? credential,  String? serverUrl,  String? serverVersion,  PackageInfo? applicationVersion,  bool serverConfigWarning,  bool sessionExpired)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( AuthStatus status,  JwtCredential? credential,  String? serverUrl,  String? serverVersion,  PackageInfo? applicationVersion,  bool serverConfigWarning,  bool sessionExpired)?  $default,) {final _that = this;
 switch (_that) {
 case _AuthState() when $default != null:
 return $default(_that.status,_that.credential,_that.serverUrl,_that.serverVersion,_that.applicationVersion,_that.serverConfigWarning,_that.sessionExpired);case _:
@@ -226,7 +226,7 @@ class _AuthState extends AuthState {
   
 
 @override@JsonKey() final  AuthStatus status;
-@override final  AuthCredential? credential;
+@override final  JwtCredential? credential;
 @override final  String? serverUrl;
 @override final  String? serverVersion;
 @override final  PackageInfo? applicationVersion;
@@ -267,11 +267,11 @@ abstract mixin class _$AuthStateCopyWith<$Res> implements $AuthStateCopyWith<$Re
   factory _$AuthStateCopyWith(_AuthState value, $Res Function(_AuthState) _then) = __$AuthStateCopyWithImpl;
 @override @useResult
 $Res call({
- AuthStatus status, AuthCredential? credential, String? serverUrl, String? serverVersion, PackageInfo? applicationVersion, bool serverConfigWarning, bool sessionExpired
+ AuthStatus status, JwtCredential? credential, String? serverUrl, String? serverVersion, PackageInfo? applicationVersion, bool serverConfigWarning, bool sessionExpired
 });
 
 
-@override $AuthCredentialCopyWith<$Res>? get credential;
+@override $JwtCredentialCopyWith<$Res>? get credential;
 
 }
 /// @nodoc
@@ -288,7 +288,7 @@ class __$AuthStateCopyWithImpl<$Res>
   return _then(_AuthState(
 status: null == status ? _self.status : status // ignore: cast_nullable_to_non_nullable
 as AuthStatus,credential: freezed == credential ? _self.credential : credential // ignore: cast_nullable_to_non_nullable
-as AuthCredential?,serverUrl: freezed == serverUrl ? _self.serverUrl : serverUrl // ignore: cast_nullable_to_non_nullable
+as JwtCredential?,serverUrl: freezed == serverUrl ? _self.serverUrl : serverUrl // ignore: cast_nullable_to_non_nullable
 as String?,serverVersion: freezed == serverVersion ? _self.serverVersion : serverVersion // ignore: cast_nullable_to_non_nullable
 as String?,applicationVersion: freezed == applicationVersion ? _self.applicationVersion : applicationVersion // ignore: cast_nullable_to_non_nullable
 as PackageInfo?,serverConfigWarning: null == serverConfigWarning ? _self.serverConfigWarning : serverConfigWarning // ignore: cast_nullable_to_non_nullable
@@ -301,12 +301,12 @@ as bool,
 /// with the given fields replaced by the non-null parameter values.
 @override
 @pragma('vm:prefer-inline')
-$AuthCredentialCopyWith<$Res>? get credential {
+$JwtCredentialCopyWith<$Res>? get credential {
     if (_self.credential == null) {
     return null;
   }
 
-  return $AuthCredentialCopyWith<$Res>(_self.credential!, (value) {
+  return $JwtCredentialCopyWith<$Res>(_self.credential!, (value) {
     return _then(_self.copyWith(credential: value));
   });
 }
diff --git a/lib/core/network/base_provider.dart b/lib/core/network/base_provider.dart
index 6e1168845..85a9f437f 100644
--- a/lib/core/network/base_provider.dart
+++ b/lib/core/network/base_provider.dart
@@ -26,7 +26,7 @@ import 'package:logging/logging.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:wger/core/exceptions/http_exception.dart';
 import 'package:wger/core/helpers.dart';
-import 'package:wger/core/network/auth_notifier.dart' show getAppNameHeader;
+import 'package:wger/core/network/api_headers.dart' show getAppNameHeader;
 
 /// default timeout for GET requests
 const DEFAULT_TIMEOUT = Duration(seconds: 15);
diff --git a/lib/core/network/headless_auth_api.dart b/lib/core/network/headless_auth_api.dart
new file mode 100644
index 000000000..0ca5ab645
--- /dev/null
+++ b/lib/core/network/headless_auth_api.dart
@@ -0,0 +1,215 @@
+/*
+ * 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:convert';
+import 'dart:io';
+
+import 'package:flutter_riverpod/flutter_riverpod.dart' show Provider;
+import 'package:http/http.dart' as http;
+import 'package:package_info_plus/package_info_plus.dart';
+import 'package:wger/core/exceptions/http_exception.dart';
+import 'package:wger/core/exceptions/mfa_required_exception.dart';
+import 'package:wger/core/helpers.dart';
+import 'package:wger/core/network/api_headers.dart';
+import 'package:wger/core/network/auth_credential.dart';
+import 'package:wger/core/network/jwt.dart';
+import 'package:wger/core/network/network_provider.dart';
+
+/// `allauth.headless` `app` client endpoints, relative to the
+/// `/allauth/app/v1/` base.
+const HEADLESS_TOKENS_REFRESH_PATH = 'tokens/refresh';
+const HEADLESS_AUTH_LOGIN_PATH = 'auth/login';
+const HEADLESS_AUTH_SIGNUP_PATH = 'auth/signup';
+const HEADLESS_AUTH_MFA_AUTHENTICATE_PATH = 'auth/2fa/authenticate';
+
+/// Header that carries the short-lived `session_token` returned by
+/// `auth/login` when a follow-up step (currently only 2FA) is still pending.
+const HEADLESS_SESSION_TOKEN_HEADER = 'X-Session-Token';
+
+/// In-memory bundle returned by the login / signup flows. Always carries a
+/// [JwtCredential] (fresh logins go through `allauth.headless`); the refresh
+/// token is the one the caller still needs to write to secure storage.
+typedef FreshCredentials = ({JwtCredential credential, String? refreshToken});
+
+/// The `allauth.headless` endpoints the app authenticates against: which URL
+/// carries which body, and how the response envelope is read.
+///
+/// Knows nothing about the session it produces credentials for; what happens
+/// with them (persisting, gating, publishing the state) is the notifier's.
+class HeadlessAuthApi {
+  final http.Client _client;
+
+  HeadlessAuthApi(this._client);
+
+  /// Registers a user, who is logged in by the same call: the response
+  /// already carries the access + refresh tokens.
+  Future<FreshCredentials> signup({
+    required String username,
+    required String password,
+    required String email,
+    required String serverUrl,
+    required PackageInfo appVersion,
+    String locale = 'en',
+  }) async {
+    final body = <String, String>{'username': username, 'password': password};
+    if (email.isNotEmpty) {
+      body['email'] = email;
+    }
+
+    return _post(
+      serverUrl,
+      HEADLESS_AUTH_SIGNUP_PATH,
+      appVersion,
+      body,
+      extraHeaders: {HttpHeaders.acceptLanguageHeader: locale},
+    );
+  }
+
+  /// Logs in with username and password. A pending second factor surfaces as
+  /// [MfaRequiredException], which the caller answers with [authenticateMfa].
+  Future<FreshCredentials> login({
+    required String username,
+    required String password,
+    required String serverUrl,
+    required PackageInfo appVersion,
+  }) => _post(serverUrl, HEADLESS_AUTH_LOGIN_PATH, appVersion, {
+    'username': username,
+    'password': password,
+  });
+
+  /// Answers a pending second-factor challenge with [code] (a TOTP or a
+  /// recovery code) and the session token the challenge came with.
+  Future<FreshCredentials> authenticateMfa({
+    required String sessionToken,
+    required String code,
+    required String serverUrl,
+    required PackageInfo appVersion,
+  }) => _post(
+    serverUrl,
+    HEADLESS_AUTH_MFA_AUTHENTICATE_PATH,
+    appVersion,
+    {'code': code},
+    extraHeaders: {HEADLESS_SESSION_TOKEN_HEADER: sessionToken},
+  );
+
+  /// Exchanges a refresh token for a fresh bundle. Rotation is on by default
+  /// server-side, so the token handed in is invalidated by this call and the
+  /// new one is what the caller has to persist.
+  Future<FreshCredentials> exchangeRefreshToken({
+    required String refreshToken,
+    required String serverUrl,
+    required PackageInfo appVersion,
+  }) => _post(serverUrl, HEADLESS_TOKENS_REFRESH_PATH, appVersion, {
+    'refresh_token': refreshToken,
+  });
+
+  /// The raw token refresh, for the background path that tells a network
+  /// error, a rejection and a malformed body apart, since each means
+  /// something different for the session it is refreshing.
+  Future<http.Response> postTokenRefresh({
+    required String refreshToken,
+    required String serverUrl,
+    required PackageInfo appVersion,
+  }) => _client.post(
+    makeHeadlessUri(serverUrl, HEADLESS_TOKENS_REFRESH_PATH),
+    headers: jsonApiHeaders(appVersion),
+    body: json.encode({'refresh_token': refreshToken}),
+  );
+
+  Future<FreshCredentials> _post(
+    String serverUrl,
+    String path,
+    PackageInfo appVersion,
+    Map<String, String> body, {
+    Map<String, String>? extraHeaders,
+  }) async {
+    final response = await _client.post(
+      makeHeadlessUri(serverUrl, path),
+      headers: jsonApiHeaders(appVersion, extraHeaders),
+      body: json.encode(body),
+    );
+    return consumeAuthResponse(response);
+  }
+
+  /// Parses the standard `allauth.headless` auth response envelope.
+  ///
+  /// Returns a populated [FreshCredentials] on 200 (tokens carried in
+  /// `meta`).
+  ///
+  /// Throws:
+  /// - [MfaRequiredException] on a 401 that carries `meta.session_token`,
+  ///   signalling that the user must complete a second factor before tokens
+  ///   are issued.
+  /// - [WgerHttpException] for any other status, or for malformed / partial
+  ///   bodies on otherwise-successful responses.
+  static FreshCredentials consumeAuthResponse(http.Response response) {
+    final Map<String, dynamic> body;
+    try {
+      body = json.decode(response.body) as Map<String, dynamic>;
+    } catch (_) {
+      throw WgerHttpException(response);
+    }
+
+    if (response.statusCode == 401) {
+      final meta = body['meta'] as Map<String, dynamic>?;
+      final sessionToken = meta?['session_token'] as String?;
+      if (sessionToken != null && sessionToken.isNotEmpty) {
+        final flows = (body['data'] as Map<String, dynamic>?)?['flows'] as List<dynamic>?;
+        final factors =
+            flows
+                ?.whereType<Map<String, dynamic>>()
+                .where(
+                  (f) => f['id'] == 'mfa_authenticate' && (f['is_pending'] as bool? ?? false),
+                )
+                .expand((f) => (f['types'] as List<dynamic>?)?.cast<String>() ?? const <String>[])
+                .toList() ??
+            const <String>[];
+        throw MfaRequiredException(sessionToken: sessionToken, availableFactors: factors);
+      }
+      throw WgerHttpException(response);
+    }
+
+    if (response.statusCode != 200) {
+      throw WgerHttpException(response);
+    }
+
+    // auth/login and auth/signup return the tokens under `meta`, while
+    // tokens/refresh returns them under `data` (see allauth.headless source:
+    // base/response.py vs tokens/response.py). Read both so this parser
+    // works for either response shape.
+    final meta = body['meta'] as Map<String, dynamic>?;
+    final data = body['data'] as Map<String, dynamic>?;
+    final accessToken = (meta?['access_token'] ?? data?['access_token']) as String?;
+    if (accessToken == null || accessToken.isEmpty) {
+      // 200 without tokens, likely a still-pending flow we don't know how
+      // to drive. Surface as an HTTP error so the caller renders something.
+      throw WgerHttpException(response);
+    }
+    return (
+      credential: JwtCredential(
+        accessToken: accessToken,
+        expiresAt: jwtExp(decodeJwtPayload(accessToken)),
+      ),
+      refreshToken: (meta?['refresh_token'] ?? data?['refresh_token']) as String?,
+    );
+  }
+}
+
+final headlessAuthApiProvider = Provider<HeadlessAuthApi>(
+  (ref) => HeadlessAuthApi(ref.read(authHttpClientProvider)),
+);
diff --git a/lib/core/network/network_provider.dart b/lib/core/network/network_provider.dart
index 5b00041ab..9d7566d6d 100644
--- a/lib/core/network/network_provider.dart
+++ b/lib/core/network/network_provider.dart
@@ -22,6 +22,7 @@ import 'dart:io';
 import 'package:collection/collection.dart';
 import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:flutter/widgets.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart' show Provider;
 import 'package:http/http.dart' as http;
 import 'package:logging/logging.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
@@ -342,6 +343,16 @@ class NetworkStatus extends _$NetworkStatus {
   }
 }
 
+/// Raw HTTP client of the auth endpoints: deliberately unauthenticated
+/// (login, refresh, version probe), so it does not recurse through the
+/// authenticated wrapper. Override in tests.
+final authHttpClientProvider = Provider<http.Client>(
+  (ref) => ReachabilityReportingClient(
+    http.Client(),
+    () => ref.read(networkStatusProvider.notifier),
+  ),
+);
+
 /// Feeds every request outcome into [NetworkStatus]: any response means the
 /// backend was reached (4xx/5xx included), a network error means it was not.
 /// Wrapped around the raw client, so auth traffic counts as a probe too.
diff --git a/lib/core/network/powersync_session.dart b/lib/core/network/powersync_session.dart
new file mode 100644
index 000000000..7f6258be5
--- /dev/null
+++ b/lib/core/network/powersync_session.dart
@@ -0,0 +1,98 @@
+/*
+ * 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_riverpod/flutter_riverpod.dart' show Provider;
+import 'package:http/http.dart' as http;
+import 'package:logging/logging.dart';
+import 'package:wger/core/shared_preferences.dart';
+import 'package:wger/database/powersync/powersync.dart';
+import 'package:wger/features/account/providers/timezone_sync.dart';
+import 'package:wger/powersync/sync_watchdog.dart';
+
+/// What a session change does to the local PowerSync database: disconnect it,
+/// reconnect it with new credentials, or remove its data.
+///
+/// A seam as much as a grouping: `PowerSyncDatabase` is a `base` class and
+/// cannot be faked, so a test that would otherwise touch the real singleton
+/// overrides [powerSyncSessionProvider] instead.
+class PowerSyncSession {
+  final _logger = Logger('PowerSyncSession');
+
+  /// Disconnects an already-built DB but keeps its data on disk. No-op when
+  /// PowerSync hasn't been built yet.
+  Future<void> disconnect() async {
+    final db = builtPowerSyncInstance;
+    if (db == null) {
+      return;
+    }
+    try {
+      await db.disconnect();
+    } catch (e, s) {
+      _logger.warning('PowerSync disconnect failed', e, s);
+    }
+  }
+
+  /// Reconnects an already-built DB with a fresh connector for [serverUrl].
+  /// No-op when PowerSync hasn't been built yet: the next access will build
+  /// it with the current (post-login) auth state.
+  void reconnect(String serverUrl, http.Client client, SyncStreamWatchdog watchdog) {
+    final db = builtPowerSyncInstance;
+    if (db == null) {
+      return;
+    }
+    try {
+      connectPowerSync(db, serverUrl, client, watchdog, reason: 'login completed');
+    } catch (e, s) {
+      _logger.warning('PowerSync reconnect failed', e, s);
+    }
+  }
+
+  /// Removes the local data whether or not the DB has been built: when the
+  /// instance exists we use PowerSync's own `disconnectAndClear`, otherwise
+  /// (cold start, before any data widget has built it) we delete the on-disk
+  /// files directly so no data survives.
+  ///
+  /// Throws if the wipe fails. Callers must abort before advancing the DB
+  /// owner marker, otherwise the previous user's data stay on disk
+  Future<void> wipe() async {
+    final db = builtPowerSyncInstance;
+    if (db != null) {
+      try {
+        await db.disconnectAndClear();
+      } catch (e, s) {
+        _logger.severe('local DB wipe via disconnectAndClear failed', e, s);
+        rethrow;
+      }
+    } else {
+      try {
+        await deletePowerSyncDatabaseFile();
+      } catch (e, s) {
+        _logger.severe('local DB wipe via file delete failed', e, s);
+        rethrow;
+      }
+    }
+
+    // The account-scoped preferences leave with the data: the next account
+    // must not inherit the health-sync opt-in and watermarks, nor a timezone
+    // marker that would let the sync overwrite its chosen zone
+    await PreferenceHelper.instance.clearHealthSyncPreferences();
+    await PreferenceHelper.asyncPref.remove(reportedTimezonePrefKey);
+  }
+}
+
+final powerSyncSessionProvider = Provider<PowerSyncSession>((ref) => PowerSyncSession());
diff --git a/lib/core/network/server_gating.dart b/lib/core/network/server_gating.dart
index 188d6be83..a55ccba13 100644
--- a/lib/core/network/server_gating.dart
+++ b/lib/core/network/server_gating.dart
@@ -27,9 +27,10 @@ import 'package:version/version.dart';
 import 'package:wger/core/consts.dart';
 import 'package:wger/core/errors.dart';
 import 'package:wger/core/helpers.dart';
+import 'package:wger/core/network/api_headers.dart';
 import 'package:wger/core/network/auth_credentials_storage.dart';
-import 'package:wger/core/network/auth_notifier.dart';
 import 'package:wger/core/network/auth_state.dart';
+import 'package:wger/core/network/network_provider.dart';
 
 /// `/api/v2/` endpoints used by the gating chain.
 const _MIN_APP_VERSION_PATH = 'min-app-version';
@@ -49,7 +50,7 @@ class ServerGating {
   /// separately via [serverVersionGate], so callers check the version once and
   /// pass it into the auth state themselves.
   Future<AuthStatus> resolve({
-    required AuthCredential credential,
+    required JwtCredential credential,
     required String serverUrl,
     required PackageInfo appVersion,
   }) async {
@@ -77,7 +78,7 @@ class ServerGating {
   /// can distinguish "we couldn't reach the server" from "the server said
   /// no". Only the latter is grounds for logging the user out.
   Future<http.Response?> probe({
-    required AuthCredential credential,
+    required JwtCredential credential,
     required String serverUrl,
     required PackageInfo appVersion,
   }) async {
@@ -106,7 +107,7 @@ class ServerGating {
   /// completed conclusively, so the caller defaults to permissive).
   Future<bool> serverConfigSane({
     required String serverUrl,
-    required AuthCredential credential,
+    required JwtCredential credential,
   }) async {
     try {
       final baseUri = Uri.parse(serverUrl);
@@ -143,7 +144,7 @@ class ServerGating {
   /// success the flag is set so future starts skip the probe.
   Future<bool> isPowerSyncReachable({
     required String serverUrl,
-    required AuthCredential credential,
+    required JwtCredential credential,
   }) async {
     if (await _storage.hasEverSynced()) {
       return true;
diff --git a/lib/core/shared_preferences.dart b/lib/core/shared_preferences.dart
index de3ed3b16..33eaf1cf0 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,88 @@ class PreferenceHelper {
       orElse: () => fallback.searchMode,
     );
   }
+
+  // --- Health sync ---
+
+  static const _healthSyncEnabledKey = 'healthSyncEnabled';
+  static const _healthSyncWatermarksKey = 'healthSyncWatermarks';
+  static const _healthSyncReadableTypesKey = 'healthSyncReadableTypes';
+  static const _healthSyncEmptyMetricsKey = 'healthSyncEmptyMetrics';
+  static const _healthSyncLastRunKey = 'healthSyncLastRun';
+
+  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);
+  }
+
+  /// When the last import finished, as an ISO-8601 timestamp.
+  ///
+  /// Persisted rather than kept in memory: the automatic syncs are throttled
+  /// against it, and an app restart would otherwise always look like the first
+  /// run of the day.
+  Future<void> setHealthSyncLastRun(DateTime value) async {
+    await PreferenceHelper.asyncPref.setString(_healthSyncLastRunKey, value.toIso8601String());
+  }
+
+  Future<DateTime?> getHealthSyncLastRun() async {
+    final stored = await PreferenceHelper.asyncPref.getString(_healthSyncLastRunKey);
+    return stored == null ? null : DateTime.tryParse(stored);
+  }
+
+  Future<void> clearHealthSyncPreferences() async {
+    await PreferenceHelper.asyncPref.remove(_healthSyncEnabledKey);
+    await PreferenceHelper.asyncPref.remove(_healthSyncWatermarksKey);
+    await PreferenceHelper.asyncPref.remove(_healthSyncReadableTypesKey);
+    await PreferenceHelper.asyncPref.remove(_healthSyncEmptyMetricsKey);
+    await PreferenceHelper.asyncPref.remove(_healthSyncLastRunKey);
+  }
 }
diff --git a/lib/core/widgets/about.dart b/lib/core/widgets/about.dart
index 144308fa0..b7ae7cdc8 100644
--- a/lib/core/widgets/about.dart
+++ b/lib/core/widgets/about.dart
@@ -23,6 +23,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:wger/core/consts.dart';
 import 'package:wger/core/errors.dart' show buildGithubIssueUrl;
+import 'package:wger/core/helpers.dart' show makePageUri;
 import 'package:wger/core/logs.dart';
 import 'package:wger/core/misc.dart';
 import 'package:wger/core/network/auth_notifier.dart';
@@ -60,6 +61,10 @@ class AboutPage extends ConsumerWidget {
     final i18n = AppLocalizations.of(context);
     final today = DateTime.now();
 
+    // The terms are the server operator's, not ours, so point at the instance
+    // the user is actually connected to
+    final serverUrl = authState?.serverUrl;
+
     return Scaffold(
       appBar: AppBar(title: Text(i18n.aboutPageTitle)),
       body: WidescreenWrapper(
@@ -257,6 +262,15 @@ class AboutPage extends ConsumerWidget {
                 contentPadding: EdgeInsets.zero,
                 onTap: () => launchURL(READTHEDOCS_URL, context),
               ),
+              if (serverUrl != null)
+                ListTile(
+                  leading: const Icon(Icons.privacy_tip),
+                  trailing: const Icon(Icons.arrow_outward),
+                  title: Text(i18n.aboutPrivacyPolicyTitle),
+                  contentPadding: EdgeInsets.zero,
+                  onTap: () =>
+                      launchURL(makePageUri(serverUrl, TERMS_OF_SERVICE_PATH).toString(), context),
+                ),
             ],
           ),
         ),
diff --git a/lib/core/widgets/dashboard/calendar.dart b/lib/core/widgets/dashboard/calendar.dart
index 719a2a4ae..68dd3ef3b 100644
--- a/lib/core/widgets/dashboard/calendar.dart
+++ b/lib/core/widgets/dashboard/calendar.dart
@@ -24,14 +24,16 @@ 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/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,40 +80,56 @@ 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,
+    required String? ownerZone,
   }) {
-    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'),
         );
       }
     }
 
     for (final session in sessions) {
-      final date = DateFormatLists.format(session.date);
+      final date = DateFormatLists.format(session.localDayIn(ownerZone));
       events.putIfAbsent(date, () => []);
       var time = '';
-      if (session.timeStart != null && session.timeEnd != null) {
-        time = '(${timeToString(session.timeStart)} - ${timeToString(session.timeEnd)})';
+      if (session.datetimeEnd != null) {
+        time =
+            '(${timeToString(TimeOfDay.fromDateTime(session.datetimeStart))} - ${timeToString(TimeOfDay.fromDateTime(session.datetimeEnd!))})';
       }
       events[date]!.add(
         Event(
@@ -187,23 +205,30 @@ 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,
+      ownerZone: profile.timeZone,
     );
 
     final selectedEvents = _selectedDay != null
diff --git a/lib/core/widgets/dashboard/widgets/measurements.dart b/lib/core/widgets/dashboard/widgets/measurements.dart
index 75eabbcb6..74feb4037 100644
--- a/lib/core/widgets/dashboard/widgets/measurements.dart
+++ b/lib/core/widgets/dashboard/widgets/measurements.dart
@@ -26,7 +26,7 @@ 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_categories_screen.dart';
 import 'package:wger/features/measurements/widgets/categories_card.dart';
-import 'package:wger/features/measurements/widgets/forms.dart';
+import 'package:wger/features/measurements/widgets/forms/category.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 
 class DashboardMeasurementWidget extends ConsumerStatefulWidget {
@@ -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..0f7c4fa9d 100644
--- a/lib/core/widgets/dashboard/widgets/weight.dart
+++ b/lib/core/widgets/dashboard/widgets/weight.dart
@@ -19,21 +19,24 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:wger/core/form_screen.dart';
+import 'package:logging/logging.dart';
+import 'package:wger/core/formatting/formatting.dart';
 import 'package:wger/core/widgets/dashboard/widgets/nothing_found.dart';
 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/widgets/charts.dart';
+import 'package:wger/features/measurements/charts/range.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/categories_card.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 {
+  static final _logger = Logger('DashboardWeightWidget');
+
   const DashboardWeightWidget();
 
   Widget _shell(BuildContext context, Widget body) {
@@ -57,115 +60,89 @@ class DashboardWeightWidget extends ConsumerWidget {
     );
   }
 
+  /// The error state of one of the providers the card resolves, logged the way
+  /// `AsyncValueWidget` logs the cards that only resolve a single one.
+  Widget _errorShell(BuildContext context, AsyncValue<Object?> value) {
+    _logger.warning('Async error in DashboardWeightWidget', value.error, value.stackTrace);
+
+    return _shell(context, StreamErrorIndicator(value.error!, stacktrace: value.stackTrace));
+  }
+
   @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) {
-      return _shell(
-        context,
-        StreamErrorIndicator(entriesAsync.error!, stacktrace: entriesAsync.stackTrace),
-      );
+    if (categoryAsync.hasError) {
+      return _errorShell(context, categoryAsync);
     }
     if (profileAsync.hasError) {
-      return _shell(
-        context,
-        StreamErrorIndicator(profileAsync.error!, stacktrace: profileAsync.stackTrace),
-      );
+      return _errorShell(context, profileAsync);
     }
     final profile = profileAsync.value;
     if (profile == null) {
       // The profile stream can legitimately emit null right after login,
       // before the local `user_profile` PowerSync bucket has finished its
-      // first sync (see WeightOverview / NutritionalPlansList, which treat
-      // this the same way). Keep showing the spinner instead of a
-      // permanent-looking error; the widget rebuilds once the row lands.
+      // first sync (see NutritionalPlansList, which treats this the same
+      // way). Keep showing the spinner instead of a permanent-looking error;
+      // the widget rebuilds once the row lands.
       return _shell(context, const BoxedProgressIndicator());
     }
-
-    return _shell(context, _buildContent(context, entriesAsync.value!, profile));
-  }
-
-  Widget _buildContent(
-    BuildContext context,
-    List<WeightEntry> entriesList,
-    UserProfile profile,
-  ) {
-    if (entriesList.isEmpty) {
-      return NothingFound(
-        AppLocalizations.of(context).noWeightEntries,
-        AppLocalizations.of(context).newEntry,
-        WeightForm(),
-      );
+    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());
     }
 
-    final (entriesAll, entries7dAvg) = sensibleRange(
-      entriesList.map((e) => MeasurementChartEntry(e.weight, e.date)).toList(),
+    // The same watch the card below runs (one underlying stream), resolved
+    // here as well so the empty state and errors render dashboard-style
+    final pointsAsync = chartPointsFor(
+      ref,
+      category,
+      ChartRange.all,
+      targetUnit: weightDisplayUnit(profile.isMetric),
     );
-
-    return Column(
-      children: [
-        SizedBox(
-          height: 200,
-          child: MeasurementChartWidgetFl(
-            entriesAll,
-            weightUnit(profile.isMetric, context),
-            avgs: entries7dAvg,
-          ),
-        ),
-        if (entries7dAvg.isNotEmpty)
-          MeasurementOverallChangeWidget(
-            entries7dAvg.first,
-            entries7dAvg.last,
-            weightUnit(profile.isMetric, context),
-          ),
-        LayoutBuilder(
-          builder: (context, constraints) {
-            return SingleChildScrollView(
-              scrollDirection: Axis.horizontal,
-              child: ConstrainedBox(
-                constraints: BoxConstraints(minWidth: constraints.maxWidth),
-                child: Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: [
-                    TextButton(
-                      child: Text(
-                        AppLocalizations.of(context).goToDetailPage,
-                        overflow: TextOverflow.ellipsis,
-                      ),
-                      onPressed: () {
-                        Navigator.of(context).pushNamed(WeightScreen.routeName);
-                      },
-                    ),
-                    IconButton(
-                      icon: const Icon(Icons.add),
-                      onPressed: () {
-                        Navigator.pushNamed(
-                          context,
-                          FormScreen.routeName,
-                          arguments: FormScreenArguments(
-                            AppLocalizations.of(context).newEntry,
-                            WeightForm(),
-                          ),
-                        );
-                      },
-                    ),
-                  ],
-                ),
-              ),
-            );
-          },
+    if (pointsAsync.hasError) {
+      return _errorShell(context, pointsAsync);
+    }
+    final points = pointsAsync.value;
+    if (points == null) {
+      return _shell(context, const BoxedProgressIndicator());
+    }
+    if (points.isEmpty) {
+      return _shell(
+        context,
+        NothingFound(
+          AppLocalizations.of(context).noWeightEntries,
+          AppLocalizations.of(context).newEntry,
+          WeightForm(category),
         ),
-      ],
+      );
+    }
+
+    // The card the body tab shows, over the full history; the shell above
+    // already titles the widget
+    return _shell(
+      context,
+      CategoriesCard(
+        category,
+        elevation: 0,
+        range: ChartRange.all,
+        title: '',
+        displayUnit: weightDisplayUnit(profile.isMetric),
+        displayUnitLabel: weightUnit(profile.isMetric, context),
+        newEntryForm: WeightForm(category),
+        onShowDetails: () => Navigator.pushNamed(context, WeightScreen.routeName),
+      ),
     );
   }
 }
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/core/widgets/legend.dart b/lib/core/widgets/legend.dart
new file mode 100644
index 000000000..f1a2f1a2c
--- /dev/null
+++ b/lib/core/widgets/legend.dart
@@ -0,0 +1,59 @@
+/*
+ * 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';
+
+/// A legend entry: a colour swatch with its label.
+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/database/converters/date_only_text_converter.dart b/lib/database/converters/date_only_text_converter.dart
index 7507c216b..7735d8652 100644
--- a/lib/database/converters/date_only_text_converter.dart
+++ b/lib/database/converters/date_only_text_converter.dart
@@ -42,3 +42,18 @@ class DateOnlyTextConverter extends TypeConverter<DateTime, String> {
       '${value.month.toString().padLeft(2, '0')}-'
       '${value.day.toString().padLeft(2, '0')}';
 }
+
+/// Stores a moment as UTC ISO8601, the same wire format the server speaks.
+///
+/// Keeping every row in UTC with an identical layout means a plain string
+/// comparison on the column is also a comparison in time, which the session
+/// lookup in the log repository relies on.
+class DateTimeTextConverter extends TypeConverter<DateTime, String> {
+  const DateTimeTextConverter();
+
+  @override
+  DateTime fromSql(String fromDb) => DateTime.parse(fromDb).toLocal();
+
+  @override
+  String toSql(DateTime value) => value.toUtc().toIso8601String();
+}
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..2a08ffd6b 100644
--- a/lib/database/powersync/database.g.dart
+++ b/lib/database/powersync/database.g.dart
@@ -418,8 +418,28 @@ class $UserProfileTableTable extends UserProfileTable
     type: DriftSqlType.string,
     requiredDuringInsert: true,
   );
+  static const VerificationMeta _heightMeta = const VerificationMeta('height');
+  @override
+  late final GeneratedColumn<int> height = GeneratedColumn<int>(
+    'height',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+  );
+  static const VerificationMeta _timeZoneMeta = const VerificationMeta(
+    'timeZone',
+  );
+  @override
+  late final GeneratedColumn<String> timeZone = GeneratedColumn<String>(
+    'time_zone',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+  );
   @override
-  List<GeneratedColumn> get $columns => [id, weightUnitStr];
+  List<GeneratedColumn> get $columns => [id, weightUnitStr, height, timeZone];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
@@ -448,6 +468,18 @@ class $UserProfileTableTable extends UserProfileTable
     } else if (isInserting) {
       context.missing(_weightUnitStrMeta);
     }
+    if (data.containsKey('height')) {
+      context.handle(
+        _heightMeta,
+        height.isAcceptableOrUnknown(data['height']!, _heightMeta),
+      );
+    }
+    if (data.containsKey('time_zone')) {
+      context.handle(
+        _timeZoneMeta,
+        timeZone.isAcceptableOrUnknown(data['time_zone']!, _timeZoneMeta),
+      );
+    }
     return context;
   }
 
@@ -465,6 +497,14 @@ class $UserProfileTableTable extends UserProfileTable
         DriftSqlType.string,
         data['${effectivePrefix}weight_unit'],
       )!,
+      height: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}height'],
+      ),
+      timeZone: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}time_zone'],
+      ),
     );
   }
 
@@ -477,26 +517,36 @@ class $UserProfileTableTable extends UserProfileTable
 class UserProfileTableCompanion extends UpdateCompanion<UserProfile> {
   final Value<int> id;
   final Value<String> weightUnitStr;
+  final Value<int?> height;
+  final Value<String?> timeZone;
   final Value<int> rowid;
   const UserProfileTableCompanion({
     this.id = const Value.absent(),
     this.weightUnitStr = const Value.absent(),
+    this.height = const Value.absent(),
+    this.timeZone = const Value.absent(),
     this.rowid = const Value.absent(),
   });
   UserProfileTableCompanion.insert({
     required int id,
     required String weightUnitStr,
+    this.height = const Value.absent(),
+    this.timeZone = const Value.absent(),
     this.rowid = const Value.absent(),
   }) : id = Value(id),
        weightUnitStr = Value(weightUnitStr);
   static Insertable<UserProfile> custom({
     Expression<int>? id,
     Expression<String>? weightUnitStr,
+    Expression<int>? height,
+    Expression<String>? timeZone,
     Expression<int>? rowid,
   }) {
     return RawValuesInsertable({
       if (id != null) 'id': id,
       if (weightUnitStr != null) 'weight_unit': weightUnitStr,
+      if (height != null) 'height': height,
+      if (timeZone != null) 'time_zone': timeZone,
       if (rowid != null) 'rowid': rowid,
     });
   }
@@ -504,11 +554,15 @@ class UserProfileTableCompanion extends UpdateCompanion<UserProfile> {
   UserProfileTableCompanion copyWith({
     Value<int>? id,
     Value<String>? weightUnitStr,
+    Value<int?>? height,
+    Value<String?>? timeZone,
     Value<int>? rowid,
   }) {
     return UserProfileTableCompanion(
       id: id ?? this.id,
       weightUnitStr: weightUnitStr ?? this.weightUnitStr,
+      height: height ?? this.height,
+      timeZone: timeZone ?? this.timeZone,
       rowid: rowid ?? this.rowid,
     );
   }
@@ -522,6 +576,12 @@ class UserProfileTableCompanion extends UpdateCompanion<UserProfile> {
     if (weightUnitStr.present) {
       map['weight_unit'] = Variable<String>(weightUnitStr.value);
     }
+    if (height.present) {
+      map['height'] = Variable<int>(height.value);
+    }
+    if (timeZone.present) {
+      map['time_zone'] = Variable<String>(timeZone.value);
+    }
     if (rowid.present) {
       map['rowid'] = Variable<int>(rowid.value);
     }
@@ -533,6 +593,8 @@ class UserProfileTableCompanion extends UpdateCompanion<UserProfile> {
     return (StringBuffer('UserProfileTableCompanion(')
           ..write('id: $id, ')
           ..write('weightUnitStr: $weightUnitStr, ')
+          ..write('height: $height, ')
+          ..write('timeZone: $timeZone, ')
           ..write('rowid: $rowid')
           ..write(')'))
         .toString();
@@ -4674,12 +4736,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,33 +4752,141 @@ 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,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  @override
+  late final GeneratedColumnWithTypeConverter<MetricType?, String> metricType =
+      GeneratedColumn<String>(
+        'metric_type',
+        aliasedName,
+        true,
+        type: DriftSqlType.string,
+        requiredDuringInsert: false,
+      ).withConverter<MetricType?>(
+        $MeasurementCategoryTableTable.$convertermetricTypen,
+      );
+  @override
+  late final GeneratedColumnWithTypeConverter<ChartType, String> chartType =
+      GeneratedColumn<String>(
+        'chart_type',
+        aliasedName,
+        true,
+        type: DriftSqlType.string,
+        requiredDuringInsert: false,
+      ).withConverter<ChartType>(
+        $MeasurementCategoryTableTable.$converterchartType,
+      );
+  @override
+  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> parentId = GeneratedColumn<String>(
+    'parent_id',
     aliasedName,
     true,
-    type: DriftSqlType.dateTime,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'REFERENCES measurements_category (id)',
+    ),
+  );
+  static const VerificationMeta _orderMeta = const VerificationMeta('order');
+  @override
+  late final GeneratedColumn<int> order = GeneratedColumn<int>(
+    'order',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    defaultValue: const Constant(0),
+  );
+  static const VerificationMeta _isOfficialMeta = const VerificationMeta(
+    'isOfficial',
+  );
+  @override
+  late final GeneratedColumn<bool> isOfficial = GeneratedColumn<bool>(
+    'is_official',
+    aliasedName,
+    true,
+    type: DriftSqlType.bool,
+    requiredDuringInsert: false,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'CHECK ("is_official" IN (0, 1))',
+    ),
+    defaultValue: const Constant(false),
+  );
+  static const VerificationMeta _dynamicTypeMeta = const VerificationMeta(
+    'dynamicType',
+  );
+  @override
+  late final GeneratedColumn<String> dynamicType = GeneratedColumn<String>(
+    'dynamic_type',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
     requiredDuringInsert: false,
-  ).withConverter<DateTime?>($WeightEntryTableTable.$converterdaten);
+    defaultValue: const Constant('NONE'),
+  );
+  @override
+  late final GeneratedColumnWithTypeConverter<Map<String, dynamic>?, String> dynamicParams =
+      GeneratedColumn<String>(
+        'dynamic_params',
+        aliasedName,
+        true,
+        type: DriftSqlType.string,
+        requiredDuringInsert: false,
+      ).withConverter<Map<String, dynamic>?>(
+        $MeasurementCategoryTableTable.$converterdynamicParamsn,
+      );
   @override
-  List<GeneratedColumn> get $columns => [id, weight, date];
+  List<GeneratedColumn> get $columns => [
+    id,
+    name,
+    unit,
+    metricType,
+    chartType,
+    chartConfig,
+    parentId,
+    order,
+    isOfficial,
+    dynamicType,
+    dynamicParams,
+  ];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
   String get actualTableName => $name;
-  static const String $name = 'weight_weightentry';
+  static const String $name = 'measurements_category';
   @override
   VerificationContext validateIntegrity(
-    Insertable<WeightEntry> instance, {
+    Insertable<MeasurementCategory> instance, {
     bool isInserting = false,
   }) {
     final context = VerificationContext();
@@ -4724,13 +4894,48 @@ class $WeightEntryTableTable extends WeightEntryTable
     if (data.containsKey('id')) {
       context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta));
     }
-    if (data.containsKey('weight')) {
+    if (data.containsKey('name')) {
       context.handle(
-        _weightMeta,
-        weight.isAcceptableOrUnknown(data['weight']!, _weightMeta),
+        _nameMeta,
+        name.isAcceptableOrUnknown(data['name']!, _nameMeta),
+      );
+    } else if (isInserting) {
+      context.missing(_nameMeta);
+    }
+    if (data.containsKey('unit')) {
+      context.handle(
+        _unitMeta,
+        unit.isAcceptableOrUnknown(data['unit']!, _unitMeta),
       );
     } else if (isInserting) {
-      context.missing(_weightMeta);
+      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),
+      );
+    }
+    if (data.containsKey('dynamic_type')) {
+      context.handle(
+        _dynamicTypeMeta,
+        dynamicType.isAcceptableOrUnknown(
+          data['dynamic_type']!,
+          _dynamicTypeMeta,
+        ),
+      );
     }
     return context;
   }
@@ -4738,78 +4943,186 @@ class $WeightEntryTableTable extends WeightEntryTable
   @override
   Set<GeneratedColumn> get $primaryKey => const {};
   @override
-  WeightEntry map(Map<String, dynamic> data, {String? tablePrefix}) {
+  MeasurementCategory map(Map<String, dynamic> data, {String? tablePrefix}) {
     final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
-    return WeightEntry(
+    return MeasurementCategory.fromDb(
       id: attachedDatabase.typeMapping.read(
         DriftSqlType.string,
         data['${effectivePrefix}id'],
       )!,
-      weight: attachedDatabase.typeMapping.read(
-        DriftSqlType.double,
-        data['${effectivePrefix}weight'],
+      name: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}name'],
+      )!,
+      unit: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}unit'],
       )!,
-      date: $WeightEntryTableTable.$converterdaten.fromSql(
+      chartType: $MeasurementCategoryTableTable.$converterchartType.fromSql(
         attachedDatabase.typeMapping.read(
-          DriftSqlType.dateTime,
-          data['${effectivePrefix}date'],
+          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'],
+      ),
+      dynamicType: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}dynamic_type'],
+      ),
+      dynamicParams: $MeasurementCategoryTableTable.$converterdynamicParamsn.fromSql(
+        attachedDatabase.typeMapping.read(
+          DriftSqlType.string,
+          data['${effectivePrefix}dynamic_params'],
         ),
       ),
     );
   }
 
   @override
-  $WeightEntryTableTable createAlias(String alias) {
-    return $WeightEntryTableTable(attachedDatabase, alias);
+  $MeasurementCategoryTableTable createAlias(String alias) {
+    return $MeasurementCategoryTableTable(attachedDatabase, alias);
   }
 
-  static TypeConverter<DateTime, DateTime> $converterdate = const UtcDateTimeConverter();
-  static TypeConverter<DateTime?, DateTime?> $converterdaten = NullAwareTypeConverter.wrap(
-    $converterdate,
-  );
+  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);
+  static TypeConverter<Map<String, dynamic>, String> $converterdynamicParams =
+      const JsonMapConverter();
+  static TypeConverter<Map<String, dynamic>?, String?> $converterdynamicParamsn =
+      NullAwareTypeConverter.wrap(
+        $converterdynamicParams,
+      );
 }
 
-class WeightEntryTableCompanion extends UpdateCompanion<WeightEntry> {
+class MeasurementCategoryTableCompanion extends UpdateCompanion<MeasurementCategory> {
   final Value<String> id;
-  final Value<double> weight;
-  final Value<DateTime?> date;
+  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<String?> dynamicType;
+  final Value<Map<String, dynamic>?> dynamicParams;
   final Value<int> rowid;
-  const WeightEntryTableCompanion({
+  const MeasurementCategoryTableCompanion({
     this.id = const Value.absent(),
-    this.weight = const Value.absent(),
-    this.date = 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.dynamicType = const Value.absent(),
+    this.dynamicParams = const Value.absent(),
     this.rowid = const Value.absent(),
   });
-  WeightEntryTableCompanion.insert({
+  MeasurementCategoryTableCompanion.insert({
     this.id = const Value.absent(),
-    required double weight,
-    this.date = 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.dynamicType = const Value.absent(),
+    this.dynamicParams = const Value.absent(),
     this.rowid = const Value.absent(),
-  }) : weight = Value(weight);
-  static Insertable<WeightEntry> custom({
+  }) : name = Value(name),
+       unit = Value(unit);
+  static Insertable<MeasurementCategory> custom({
     Expression<String>? id,
-    Expression<double>? weight,
-    Expression<DateTime>? date,
+    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<String>? dynamicType,
+    Expression<String>? dynamicParams,
     Expression<int>? rowid,
   }) {
     return RawValuesInsertable({
       if (id != null) 'id': id,
-      if (weight != null) 'weight': weight,
-      if (date != null) 'date': date,
+      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 (dynamicType != null) 'dynamic_type': dynamicType,
+      if (dynamicParams != null) 'dynamic_params': dynamicParams,
       if (rowid != null) 'rowid': rowid,
     });
   }
 
-  WeightEntryTableCompanion copyWith({
+  MeasurementCategoryTableCompanion copyWith({
     Value<String>? id,
-    Value<double>? weight,
-    Value<DateTime?>? date,
+    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<String?>? dynamicType,
+    Value<Map<String, dynamic>?>? dynamicParams,
     Value<int>? rowid,
   }) {
-    return WeightEntryTableCompanion(
+    return MeasurementCategoryTableCompanion(
       id: id ?? this.id,
-      weight: weight ?? this.weight,
-      date: date ?? this.date,
+      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,
+      dynamicType: dynamicType ?? this.dynamicType,
+      dynamicParams: dynamicParams ?? this.dynamicParams,
       rowid: rowid ?? this.rowid,
     );
   }
@@ -4820,186 +5133,51 @@ class WeightEntryTableCompanion extends UpdateCompanion<WeightEntry> {
     if (id.present) {
       map['id'] = Variable<String>(id.value);
     }
-    if (weight.present) {
-      map['weight'] = Variable<double>(weight.value);
+    if (name.present) {
+      map['name'] = Variable<String>(name.value);
     }
-    if (date.present) {
-      map['date'] = Variable<DateTime>(
-        $WeightEntryTableTable.$converterdaten.toSql(date.value),
+    if (unit.present) {
+      map['unit'] = Variable<String>(unit.value);
+    }
+    if (metricType.present) {
+      map['metric_type'] = Variable<String>(
+        $MeasurementCategoryTableTable.$convertermetricTypen.toSql(
+          metricType.value,
+        ),
       );
     }
-    if (rowid.present) {
-      map['rowid'] = Variable<int>(rowid.value);
+    if (chartType.present) {
+      map['chart_type'] = Variable<String>(
+        $MeasurementCategoryTableTable.$converterchartType.toSql(
+          chartType.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> {
-  @override
-  final GeneratedDatabase attachedDatabase;
-  final String? _alias;
-  $MeasurementCategoryTableTable(this.attachedDatabase, [this._alias]);
-  static const VerificationMeta _idMeta = const VerificationMeta('id');
-  @override
-  late final GeneratedColumn<String> id = GeneratedColumn<String>(
-    'id',
-    aliasedName,
-    false,
-    type: DriftSqlType.string,
-    requiredDuringInsert: false,
-    clientDefault: () => ps.uuid.v7(),
-  );
-  static const VerificationMeta _nameMeta = const VerificationMeta('name');
-  @override
-  late final GeneratedColumn<String> name = GeneratedColumn<String>(
-    'name',
-    aliasedName,
-    false,
-    type: DriftSqlType.string,
-    requiredDuringInsert: true,
-  );
-  static const VerificationMeta _unitMeta = const VerificationMeta('unit');
-  @override
-  late final GeneratedColumn<String> unit = GeneratedColumn<String>(
-    'unit',
-    aliasedName,
-    false,
-    type: DriftSqlType.string,
-    requiredDuringInsert: true,
-  );
-  @override
-  List<GeneratedColumn> get $columns => [id, name, unit];
-  @override
-  String get aliasedName => _alias ?? actualTableName;
-  @override
-  String get actualTableName => $name;
-  static const String $name = 'measurements_category';
-  @override
-  VerificationContext validateIntegrity(
-    Insertable<MeasurementCategory> 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('name')) {
-      context.handle(
-        _nameMeta,
-        name.isAcceptableOrUnknown(data['name']!, _nameMeta),
+    if (chartConfig.present) {
+      map['chart_config'] = Variable<String>(
+        $MeasurementCategoryTableTable.$converterchartConfign.toSql(
+          chartConfig.value,
+        ),
       );
-    } else if (isInserting) {
-      context.missing(_nameMeta);
     }
-    if (data.containsKey('unit')) {
-      context.handle(
-        _unitMeta,
-        unit.isAcceptableOrUnknown(data['unit']!, _unitMeta),
-      );
-    } else if (isInserting) {
-      context.missing(_unitMeta);
+    if (parentId.present) {
+      map['parent_id'] = Variable<String>(parentId.value);
     }
-    return context;
-  }
-
-  @override
-  Set<GeneratedColumn> get $primaryKey => const {};
-  @override
-  MeasurementCategory map(Map<String, dynamic> data, {String? tablePrefix}) {
-    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
-    return MeasurementCategory(
-      id: attachedDatabase.typeMapping.read(
-        DriftSqlType.string,
-        data['${effectivePrefix}id'],
-      )!,
-      name: attachedDatabase.typeMapping.read(
-        DriftSqlType.string,
-        data['${effectivePrefix}name'],
-      )!,
-      unit: attachedDatabase.typeMapping.read(
-        DriftSqlType.string,
-        data['${effectivePrefix}unit'],
-      )!,
-    );
-  }
-
-  @override
-  $MeasurementCategoryTableTable createAlias(String alias) {
-    return $MeasurementCategoryTableTable(attachedDatabase, alias);
-  }
-}
-
-class MeasurementCategoryTableCompanion extends UpdateCompanion<MeasurementCategory> {
-  final Value<String> id;
-  final Value<String> name;
-  final Value<String> unit;
-  final Value<int> rowid;
-  const MeasurementCategoryTableCompanion({
-    this.id = const Value.absent(),
-    this.name = const Value.absent(),
-    this.unit = const Value.absent(),
-    this.rowid = const Value.absent(),
-  });
-  MeasurementCategoryTableCompanion.insert({
-    this.id = const Value.absent(),
-    required String name,
-    required String unit,
-    this.rowid = const Value.absent(),
-  }) : name = Value(name),
-       unit = Value(unit);
-  static Insertable<MeasurementCategory> custom({
-    Expression<String>? id,
-    Expression<String>? name,
-    Expression<String>? unit,
-    Expression<int>? rowid,
-  }) {
-    return RawValuesInsertable({
-      if (id != null) 'id': id,
-      if (name != null) 'name': name,
-      if (unit != null) 'unit': unit,
-      if (rowid != null) 'rowid': rowid,
-    });
-  }
-
-  MeasurementCategoryTableCompanion copyWith({
-    Value<String>? id,
-    Value<String>? name,
-    Value<String>? unit,
-    Value<int>? rowid,
-  }) {
-    return MeasurementCategoryTableCompanion(
-      id: id ?? this.id,
-      name: name ?? this.name,
-      unit: unit ?? this.unit,
-      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 (order.present) {
+      map['order'] = Variable<int>(order.value);
     }
-    if (name.present) {
-      map['name'] = Variable<String>(name.value);
+    if (isOfficial.present) {
+      map['is_official'] = Variable<bool>(isOfficial.value);
     }
-    if (unit.present) {
-      map['unit'] = Variable<String>(unit.value);
+    if (dynamicType.present) {
+      map['dynamic_type'] = Variable<String>(dynamicType.value);
+    }
+    if (dynamicParams.present) {
+      map['dynamic_params'] = Variable<String>(
+        $MeasurementCategoryTableTable.$converterdynamicParamsn.toSql(
+          dynamicParams.value,
+        ),
+      );
     }
     if (rowid.present) {
       map['rowid'] = Variable<int>(rowid.value);
@@ -5013,6 +5191,14 @@ 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('dynamicType: $dynamicType, ')
+          ..write('dynamicParams: $dynamicParams, ')
           ..write('rowid: $rowid')
           ..write(')'))
         .toString();
@@ -5075,8 +5261,49 @@ class $MeasurementEntryTableTable extends MeasurementEntryTable
     type: DriftSqlType.string,
     requiredDuringInsert: true,
   );
+  static const VerificationMeta _sourceMeta = const VerificationMeta('source');
   @override
-  List<GeneratedColumn> get $columns => [id, categoryId, date, value, notes];
+  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
+  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 +5343,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 +5363,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 +5386,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 +5409,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 +5420,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 +5430,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 +5441,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 +5455,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 +5466,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 +5479,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 +5490,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 +5517,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 +5542,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();
@@ -6273,14 +6564,6 @@ class $WorkoutSessionTableTable extends WorkoutSessionTable
     type: DriftSqlType.int,
     requiredDuringInsert: false,
   );
-  @override
-  late final GeneratedColumnWithTypeConverter<DateTime, String> date = GeneratedColumn<String>(
-    'date',
-    aliasedName,
-    false,
-    type: DriftSqlType.string,
-    requiredDuringInsert: true,
-  ).withConverter<DateTime>($WorkoutSessionTableTable.$converterdate);
   static const VerificationMeta _notesMeta = const VerificationMeta('notes');
   @override
   late final GeneratedColumn<String> notes = GeneratedColumn<String>(
@@ -6302,6 +6585,36 @@ class $WorkoutSessionTableTable extends WorkoutSessionTable
         $WorkoutSessionTableTable.$converterimpression,
       );
   @override
+  late final GeneratedColumnWithTypeConverter<DateTime?, String> datetimeStart =
+      GeneratedColumn<String>(
+        'datetime_start',
+        aliasedName,
+        true,
+        type: DriftSqlType.string,
+        requiredDuringInsert: false,
+      ).withConverter<DateTime?>(
+        $WorkoutSessionTableTable.$converterdatetimeStartn,
+      );
+  @override
+  late final GeneratedColumnWithTypeConverter<DateTime?, String> datetimeEnd =
+      GeneratedColumn<String>(
+        'datetime_end',
+        aliasedName,
+        true,
+        type: DriftSqlType.string,
+        requiredDuringInsert: false,
+      ).withConverter<DateTime?>(
+        $WorkoutSessionTableTable.$converterdatetimeEndn,
+      );
+  @override
+  late final GeneratedColumnWithTypeConverter<DateTime?, String> date = GeneratedColumn<String>(
+    'date',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+  ).withConverter<DateTime?>($WorkoutSessionTableTable.$converterdaten);
+  @override
   late final GeneratedColumnWithTypeConverter<TimeOfDay?, String> timeStart =
       GeneratedColumn<String>(
         'time_start',
@@ -6325,9 +6638,11 @@ class $WorkoutSessionTableTable extends WorkoutSessionTable
     id,
     routineId,
     dayId,
-    date,
     notes,
     impression,
+    datetimeStart,
+    datetimeEnd,
+    date,
     timeStart,
     timeEnd,
   ];
@@ -6372,34 +6687,46 @@ class $WorkoutSessionTableTable extends WorkoutSessionTable
   @override
   WorkoutSession map(Map<String, dynamic> data, {String? tablePrefix}) {
     final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
-    return WorkoutSession(
+    return WorkoutSession.fromDb(
       id: attachedDatabase.typeMapping.read(
         DriftSqlType.string,
         data['${effectivePrefix}id'],
       )!,
+      routineId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}routine_id'],
+      ),
       dayId: attachedDatabase.typeMapping.read(
         DriftSqlType.int,
         data['${effectivePrefix}day_id'],
       ),
-      routineId: attachedDatabase.typeMapping.read(
-        DriftSqlType.int,
-        data['${effectivePrefix}routine_id'],
+      notes: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}notes'],
       ),
-      date: $WorkoutSessionTableTable.$converterdate.fromSql(
+      impression: $WorkoutSessionTableTable.$converterimpression.fromSql(
         attachedDatabase.typeMapping.read(
           DriftSqlType.string,
-          data['${effectivePrefix}date'],
+          data['${effectivePrefix}impression'],
         )!,
       ),
-      impression: $WorkoutSessionTableTable.$converterimpression.fromSql(
+      datetimeStart: $WorkoutSessionTableTable.$converterdatetimeStartn.fromSql(
         attachedDatabase.typeMapping.read(
           DriftSqlType.string,
-          data['${effectivePrefix}impression'],
-        )!,
+          data['${effectivePrefix}datetime_start'],
+        ),
       ),
-      notes: attachedDatabase.typeMapping.read(
-        DriftSqlType.string,
-        data['${effectivePrefix}notes'],
+      datetimeEnd: $WorkoutSessionTableTable.$converterdatetimeEndn.fromSql(
+        attachedDatabase.typeMapping.read(
+          DriftSqlType.string,
+          data['${effectivePrefix}datetime_end'],
+        ),
+      ),
+      date: $WorkoutSessionTableTable.$converterdaten.fromSql(
+        attachedDatabase.typeMapping.read(
+          DriftSqlType.string,
+          data['${effectivePrefix}date'],
+        ),
       ),
       timeStart: $WorkoutSessionTableTable.$convertertimeStartn.fromSql(
         attachedDatabase.typeMapping.read(
@@ -6421,9 +6748,20 @@ class $WorkoutSessionTableTable extends WorkoutSessionTable
     return $WorkoutSessionTableTable(attachedDatabase, alias);
   }
 
-  static TypeConverter<DateTime, String> $converterdate = const DateOnlyTextConverter();
   static TypeConverter<WorkoutImpression, String> $converterimpression =
       const WorkoutImpressionConverter();
+  static TypeConverter<DateTime, String> $converterdatetimeStart = const DateTimeTextConverter();
+  static TypeConverter<DateTime?, String?> $converterdatetimeStartn = NullAwareTypeConverter.wrap(
+    $converterdatetimeStart,
+  );
+  static TypeConverter<DateTime, String> $converterdatetimeEnd = const DateTimeTextConverter();
+  static TypeConverter<DateTime?, String?> $converterdatetimeEndn = NullAwareTypeConverter.wrap(
+    $converterdatetimeEnd,
+  );
+  static TypeConverter<DateTime, String> $converterdate = const DateOnlyTextConverter();
+  static TypeConverter<DateTime?, String?> $converterdaten = NullAwareTypeConverter.wrap(
+    $converterdate,
+  );
   static TypeConverter<TimeOfDay, String> $convertertimeStart = const TimeOfDayConverter();
   static TypeConverter<TimeOfDay?, String?> $convertertimeStartn = NullAwareTypeConverter.wrap(
     $convertertimeStart,
@@ -6438,9 +6776,11 @@ class WorkoutSessionTableCompanion extends UpdateCompanion<WorkoutSession> {
   final Value<String> id;
   final Value<int?> routineId;
   final Value<int?> dayId;
-  final Value<DateTime> date;
   final Value<String?> notes;
   final Value<WorkoutImpression> impression;
+  final Value<DateTime?> datetimeStart;
+  final Value<DateTime?> datetimeEnd;
+  final Value<DateTime?> date;
   final Value<TimeOfDay?> timeStart;
   final Value<TimeOfDay?> timeEnd;
   final Value<int> rowid;
@@ -6448,9 +6788,11 @@ class WorkoutSessionTableCompanion extends UpdateCompanion<WorkoutSession> {
     this.id = const Value.absent(),
     this.routineId = const Value.absent(),
     this.dayId = const Value.absent(),
-    this.date = const Value.absent(),
     this.notes = const Value.absent(),
     this.impression = const Value.absent(),
+    this.datetimeStart = const Value.absent(),
+    this.datetimeEnd = const Value.absent(),
+    this.date = const Value.absent(),
     this.timeStart = const Value.absent(),
     this.timeEnd = const Value.absent(),
     this.rowid = const Value.absent(),
@@ -6459,21 +6801,24 @@ class WorkoutSessionTableCompanion extends UpdateCompanion<WorkoutSession> {
     this.id = const Value.absent(),
     this.routineId = const Value.absent(),
     this.dayId = const Value.absent(),
-    required DateTime date,
     this.notes = const Value.absent(),
     required WorkoutImpression impression,
+    this.datetimeStart = const Value.absent(),
+    this.datetimeEnd = const Value.absent(),
+    this.date = const Value.absent(),
     this.timeStart = const Value.absent(),
     this.timeEnd = const Value.absent(),
     this.rowid = const Value.absent(),
-  }) : date = Value(date),
-       impression = Value(impression);
+  }) : impression = Value(impression);
   static Insertable<WorkoutSession> custom({
     Expression<String>? id,
     Expression<int>? routineId,
     Expression<int>? dayId,
-    Expression<String>? date,
     Expression<String>? notes,
     Expression<String>? impression,
+    Expression<String>? datetimeStart,
+    Expression<String>? datetimeEnd,
+    Expression<String>? date,
     Expression<String>? timeStart,
     Expression<String>? timeEnd,
     Expression<int>? rowid,
@@ -6482,9 +6827,11 @@ class WorkoutSessionTableCompanion extends UpdateCompanion<WorkoutSession> {
       if (id != null) 'id': id,
       if (routineId != null) 'routine_id': routineId,
       if (dayId != null) 'day_id': dayId,
-      if (date != null) 'date': date,
       if (notes != null) 'notes': notes,
       if (impression != null) 'impression': impression,
+      if (datetimeStart != null) 'datetime_start': datetimeStart,
+      if (datetimeEnd != null) 'datetime_end': datetimeEnd,
+      if (date != null) 'date': date,
       if (timeStart != null) 'time_start': timeStart,
       if (timeEnd != null) 'time_end': timeEnd,
       if (rowid != null) 'rowid': rowid,
@@ -6495,9 +6842,11 @@ class WorkoutSessionTableCompanion extends UpdateCompanion<WorkoutSession> {
     Value<String>? id,
     Value<int?>? routineId,
     Value<int?>? dayId,
-    Value<DateTime>? date,
     Value<String?>? notes,
     Value<WorkoutImpression>? impression,
+    Value<DateTime?>? datetimeStart,
+    Value<DateTime?>? datetimeEnd,
+    Value<DateTime?>? date,
     Value<TimeOfDay?>? timeStart,
     Value<TimeOfDay?>? timeEnd,
     Value<int>? rowid,
@@ -6506,9 +6855,11 @@ class WorkoutSessionTableCompanion extends UpdateCompanion<WorkoutSession> {
       id: id ?? this.id,
       routineId: routineId ?? this.routineId,
       dayId: dayId ?? this.dayId,
-      date: date ?? this.date,
       notes: notes ?? this.notes,
       impression: impression ?? this.impression,
+      datetimeStart: datetimeStart ?? this.datetimeStart,
+      datetimeEnd: datetimeEnd ?? this.datetimeEnd,
+      date: date ?? this.date,
       timeStart: timeStart ?? this.timeStart,
       timeEnd: timeEnd ?? this.timeEnd,
       rowid: rowid ?? this.rowid,
@@ -6527,11 +6878,6 @@ class WorkoutSessionTableCompanion extends UpdateCompanion<WorkoutSession> {
     if (dayId.present) {
       map['day_id'] = Variable<int>(dayId.value);
     }
-    if (date.present) {
-      map['date'] = Variable<String>(
-        $WorkoutSessionTableTable.$converterdate.toSql(date.value),
-      );
-    }
     if (notes.present) {
       map['notes'] = Variable<String>(notes.value);
     }
@@ -6540,6 +6886,25 @@ class WorkoutSessionTableCompanion extends UpdateCompanion<WorkoutSession> {
         $WorkoutSessionTableTable.$converterimpression.toSql(impression.value),
       );
     }
+    if (datetimeStart.present) {
+      map['datetime_start'] = Variable<String>(
+        $WorkoutSessionTableTable.$converterdatetimeStartn.toSql(
+          datetimeStart.value,
+        ),
+      );
+    }
+    if (datetimeEnd.present) {
+      map['datetime_end'] = Variable<String>(
+        $WorkoutSessionTableTable.$converterdatetimeEndn.toSql(
+          datetimeEnd.value,
+        ),
+      );
+    }
+    if (date.present) {
+      map['date'] = Variable<String>(
+        $WorkoutSessionTableTable.$converterdaten.toSql(date.value),
+      );
+    }
     if (timeStart.present) {
       map['time_start'] = Variable<String>(
         $WorkoutSessionTableTable.$convertertimeStartn.toSql(timeStart.value),
@@ -6562,9 +6927,11 @@ class WorkoutSessionTableCompanion extends UpdateCompanion<WorkoutSession> {
           ..write('id: $id, ')
           ..write('routineId: $routineId, ')
           ..write('dayId: $dayId, ')
-          ..write('date: $date, ')
           ..write('notes: $notes, ')
           ..write('impression: $impression, ')
+          ..write('datetimeStart: $datetimeStart, ')
+          ..write('datetimeEnd: $datetimeEnd, ')
+          ..write('date: $date, ')
           ..write('timeStart: $timeStart, ')
           ..write('timeEnd: $timeEnd, ')
           ..write('rowid: $rowid')
@@ -10154,9 +10521,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 +10565,6 @@ abstract class _$DriftPowersyncDatabase extends GeneratedDatabase {
     exerciseEquipmentM2N,
     exerciseImageTable,
     exerciseVideoTable,
-    weightEntryTable,
     measurementCategoryTable,
     measurementEntryTable,
     routineTable,
@@ -10673,12 +11036,16 @@ typedef $$UserProfileTableTableCreateCompanionBuilder =
     UserProfileTableCompanion Function({
       required int id,
       required String weightUnitStr,
+      Value<int?> height,
+      Value<String?> timeZone,
       Value<int> rowid,
     });
 typedef $$UserProfileTableTableUpdateCompanionBuilder =
     UserProfileTableCompanion Function({
       Value<int> id,
       Value<String> weightUnitStr,
+      Value<int?> height,
+      Value<String?> timeZone,
       Value<int> rowid,
     });
 
@@ -10700,6 +11067,16 @@ class $$UserProfileTableTableFilterComposer
     column: $table.weightUnitStr,
     builder: (column) => ColumnFilters(column),
   );
+
+  ColumnFilters<int> get height => $composableBuilder(
+    column: $table.height,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<String> get timeZone => $composableBuilder(
+    column: $table.timeZone,
+    builder: (column) => ColumnFilters(column),
+  );
 }
 
 class $$UserProfileTableTableOrderingComposer
@@ -10720,6 +11097,16 @@ class $$UserProfileTableTableOrderingComposer
     column: $table.weightUnitStr,
     builder: (column) => ColumnOrderings(column),
   );
+
+  ColumnOrderings<int> get height => $composableBuilder(
+    column: $table.height,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<String> get timeZone => $composableBuilder(
+    column: $table.timeZone,
+    builder: (column) => ColumnOrderings(column),
+  );
 }
 
 class $$UserProfileTableTableAnnotationComposer
@@ -10737,6 +11124,12 @@ class $$UserProfileTableTableAnnotationComposer
     column: $table.weightUnitStr,
     builder: (column) => column,
   );
+
+  GeneratedColumn<int> get height =>
+      $composableBuilder(column: $table.height, builder: (column) => column);
+
+  GeneratedColumn<String> get timeZone =>
+      $composableBuilder(column: $table.timeZone, builder: (column) => column);
 }
 
 class $$UserProfileTableTableTableManager
@@ -10774,20 +11167,28 @@ class $$UserProfileTableTableTableManager
               ({
                 Value<int> id = const Value.absent(),
                 Value<String> weightUnitStr = const Value.absent(),
+                Value<int?> height = const Value.absent(),
+                Value<String?> timeZone = const Value.absent(),
                 Value<int> rowid = const Value.absent(),
               }) => UserProfileTableCompanion(
                 id: id,
                 weightUnitStr: weightUnitStr,
+                height: height,
+                timeZone: timeZone,
                 rowid: rowid,
               ),
           createCompanionCallback:
               ({
                 required int id,
                 required String weightUnitStr,
+                Value<int?> height = const Value.absent(),
+                Value<String?> timeZone = const Value.absent(),
                 Value<int> rowid = const Value.absent(),
               }) => UserProfileTableCompanion.insert(
                 id: id,
                 weightUnitStr: weightUnitStr,
+                height: height,
+                timeZone: timeZone,
                 rowid: rowid,
               ),
           withReferenceMapper: (p0) =>
@@ -16192,179 +16593,24 @@ typedef $$ExerciseVideoTableTableProcessedTableManager =
       $$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,
-                rowid: rowid,
-              ),
-          withReferenceMapper: (p0) =>
-              p0.map((e) => (e.readTable(table), BaseReferences(db, table, e))).toList(),
-          prefetchHooksCallback: null,
-        ),
-      );
-}
-
-typedef $$WeightEntryTableTableProcessedTableManager =
-    ProcessedTableManager<
-      _$DriftPowersyncDatabase,
-      $WeightEntryTableTable,
-      WeightEntry,
-      $$WeightEntryTableTableFilterComposer,
-      $$WeightEntryTableTableOrderingComposer,
-      $$WeightEntryTableTableAnnotationComposer,
-      $$WeightEntryTableTableCreateCompanionBuilder,
-      $$WeightEntryTableTableUpdateCompanionBuilder,
-      (
-        WeightEntry,
-        BaseReferences<_$DriftPowersyncDatabase, $WeightEntryTableTable, WeightEntry>,
-      ),
-      WeightEntry,
-      PrefetchHooks Function()
+      $$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<String?> dynamicType,
+      Value<Map<String, dynamic>?> dynamicParams,
       Value<int> rowid,
     });
 typedef $$MeasurementCategoryTableTableUpdateCompanionBuilder =
@@ -16372,6 +16618,14 @@ 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<String?> dynamicType,
+      Value<Map<String, dynamic>?> dynamicParams,
       Value<int> rowid,
     });
 
@@ -16388,6 +16642,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 +16707,66 @@ 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),
+  );
+
+  ColumnFilters<String> get dynamicType => $composableBuilder(
+    column: $table.dynamicType,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnWithTypeConverterFilters<Map<String, dynamic>?, Map<String, dynamic>, String>
+  get dynamicParams => $composableBuilder(
+    column: $table.dynamicParams,
+    builder: (column) => ColumnWithTypeConverterFilters(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 +16815,63 @@ 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),
+  );
+
+  ColumnOrderings<String> get dynamicType => $composableBuilder(
+    column: $table.dynamicType,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<String> get dynamicParams => $composableBuilder(
+    column: $table.dynamicParams,
+    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 +16892,61 @@ 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,
+  );
+
+  GeneratedColumn<String> get dynamicType => $composableBuilder(
+    column: $table.dynamicType,
+    builder: (column) => column,
+  );
+
+  GeneratedColumnWithTypeConverter<Map<String, dynamic>?, String> get dynamicParams =>
+      $composableBuilder(
+        column: $table.dynamicParams,
+        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 +16985,10 @@ class $$MeasurementCategoryTableTableTableManager
           $$MeasurementCategoryTableTableUpdateCompanionBuilder,
           (MeasurementCategory, $$MeasurementCategoryTableTableReferences),
           MeasurementCategory,
-          PrefetchHooks Function({bool measurementEntryTableRefs})
+          PrefetchHooks Function({
+            bool parentId,
+            bool measurementEntryTableRefs,
+          })
         > {
   $$MeasurementCategoryTableTableTableManager(
     _$DriftPowersyncDatabase db,
@@ -16565,11 +17014,27 @@ 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<String?> dynamicType = const Value.absent(),
+                Value<Map<String, dynamic>?> dynamicParams = 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,
+                dynamicType: dynamicType,
+                dynamicParams: dynamicParams,
                 rowid: rowid,
               ),
           createCompanionCallback:
@@ -16577,11 +17042,27 @@ 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<String?> dynamicType = const Value.absent(),
+                Value<Map<String, dynamic>?> dynamicParams = 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,
+                dynamicType: dynamicType,
+                dynamicParams: dynamicParams,
                 rowid: rowid,
               ),
           withReferenceMapper: (p0) => p0
@@ -16592,13 +17073,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 +17128,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 +17153,7 @@ typedef $$MeasurementCategoryTableTableProcessedTableManager =
       $$MeasurementCategoryTableTableUpdateCompanionBuilder,
       (MeasurementCategory, $$MeasurementCategoryTableTableReferences),
       MeasurementCategory,
-      PrefetchHooks Function({bool measurementEntryTableRefs})
+      PrefetchHooks Function({bool parentId, bool measurementEntryTableRefs})
     >;
 typedef $$MeasurementEntryTableTableCreateCompanionBuilder =
     MeasurementEntryTableCompanion Function({
@@ -16648,6 +17162,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 +17174,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 +17239,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 +17307,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 +17366,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 +17441,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 +17451,9 @@ class $$MeasurementEntryTableTableTableManager
                 date: date,
                 value: value,
                 notes: notes,
+                source: source,
+                externalId: externalId,
+                extraData: extraData,
                 rowid: rowid,
               ),
           createCompanionCallback:
@@ -16895,6 +17463,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 +17473,9 @@ class $$MeasurementEntryTableTableTableManager
                 date: date,
                 value: value,
                 notes: notes,
+                source: source,
+                externalId: externalId,
+                extraData: extraData,
                 rowid: rowid,
               ),
           withReferenceMapper: (p0) => p0
@@ -17659,9 +18233,11 @@ typedef $$WorkoutSessionTableTableCreateCompanionBuilder =
       Value<String> id,
       Value<int?> routineId,
       Value<int?> dayId,
-      required DateTime date,
       Value<String?> notes,
       required WorkoutImpression impression,
+      Value<DateTime?> datetimeStart,
+      Value<DateTime?> datetimeEnd,
+      Value<DateTime?> date,
       Value<TimeOfDay?> timeStart,
       Value<TimeOfDay?> timeEnd,
       Value<int> rowid,
@@ -17671,9 +18247,11 @@ typedef $$WorkoutSessionTableTableUpdateCompanionBuilder =
       Value<String> id,
       Value<int?> routineId,
       Value<int?> dayId,
-      Value<DateTime> date,
       Value<String?> notes,
       Value<WorkoutImpression> impression,
+      Value<DateTime?> datetimeStart,
+      Value<DateTime?> datetimeEnd,
+      Value<DateTime?> date,
       Value<TimeOfDay?> timeStart,
       Value<TimeOfDay?> timeEnd,
       Value<int> rowid,
@@ -17703,11 +18281,6 @@ class $$WorkoutSessionTableTableFilterComposer
     builder: (column) => ColumnFilters(column),
   );
 
-  ColumnWithTypeConverterFilters<DateTime, DateTime, String> get date => $composableBuilder(
-    column: $table.date,
-    builder: (column) => ColumnWithTypeConverterFilters(column),
-  );
-
   ColumnFilters<String> get notes => $composableBuilder(
     column: $table.notes,
     builder: (column) => ColumnFilters(column),
@@ -17719,6 +18292,22 @@ class $$WorkoutSessionTableTableFilterComposer
         builder: (column) => ColumnWithTypeConverterFilters(column),
       );
 
+  ColumnWithTypeConverterFilters<DateTime?, DateTime, String> get datetimeStart =>
+      $composableBuilder(
+        column: $table.datetimeStart,
+        builder: (column) => ColumnWithTypeConverterFilters(column),
+      );
+
+  ColumnWithTypeConverterFilters<DateTime?, DateTime, String> get datetimeEnd => $composableBuilder(
+    column: $table.datetimeEnd,
+    builder: (column) => ColumnWithTypeConverterFilters(column),
+  );
+
+  ColumnWithTypeConverterFilters<DateTime?, DateTime, String> get date => $composableBuilder(
+    column: $table.date,
+    builder: (column) => ColumnWithTypeConverterFilters(column),
+  );
+
   ColumnWithTypeConverterFilters<TimeOfDay?, TimeOfDay, String> get timeStart => $composableBuilder(
     column: $table.timeStart,
     builder: (column) => ColumnWithTypeConverterFilters(column),
@@ -17754,11 +18343,6 @@ class $$WorkoutSessionTableTableOrderingComposer
     builder: (column) => ColumnOrderings(column),
   );
 
-  ColumnOrderings<String> get date => $composableBuilder(
-    column: $table.date,
-    builder: (column) => ColumnOrderings(column),
-  );
-
   ColumnOrderings<String> get notes => $composableBuilder(
     column: $table.notes,
     builder: (column) => ColumnOrderings(column),
@@ -17769,6 +18353,21 @@ class $$WorkoutSessionTableTableOrderingComposer
     builder: (column) => ColumnOrderings(column),
   );
 
+  ColumnOrderings<String> get datetimeStart => $composableBuilder(
+    column: $table.datetimeStart,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<String> get datetimeEnd => $composableBuilder(
+    column: $table.datetimeEnd,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<String> get date => $composableBuilder(
+    column: $table.date,
+    builder: (column) => ColumnOrderings(column),
+  );
+
   ColumnOrderings<String> get timeStart => $composableBuilder(
     column: $table.timeStart,
     builder: (column) => ColumnOrderings(column),
@@ -17798,9 +18397,6 @@ class $$WorkoutSessionTableTableAnnotationComposer
   GeneratedColumn<int> get dayId =>
       $composableBuilder(column: $table.dayId, builder: (column) => column);
 
-  GeneratedColumnWithTypeConverter<DateTime, String> get date =>
-      $composableBuilder(column: $table.date, builder: (column) => column);
-
   GeneratedColumn<String> get notes =>
       $composableBuilder(column: $table.notes, builder: (column) => column);
 
@@ -17809,6 +18405,19 @@ class $$WorkoutSessionTableTableAnnotationComposer
     builder: (column) => column,
   );
 
+  GeneratedColumnWithTypeConverter<DateTime?, String> get datetimeStart => $composableBuilder(
+    column: $table.datetimeStart,
+    builder: (column) => column,
+  );
+
+  GeneratedColumnWithTypeConverter<DateTime?, String> get datetimeEnd => $composableBuilder(
+    column: $table.datetimeEnd,
+    builder: (column) => column,
+  );
+
+  GeneratedColumnWithTypeConverter<DateTime?, String> get date =>
+      $composableBuilder(column: $table.date, builder: (column) => column);
+
   GeneratedColumnWithTypeConverter<TimeOfDay?, String> get timeStart =>
       $composableBuilder(column: $table.timeStart, builder: (column) => column);
 
@@ -17856,9 +18465,11 @@ class $$WorkoutSessionTableTableTableManager
                 Value<String> id = const Value.absent(),
                 Value<int?> routineId = const Value.absent(),
                 Value<int?> dayId = const Value.absent(),
-                Value<DateTime> date = const Value.absent(),
                 Value<String?> notes = const Value.absent(),
                 Value<WorkoutImpression> impression = const Value.absent(),
+                Value<DateTime?> datetimeStart = const Value.absent(),
+                Value<DateTime?> datetimeEnd = const Value.absent(),
+                Value<DateTime?> date = const Value.absent(),
                 Value<TimeOfDay?> timeStart = const Value.absent(),
                 Value<TimeOfDay?> timeEnd = const Value.absent(),
                 Value<int> rowid = const Value.absent(),
@@ -17866,9 +18477,11 @@ class $$WorkoutSessionTableTableTableManager
                 id: id,
                 routineId: routineId,
                 dayId: dayId,
-                date: date,
                 notes: notes,
                 impression: impression,
+                datetimeStart: datetimeStart,
+                datetimeEnd: datetimeEnd,
+                date: date,
                 timeStart: timeStart,
                 timeEnd: timeEnd,
                 rowid: rowid,
@@ -17878,9 +18491,11 @@ class $$WorkoutSessionTableTableTableManager
                 Value<String> id = const Value.absent(),
                 Value<int?> routineId = const Value.absent(),
                 Value<int?> dayId = const Value.absent(),
-                required DateTime date,
                 Value<String?> notes = const Value.absent(),
                 required WorkoutImpression impression,
+                Value<DateTime?> datetimeStart = const Value.absent(),
+                Value<DateTime?> datetimeEnd = const Value.absent(),
+                Value<DateTime?> date = const Value.absent(),
                 Value<TimeOfDay?> timeStart = const Value.absent(),
                 Value<TimeOfDay?> timeEnd = const Value.absent(),
                 Value<int> rowid = const Value.absent(),
@@ -17888,9 +18503,11 @@ class $$WorkoutSessionTableTableTableManager
                 id: id,
                 routineId: routineId,
                 dayId: dayId,
-                date: date,
                 notes: notes,
                 impression: impression,
+                datetimeStart: datetimeStart,
+                datetimeEnd: datetimeEnd,
+                date: date,
                 timeStart: timeStart,
                 timeEnd: timeEnd,
                 rowid: rowid,
@@ -22046,8 +22663,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/powersync.dart b/lib/database/powersync/powersync.dart
index eaf30a113..6fec41b73 100644
--- a/lib/database/powersync/powersync.dart
+++ b/lib/database/powersync/powersync.dart
@@ -19,6 +19,7 @@
 import 'dart:io';
 
 import 'package:flutter/foundation.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:http/http.dart' as http;
 import 'package:logging/logging.dart';
@@ -40,6 +41,9 @@ import 'package:wger/powersync/sync_watchdog.dart';
 part 'powersync.g.dart';
 
 final _logger = Logger('powersync');
+const _storageChannel = MethodChannel('de.wger.flutter/storage');
+const _dbFilename = 'powersync-wger.db';
+const _iosDbDirectoryName = 'de.wger.flutter.community';
 
 PowerSyncDatabase? _builtInstance;
 
@@ -283,14 +287,47 @@ final syncStatus = Provider((ref) {
 });
 
 Future<String> _getDatabasePath() async {
-  const dbFilename = 'powersync-wger.db';
-
   // getApplicationSupportDirectory is not supported on Web
   if (kIsWeb) {
-    return dbFilename;
+    return _dbFilename;
   }
+
   final dir = await getApplicationSupportDirectory();
-  return join(dir.path, dbFilename);
+  if (!Platform.isIOS) {
+    return join(dir.path, _dbFilename);
+  }
+
+  final dbDir = Directory(join(dir.path, _iosDbDirectoryName));
+  await dbDir.create(recursive: true);
+  await _migrateLegacyIosDatabaseFiles(fromDirectory: dir, toDirectory: dbDir);
+  await _excludeFromBackup(dbDir.path);
+  return join(dbDir.path, _dbFilename);
+}
+
+Future<void> _migrateLegacyIosDatabaseFiles({
+  required Directory fromDirectory,
+  required Directory toDirectory,
+}) async {
+  for (final suffix in ['', '-wal', '-shm', '-journal']) {
+    final from = File(join(fromDirectory.path, '$_dbFilename$suffix'));
+    final to = File(join(toDirectory.path, '$_dbFilename$suffix'));
+
+    if (!from.existsSync() || to.existsSync()) {
+      continue;
+    }
+
+    await from.rename(to.path);
+  }
+}
+
+Future<void> _excludeFromBackup(String path) async {
+  try {
+    await _storageChannel.invokeMethod<void>('excludeFromBackup', {'path': path});
+  } on MissingPluginException {
+    _logger.warning('Could not exclude $path from backups: storage channel unavailable');
+  } on PlatformException catch (e, s) {
+    _logger.warning('Could not exclude $path from backups', e, s);
+  }
 }
 
 /// Deletes the on-disk PowerSync SQLite files (main DB plus WAL/SHM/journal
diff --git a/lib/database/powersync/powersync.g.dart b/lib/database/powersync/powersync.g.dart
index 28c18de1b..efca46362 100644
--- a/lib/database/powersync/powersync.g.dart
+++ b/lib/database/powersync/powersync.g.dart
@@ -46,4 +46,4 @@ final class PowerSyncInstanceProvider
   }
 }
 
-String _$powerSyncInstanceHash() => r'8eacedfa3e5d5b41168f7517cbe19400a895b130';
+String _$powerSyncInstanceHash() => r'5d245fd575f1839d9920644027eb027f55b0e117';
diff --git a/lib/database/powersync/tables/measurements.dart b/lib/database/powersync/tables/measurements.dart
index cb9f2d247..d90f87e65 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,45 @@ 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()();
+
+  /// What the server calculates the entries of this category from, `NONE` for
+  /// one the user fills themselves. Kept as the raw string: a type added
+  /// after this release still has to read as calculated.
+  TextColumn get dynamicType =>
+      text().named('dynamic_type').withDefault(const Constant('NONE')).nullable()();
+
+  /// Configuration of the calculation (server JSONField), its keys depend on
+  /// [dynamicType].
+  TextColumn get dynamicParams =>
+      text().named('dynamic_params').map(const JsonMapConverter()).nullable()();
 }
 
 const PowersyncMeasurementCategoryTable = ps.Table(
@@ -38,10 +80,24 @@ 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'),
+    ps.Column.text('dynamic_type'),
+    // JSON object, synced and stored as text
+    ps.Column.text('dynamic_params'),
+  ],
+  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 +109,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 +130,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/database/powersync/tables/routines.dart b/lib/database/powersync/tables/routines.dart
index 56d962530..307382b87 100644
--- a/lib/database/powersync/tables/routines.dart
+++ b/lib/database/powersync/tables/routines.dart
@@ -112,7 +112,7 @@ const PowersyncWorkoutLogTable = ps.Table(
   ],
 );
 
-@UseRowClass(WorkoutSession)
+@UseRowClass(WorkoutSession, constructor: 'fromDb')
 class WorkoutSessionTable extends Table {
   @override
   String get tableName => 'manager_workoutsession';
@@ -120,9 +120,20 @@ class WorkoutSessionTable extends Table {
   TextColumn get id => text().clientDefault(() => ps.uuid.v7())();
   IntColumn get routineId => integer().named('routine_id').nullable()();
   IntColumn get dayId => integer().named('day_id').nullable()();
-  TextColumn get date => text().map(const DateOnlyTextConverter())();
   TextColumn get notes => text().nullable()();
   TextColumn get impression => text().map(const WorkoutImpressionConverter())();
+
+  // Nullable, and permanently so: rows that were replicated before 2.7 have no
+  // such key in the stored JSON and read as NULL for as long as that local
+  // database lives. WorkoutSession.fromDb rebuilds them from the columns below.
+  TextColumn get datetimeStart =>
+      text().named('datetime_start').nullable().map(const DateTimeTextConverter())();
+  TextColumn get datetimeEnd =>
+      text().named('datetime_end').nullable().map(const DateTimeTextConverter())();
+
+  // Pre-2.7 shape, only ever read. Remove once MIN_APP_VERSION has passed the
+  // versions that wrote them.
+  TextColumn get date => text().nullable().map(const DateOnlyTextConverter())();
   TextColumn get timeStart =>
       text().named('time_start').nullable().map(const TimeOfDayConverter())();
   TextColumn get timeEnd => text().named('time_end').nullable().map(const TimeOfDayConverter())();
@@ -133,9 +144,11 @@ const PowersyncWorkoutSessionTable = ps.Table(
   [
     ps.Column.integer('routine_id'),
     ps.Column.integer('day_id'),
-    ps.Column.text('date'),
     ps.Column.text('notes'),
     ps.Column.text('impression'),
+    ps.Column.text('datetime_start'),
+    ps.Column.text('datetime_end'),
+    ps.Column.text('date'),
     ps.Column.text('time_start'),
     ps.Column.text('time_end'),
   ],
diff --git a/lib/database/powersync/tables/user_profile.dart b/lib/database/powersync/tables/user_profile.dart
index 86a9c91ba..53d503876 100644
--- a/lib/database/powersync/tables/user_profile.dart
+++ b/lib/database/powersync/tables/user_profile.dart
@@ -27,11 +27,21 @@ class UserProfileTable extends Table {
 
   IntColumn get id => integer()();
   TextColumn get weightUnitStr => text().named('weight_unit')();
+
+  /// Body height in cm, null for a profile that has none and for a row that
+  /// synced before the column existed.
+  IntColumn get height => integer().nullable()();
+
+  /// IANA timezone name, empty when no client has reported one yet and null
+  /// for a row that synced before the column existed.
+  TextColumn get timeZone => text().named('time_zone').nullable()();
 }
 
 const PowersyncUserProfileTable = ps.Table(
   'core_userprofile',
   [
     ps.Column.text('weight_unit'),
+    ps.Column.integer('height'),
+    ps.Column.text('time_zone'),
   ],
 );
diff --git a/lib/features/account/models/user_profile.dart b/lib/features/account/models/user_profile.dart
index dcb8d3455..49b2fff70 100644
--- a/lib/features/account/models/user_profile.dart
+++ b/lib/features/account/models/user_profile.dart
@@ -22,10 +22,21 @@ import 'package:wger/database/powersync/database.dart';
 
 /// The user's editable profile preferences.
 class UserProfile {
+  /// The range the server's validators allow for [height], in cm. A value
+  /// outside them comes back as a 400, so the form refuses it first.
+  static const minHeightCm = 140;
+  static const maxHeightCm = 230;
+
   final int id;
   String weightUnitStr;
 
-  UserProfile({required this.id, required this.weightUnitStr});
+  /// Body height in cm, null for a profile that has none
+  final int? height;
+
+  /// IANA timezone name. Empty or null means no client has reported one.
+  final String? timeZone;
+
+  UserProfile({required this.id, required this.weightUnitStr, this.height, this.timeZone});
 
   bool get isMetric => weightUnitStr == 'kg';
 
@@ -33,10 +44,14 @@ class UserProfile {
   int get defaultWeightUnitId => isMetric ? WEIGHT_UNIT_KG : WEIGHT_UNIT_LB;
 
   /// Drift companion for local UPDATE writes routed through PowerSync.
+  ///
+  /// Only the columns the profile form edits: the timezone column belongs to
+  /// TimezoneSync, and a full write would clear what another client reported.
   UserProfileTableCompanion toCompanion() {
     return UserProfileTableCompanion(
       id: drift.Value(id),
       weightUnitStr: drift.Value(weightUnitStr),
+      height: drift.Value(height),
     );
   }
 }
diff --git a/lib/features/account/providers/timezone_sync.dart b/lib/features/account/providers/timezone_sync.dart
new file mode 100644
index 000000000..0d09eee03
--- /dev/null
+++ b/lib/features/account/providers/timezone_sync.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:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_timezone/flutter_timezone.dart';
+import 'package:logging/logging.dart';
+import 'package:wger/core/shared_preferences.dart';
+import 'package:wger/features/account/providers/user_profile_repository.dart';
+
+const reportedTimezonePrefKey = 'reportedTimezone';
+
+final timezoneSyncProvider = Provider<TimezoneSync>((ref) {
+  return TimezoneSync(ref.read(userProfileRepositoryProvider));
+});
+
+Future<String> _detectDeviceTimezone() async {
+  return (await FlutterTimezone.getLocalTimezone()).identifier;
+}
+
+/// Reports the device's IANA timezone to the user's profile.
+///
+/// Only overwrites what this client reported itself: an empty profile field is
+/// filled, a field still holding our last reported zone follows a device move,
+/// and anything else (set manually on the web, or reported by another device)
+/// is left alone.
+///
+/// The last reported zone is kept in the preferences so that the common case,
+/// the zone is unchanged, does nothing at all.
+class TimezoneSync {
+  final _logger = Logger('TimezoneSync');
+  final UserProfileRepository _repo;
+  final Future<String> Function() _detect;
+
+  TimezoneSync(this._repo, {Future<String> Function()? detect})
+    : _detect = detect ?? _detectDeviceTimezone;
+
+  Future<void> reportIfNeeded() async {
+    try {
+      final detected = await _detect();
+      if (detected.isEmpty) {
+        return;
+      }
+
+      final prefs = PreferenceHelper.asyncPref;
+      final lastReported = await prefs.getString(reportedTimezonePrefKey);
+      if (lastReported == detected) {
+        return;
+      }
+
+      // The profile row only exists once the first sync came through
+      final profile = await _repo
+          .watchDrift()
+          .firstWhere((p) => p != null)
+          .timeout(const Duration(minutes: 2));
+
+      final current = profile!.timeZone ?? '';
+      if (current == detected) {
+        await prefs.setString(reportedTimezonePrefKey, detected);
+        return;
+      }
+
+      if (current.isEmpty || current == lastReported) {
+        _logger.info('Reporting device timezone $detected to the profile');
+        await _repo.updateTimeZoneDrift(profile.id, detected);
+        await prefs.setString(reportedTimezonePrefKey, detected);
+      }
+    } on Exception catch (e) {
+      // Not critical, the next app start tries again
+      _logger.fine('Timezone report skipped: $e');
+    }
+  }
+}
diff --git a/lib/features/account/providers/user_profile_notifier.dart b/lib/features/account/providers/user_profile_notifier.dart
index 19a5a5a58..e5a6ea948 100644
--- a/lib/features/account/providers/user_profile_notifier.dart
+++ b/lib/features/account/providers/user_profile_notifier.dart
@@ -16,12 +16,21 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:wger/features/account/models/user_profile.dart';
 import 'package:wger/features/account/providers/user_profile_repository.dart';
 
 part 'user_profile_notifier.g.dart';
 
+/// The IANA zone the owner's calendar days are cut in, like the server's
+/// UserProfile.zone_info; null while the profile has not synced or no client
+/// has reported a zone yet (the day helpers then fall back to the device zone)
+final ownerTimeZoneProvider = Provider<String?>((ref) {
+  final zone = ref.watch(userProfileProvider).value?.timeZone;
+  return (zone == null || zone.isEmpty) ? null : zone;
+});
+
 @Riverpod(keepAlive: true)
 class UserProfileNotifier extends _$UserProfileNotifier {
   late UserProfileRepository _repo;
diff --git a/lib/features/account/providers/user_profile_repository.dart b/lib/features/account/providers/user_profile_repository.dart
index 087ce372e..9b608f7cd 100644
--- a/lib/features/account/providers/user_profile_repository.dart
+++ b/lib/features/account/providers/user_profile_repository.dart
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import 'package:drift/drift.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:logging/logging.dart';
 import 'package:wger/database/powersync/database.dart';
@@ -39,6 +40,18 @@ class UserProfileRepository {
     return _db.select(_db.userProfileTable).watchSingleOrNull();
   }
 
+  /// Writes only the timezone column; PowerSync pushes it upstream.
+  ///
+  /// Deliberately not routed through a full [UserProfile] write: that would
+  /// set every column, and a model field this code path was never taught
+  /// about would be overwritten with null.
+  Future<void> updateTimeZoneDrift(int id, String timeZone) async {
+    _logger.finer('Updating time zone of user profile $id');
+    await (_db.update(
+      _db.userProfileTable,
+    )..where((t) => t.id.equals(id))).write(UserProfileTableCompanion(timeZone: Value(timeZone)));
+  }
+
   /// Writes the edited preferences locally; PowerSync pushes them upstream.
   Future<void> editLocalDrift(UserProfile profile) async {
     _logger.finer('Updating local user profile ${profile.id}');
diff --git a/lib/features/account/widgets/forms.dart b/lib/features/account/widgets/forms.dart
index d040e4cf8..f0604d1b8 100644
--- a/lib/features/account/widgets/forms.dart
+++ b/lib/features/account/widgets/forms.dart
@@ -17,6 +17,7 @@
  */
 
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:wger/core/misc.dart';
@@ -48,6 +49,10 @@ class _UserProfileFormState extends ConsumerState<UserProfileForm> {
   /// Pending weight-unit edit, null while it still mirrors the synced value.
   String? _weightUnitStr;
 
+  /// Body height in cm as the field last held it, filled on save. Null is a
+  /// profile without one, which the server allows.
+  int? _height;
+
   /// The email field is seeded from the loaded account exactly once; later
   /// rebuilds must not clobber what the user typed.
   bool _emailInitialised = false;
@@ -97,6 +102,39 @@ class _UserProfileFormState extends ConsumerState<UserProfileForm> {
             },
             dense: true,
           ),
+          // The height is what BMI and the waist-to-height ratio are computed
+          // from, so a calculated category stays empty until it is set
+          ListTile(
+            leading: Icon(Icons.straighten, color: Theme.of(context).colorScheme.primary),
+            title: TextFormField(
+              key: const Key('heightField'),
+              initialValue: profile.height?.toString() ?? '',
+              decoration: InputDecoration(
+                labelText: i18n.metricHeight,
+                suffixText: 'cm',
+              ),
+              keyboardType: TextInputType.number,
+              inputFormatters: [FilteringTextInputFormatter.digitsOnly],
+              onSaved: (value) => _height = value == null ? null : int.tryParse(value),
+              validator: (value) {
+                // Empty is a profile that has none, which is what an account
+                // starts as
+                if (value == null || value.isEmpty) {
+                  return null;
+                }
+                final parsed = int.tryParse(value);
+                if (parsed == null ||
+                    parsed < UserProfile.minHeightCm ||
+                    parsed > UserProfile.maxHeightCm) {
+                  return i18n.formMinMaxValues(
+                    UserProfile.minHeightCm,
+                    UserProfile.maxHeightCm,
+                  );
+                }
+                return null;
+              },
+            ),
+          ),
           ListTile(
             leading: Icon(Icons.email_rounded, color: Theme.of(context).colorScheme.primary),
             title: TextFormField(
@@ -156,12 +194,17 @@ class _UserProfileFormState extends ConsumerState<UserProfileForm> {
               if (!_form.currentState!.validate()) {
                 return;
               }
+              _form.currentState!.save();
 
-              // The weight unit is synced through PowerSync and saves offline.
+              // Both are synced through PowerSync and save offline.
               await ref
                   .read(userProfileProvider.notifier)
                   .updateProfile(
-                    UserProfile(id: profile.id, weightUnitStr: weightUnitStr),
+                    UserProfile(
+                      id: profile.id,
+                      weightUnitStr: weightUnitStr,
+                      height: _height,
+                    ),
                   );
 
               // Changing the email needs the server: a verification mail is
diff --git a/lib/features/account/widgets/settings.dart b/lib/features/account/widgets/settings.dart
index f1eaed814..b681b8d6d 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,9 +59,10 @@ class SettingsPage extends StatelessWidget {
               ),
             ),
             const SettingsDataPrivacy(),
+            const HealthSyncSettingsTile(),
             ListTile(title: Text(i18n.others, style: Theme.of(context).textTheme.headlineSmall)),
-            const SettingsTheme(),
             const SettingsLanguage(),
+            const SettingsTheme(),
             ListTile(
               title: Text(i18n.selectAvailablePlates),
               onTap: () {
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..ef6c8fe19
--- /dev/null
+++ b/lib/features/account/widgets/settings/health_sync.dart
@@ -0,0 +1,219 @@
+/*
+ * 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. A platform that refuses
+        // the request outright throws, and that is the same "no access" to the
+        // user as a declined dialog, so it must not reach the error dialog.
+        int? count;
+        try {
+          count = needsPermission ? await notifier.retryWithPermissions() : await notifier.sync();
+        } catch (e) {
+          _logger.warning('Retrying the health permissions failed', e);
+        }
+        // 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/daily_windows.dart b/lib/features/health/models/daily_windows.dart
new file mode 100644
index 000000000..26f1c7bb7
--- /dev/null
+++ b/lib/features/health/models/daily_windows.dart
@@ -0,0 +1,111 @@
+/*
+ * 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/>.
+ */
+
+/// The calendar rules of a daily aggregate: which day a sample counts towards
+/// when the metric rolls over (sleep lands on the day the user wakes up),
+/// where a read window has to start so a day is never recomputed from a
+/// fraction of itself, and how overlapping samples add up.
+library;
+
+import 'package:wger/features/health/models/health_metric.dart';
+import 'package:wger/features/health/models/health_reading.dart';
+
+/// 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));
+}
+
+/// The first instant no longer attributed to [day], i.e. from when on no
+/// later read window can add samples to it.
+DateTime dayEnd(DateTime day, HealthMetric metric) {
+  final rollover = metric.dayRollsOverAtHour;
+  return rollover == null
+      ? DateTime(day.year, day.month, day.day + 1)
+      : DateTime(day.year, day.month, day.day, rollover);
+}
+
+DateTime earlier(DateTime a, DateTime b) => a.isBefore(b) ? a : b;
+
+DateTime later(DateTime a, DateTime b) => a.isAfter(b) ? a : b;
diff --git a/lib/features/health/models/health_metric.dart b/lib/features/health/models/health_metric.dart
new file mode 100644
index 000000000..1f25a1d66
--- /dev/null
+++ b/lib/features/health/models/health_metric.dart
@@ -0,0 +1,289 @@
+/*
+ * 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.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.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;
+
+  /// 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`), all of which
+/// the importer pulls.
+const List<HealthMetric> healthMetrics = [
+  HealthMetric(
+    metricType: MetricType.bodyFat,
+    dataType: HealthDataType.BODY_FAT_PERCENTAGE,
+    toCategoryValue: _bodyFatToPercent,
+  ),
+  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,
+  ),
+  HealthMetric(
+    metricType: MetricType.height,
+    dataType: HealthDataType.HEIGHT,
+    toCategoryValue: _heightToCm,
+  ),
+  HealthMetric(
+    metricType: MetricType.bodyWeight,
+    dataType: HealthDataType.WEIGHT,
+    toCategoryValue: _identity,
+  ),
+  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],
+      ),
+    ],
+  ),
+  HealthMetric(
+    metricType: MetricType.heartRate,
+    dataType: HealthDataType.HEART_RATE,
+    toCategoryValue: _identity,
+    dailyAggregation: DailyAggregation.average,
+    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,
+  ),
+  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,
+    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,
+  ),
+  // 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,
+    readWindow: highVolumeReadWindow,
+  ),
+  HealthMetric(
+    metricType: MetricType.distance,
+    dataType: HealthDataType.DISTANCE_DELTA,
+    toCategoryValue: _metersToKm,
+    dailyAggregation: DailyAggregation.sum,
+    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,
+    readWindow: highVolumeReadWindow,
+  ),
+];
+
+/// Every platform data type the metrics are made of, i.e. what permissions
+/// are asked for and what is checked as readable.
+List<HealthDataType> get healthDataTypes => healthMetrics.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_entry_writer.dart b/lib/features/health/providers/health_entry_writer.dart
new file mode 100644
index 000000000..335322c7b
--- /dev/null
+++ b/lib/features/health/providers/health_entry_writer.dart
@@ -0,0 +1,463 @@
+/*
+ * 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/features/health/models/daily_windows.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/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}$');
+
+/// Turns the readings of one sync into measurement entries: one per reading,
+/// or one per day for the metrics that aggregate.
+///
+/// Owns the categories they are written into (see [resolveTargets]) and the
+/// two counters a run reports at the end. Created per run, since both are
+/// about that run.
+class HealthEntryWriter {
+  HealthEntryWriter(this._measurements, this._source);
+
+  final MeasurementRepository _measurements;
+
+  /// The measurement `source` of this platform (`apple`, `google`)
+  final String _source;
+
+  final _logger = Logger('HealthEntryWriter');
+
+  /// Platform record ids folded into a UUID during this run, see
+  /// [_externalIdFor]. Expected to stay 0; anything else means a platform
+  /// changed its id format under us.
+  var normalizedIdCount = 0;
+
+  /// Readings dropped during this run because their value is outside what its
+  /// metric type allows, see [_isInRange].
+  var outOfRangeCount = 0;
+
+  /// Imports [metricReadings] into [target]'s category, deduplicating against
+  /// the entries already present via their externalId. Returns the number of
+  /// imported entries.
+  Future<int> importReadings(
+    HealthMetric metric,
+    Iterable<HealthReading> metricReadings,
+    ImportTarget target,
+  ) async {
+    final category = target.category;
+    final seen = target.seen!;
+    var synced = 0;
+
+    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++;
+      }
+    }
+    return synced;
+  }
+
+  /// Sorts [metricReadings] into the days they belong to and writes every day
+  /// no later window can add samples to; the rest waits in [target]'s pending
+  /// days until [flushPendingDays]. Returns the number of written entries.
+  Future<int> collectDailyAggregates(
+    HealthMetric metric,
+    Iterable<HealthReading> metricReadings,
+    ImportTarget target,
+    DateTime windowEnd,
+  ) async {
+    for (final reading in metricReadings) {
+      target.pending.putIfAbsent(dayOf(reading.date, metric), () => []).add(reading);
+    }
+
+    var synced = 0;
+    // The windows only move forward, so a day that ends at or before this
+    // window's end is complete and can stop holding its samples
+    for (final day in target.pending.keys.toList()) {
+      if (!dayEnd(day, metric).isAfter(windowEnd)) {
+        synced += await _writeDailyAggregate(metric, day, target.pending.remove(day)!, target);
+      }
+    }
+    return synced;
+  }
+
+  /// Writes the days still pending once the metric's read is complete: the
+  /// newest one is usually among them, still growing while its day runs.
+  Future<int> flushPendingDays(HealthMetric metric, ImportTarget target) async {
+    var synced = 0;
+    for (final day in target.pending.keys.toList()) {
+      synced += await _writeDailyAggregate(metric, day, target.pending.remove(day)!, target);
+    }
+    return synced;
+  }
+
+  /// Writes [samples] as the one entry of [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.
+  Future<int> _writeDailyAggregate(
+    HealthMetric metric,
+    DateTime day,
+    List<HealthReading> samples,
+    ImportTarget target,
+  ) async {
+    final category = target.category;
+    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)) {
+      return 0;
+    }
+    final externalId = dailyAggregateExternalId(category.id!, day);
+    final existing = target.stored![externalId];
+    if (existing == null) {
+      await _measurements.addLocalDrift(
+        MeasurementEntry(
+          categoryId: category.id!,
+          date: day,
+          value: value,
+          notes: '',
+          source: _source,
+          externalId: externalId,
+          extraData: extraData,
+        ),
+      );
+      return 1;
+    }
+    if (existing.value != value ||
+        !const MapEquality<String, dynamic>().equals(existing.extraData, extraData)) {
+      await _measurements.updateLocalDrift(existing.copyWith(value: value, extraData: extraData));
+      return 1;
+    }
+    return 0;
+  }
+
+  /// 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;
+  }
+
+  /// The categories [metric] imports into, paired with the state their import
+  /// carries across the read windows.
+  ///
+  /// Throws [SkipMetric] when the metric cannot be imported right now (no
+  /// official body weight category yet, or a group conflict); the cause is
+  /// logged where it is decided.
+  Future<List<ImportTarget>> resolveTargets(
+    HealthMetric metric,
+    List<MeasurementCategory> categories,
+    String userId,
+  ) async {
+    if (metric.components.isEmpty) {
+      final category = await _findOrCreateCategory(metric, categories, userId);
+      if (category == null) {
+        throw const SkipMetric();
+      }
+      return [await _targetFor(metric, category, metric.dataTypes)];
+    }
+
+    final children = await _findOrCreateGroupChildren(metric, categories, userId);
+    if (children == null) {
+      throw const SkipMetric();
+    }
+    return [
+      for (final (i, component) in metric.components.indexed)
+        await _targetFor(metric, children[i], component.dataTypes),
+    ];
+  }
+
+  Future<ImportTarget> _targetFor(
+    HealthMetric metric,
+    MeasurementCategory category,
+    List<HealthDataType> dataTypes,
+  ) async => ImportTarget(
+    category: category,
+    dataTypes: dataTypes,
+    // Loaded once per run: a full history holds one row per record or day,
+    // and every batch of the run deduplicates against the same state
+    seen: metric.dailyAggregation == null ? await _measurements.getExternalIds(category.id!) : null,
+    stored: metric.dailyAggregation != null
+        ? await _measurements.getEntriesByExternalId(category.id!)
+        : null,
+  );
+
+  /// 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.forMetricType(userId, 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.forMetricType(userId, metric.metricType);
+    // Collected and written in one transaction, so a group is never left
+    // without the children its readings live in
+    final toCreate = <MeasurementCategory>[if (existing == null) 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.forMetricType(
+        userId,
+        metricType,
+        parentId: parent.id,
+        order: order,
+      );
+      toCreate.add(child);
+      result.add(child);
+    }
+    if (toCreate.isNotEmpty) {
+      await _measurements.addLocalDriftCategoryGroup(toCreate);
+      categories.addAll(toCreate);
+    }
+    return result;
+  }
+}
+
+/// One category a metric imports into, with the state the import carries
+/// across the read windows.
+class ImportTarget {
+  ImportTarget({required this.category, required this.dataTypes, this.seen, this.stored});
+
+  final MeasurementCategory category;
+
+  /// The readings this target receives, matched by their platform type.
+  final List<HealthDataType> dataTypes;
+
+  /// External ids already imported; raw metrics only.
+  final Set<String>? seen;
+
+  /// Stored aggregates by external id; aggregating metrics only.
+  final Map<String, MeasurementEntry>? stored;
+
+  /// Days still collecting samples, until no read window can add to them
+  /// anymore. Never more than the newest day per window boundary, which is
+  /// what keeps the peak memory at one window plus one day.
+  final pending = <DateTime, List<HealthReading>>{};
+}
+
+/// Stops reading a metric that cannot be imported right now; its watermark
+/// then stays put and the readings are retried on the next sync.
+class SkipMetric implements Exception {
+  const SkipMetric();
+}
diff --git a/lib/features/health/providers/health_importer.dart b/lib/features/health/providers/health_importer.dart
new file mode 100644
index 000000000..a3062b47c
--- /dev/null
+++ b/lib/features/health/providers/health_importer.dart
@@ -0,0 +1,468 @@
+/*
+ * 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/network/auth_credentials_storage.dart';
+import 'package:wger/core/shared_preferences.dart';
+import 'package:wger/features/health/models/daily_windows.dart';
+import 'package:wger/features/health/models/health_metric.dart';
+import 'package:wger/features/health/providers/health_entry_writer.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';
+
+/// 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.
+///
+/// The day is formatted by hand: `DateFormat` renders its digits in the
+/// current locale, so a locale with its own numerals would give every day a
+/// second id and re-import the whole history.
+String dailyAggregateExternalId(String categoryId, DateTime day) => ps.uuid.v5(
+  categoryId,
+  '${day.year.toString().padLeft(4, '0')}-'
+  '${day.month.toString().padLeft(2, '0')}-'
+  '${day.day.toString().padLeft(2, '0')}',
+);
+
+/// 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);
+
+  /// Writes what the running import reads, and counts what it had to fold or
+  /// drop. Replaced per run, see [run].
+  late HealthEntryWriter _writer;
+
+  /// 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 {
+    try {
+      final readable = await _health.readableTypes(healthDataTypes);
+      final metrics = healthMetrics.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 < healthMetrics.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 = healthMetrics.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);
+      }
+
+      _writer = HealthEntryWriter(_measurements, _health.sourceName);
+      final run = await _prepare(metrics, readable, userId);
+      for (final metric in metrics) {
+        await _syncMetric(metric, run);
+      }
+      await _persist(run, readable);
+
+      _logger.info(
+        'Imported ${run.synced} health measurements, '
+        '${run.watermarks.length} of ${metrics.length} metrics now have a watermark',
+      );
+      return run.result();
+    } catch (e, s) {
+      return _failureResult(e, s);
+    }
+  }
+
+  /// Everything the metrics are read against: where each one starts, which
+  /// categories exist, and what the run collects along the way.
+  Future<_SyncRun> _prepare(
+    List<HealthMetric> metrics,
+    Set<HealthDataType> readable,
+    String userId,
+  ) async {
+    final categories = await _measurements.getCategoriesOnce();
+
+    return _SyncRun(
+      userId: userId,
+      categories: categories,
+      endTime: DateTime.now(),
+      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
+      knownEmpty: {...?await _prefs.getHealthSyncEmptyMetrics()},
+      withoutCategory: _missingCategories(
+        metrics,
+        categories,
+      ).map((m) => m.metricType.name).toSet(),
+      newlyReadable: await _newlyReadableTypes(readable),
+    );
+  }
+
+  /// Reads one metric and writes what it delivers, then moves its watermark.
+  ///
+  /// One bad metric must not cost the others their import, so everything here
+  /// is caught: its own watermark then stays put for whatever it could not
+  /// write, and the run remembers what kind of failure it was.
+  Future<void> _syncMetric(HealthMetric metric, _SyncRun run) async {
+    final name = metric.metricType.name;
+    final startTime = run.startFor(metric);
+    final readsFullHistory = startTime == _fullHistoryStart;
+    // One line per metric would be eight per sync in the exportable log,
+    // where the summary at the end is what a report needs
+    _logger.fine('Syncing $name from $startTime to ${run.endTime}');
+
+    try {
+      var delivered = false;
+      DateTime? latest;
+      // The categories the metric imports into, resolved on the first
+      // batch that delivers: a metric the platform has nothing for must
+      // not create them
+      List<ImportTarget>? targets;
+
+      // Read per metric, one window at a time: how much of the timeline
+      // one platform query may cover depends on how densely the metric is
+      // written, see [HealthMetric.readWindow]. Windows already written
+      // stay written when a later one fails; the watermark below then
+      // holds, and the re-read is deduplicated via the external ids
+      await _health.read(
+        types: metric.dataTypes,
+        start: windowStartFor(startTime, metric),
+        end: run.endTime,
+        window: metric.readWindow,
+        onBatch: (batch, windowEnd) async {
+          final readings = batch.where((r) => metric.dataTypes.contains(r.type)).toList();
+          if (readings.isEmpty) {
+            return;
+          }
+          delivered = true;
+          targets ??= await _writer.resolveTargets(metric, run.categories, run.userId);
+          for (final target in targets!) {
+            final routed = readings.where((r) => target.dataTypes.contains(r.type));
+            run.synced += metric.dailyAggregation != null
+                ? await _writer.collectDailyAggregates(metric, routed, target, windowEnd)
+                : await _writer.importReadings(metric, routed, target);
+          }
+          for (final reading in readings) {
+            if (latest == null || reading.date.isAfter(latest!)) {
+              latest = reading.date;
+            }
+          }
+        },
+      );
+      // The newest day can still be growing, so it is only written once
+      // no window can add to it anymore
+      for (final target in targets ?? const <ImportTarget>[]) {
+        run.synced += await _writer.flushPendingDays(metric, target);
+      }
+
+      if (!delivered) {
+        if (readsFullHistory && run.withoutCategory.contains(name)) {
+          run.knownEmpty.add(name);
+        }
+        run.watermarks[name] = run.endTime;
+        return;
+      }
+      run.knownEmpty.remove(name);
+
+      // 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
+      run.watermarks[name] = latest == null || latest!.isAfter(run.endTime) ? run.endTime : latest!;
+    } on SkipMetric {
+      // Nothing was written and the watermark holds; the cause is logged
+      // where the metric was skipped
+    } 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 $name', e);
+        run.permissionsMissing = true;
+      } else {
+        _logger.severe('Importing $name failed', e, s);
+        run.failedMetric = true;
+      }
+    }
+  }
+
+  /// Writes what the run learned, once every metric has had its turn.
+  Future<void> _persist(_SyncRun run, Set<HealthDataType> readable) async {
+    // 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(run.knownEmpty.toList());
+    await _writeWatermarks(run.watermarks);
+
+    if (_writer.normalizedIdCount > 0) {
+      _logger.warning(
+        'Folded ${_writer.normalizedIdCount} platform record ids into UUIDs during this sync',
+      );
+    }
+    if (_writer.outOfRangeCount > 0) {
+      _logger.warning('Dropped ${_writer.outOfRangeCount} readings outside their metric limits');
+    }
+  }
+
+  /// The result of a run that gave up before the metrics ran.
+  ///
+  /// 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.
+  HealthImportResult _failureResult(Object e, StackTrace s) {
+    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,
+    );
+  }
+
+  /// 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 type names the platform now lets us read but 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.
+  ///
+  /// The names rather than a flag: only the metrics built on them have that
+  /// hole, and the full history of every other one would be read for nothing.
+  Future<Set<String>> _newlyReadableTypes(Set<HealthDataType> readable) async {
+    final previous = await _prefs.getHealthSyncReadableTypes();
+    if (previous == null) {
+      return {};
+    }
+
+    final newlyReadable = readable.map((t) => t.name).toSet().difference(previous.toSet());
+    if (newlyReadable.isNotEmpty) {
+      _logger.info(
+        'Access to ${newlyReadable.join(', ')} is new, '
+        'reading their full history instead of from the watermark',
+      );
+    }
+    return newlyReadable;
+  }
+
+  /// 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;
+  }
+}
+
+/// The state one [HealthImporter.run] carries across its metrics: what the
+/// reads are measured against, and what they produced.
+class _SyncRun {
+  _SyncRun({
+    required this.userId,
+    required this.categories,
+    required this.endTime,
+    required this.watermarks,
+    required this.knownEmpty,
+    required this.withoutCategory,
+    required this.newlyReadable,
+  });
+
+  /// Owner of the local database, whose typed category ids are derived from it
+  final String userId;
+
+  /// The categories that exist, grown by the ones a metric creates
+  final List<MeasurementCategory> categories;
+
+  /// End of every read window of this run, so the metrics cover the same span
+  final DateTime endTime;
+
+  /// How far each metric has been imported, moved as they deliver
+  final Map<String, DateTime> watermarks;
+
+  /// Metrics the platform is known to have nothing for, see
+  /// setHealthSyncEmptyMetrics
+  final Set<String> knownEmpty;
+
+  /// Metrics without a category to import into
+  final Set<String> withoutCategory;
+
+  /// Type names the platform lets us read but did not last time
+  final Set<String> newlyReadable;
+
+  var synced = 0;
+  var failedMetric = false;
+  var permissionsMissing = false;
+
+  /// Where the read of [metric] starts.
+  ///
+  /// 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. Those read the full history; everything else starts
+  /// an overlap window before its watermark.
+  DateTime startFor(HealthMetric metric) {
+    final name = metric.metricType.name;
+    final hasNoHistory =
+        metric.dataTypes.any((t) => newlyReadable.contains(t.name)) ||
+        watermarks[name] == null ||
+        (withoutCategory.contains(name) && !knownEmpty.contains(name));
+
+    return hasNoHistory
+        ? HealthImporter._fullHistoryStart
+        : watermarks[name]!.subtract(HealthImporter._syncOverlap);
+  }
+
+  /// What the run reports back: a failing metric outweighs a missing
+  /// permission, since it is the one the user cannot act on themselves.
+  HealthImportResult result() => (
+    imported: synced,
+    issue: failedMetric
+        ? HealthSyncIssue.failed
+        : permissionsMissing
+        ? HealthSyncIssue.permissionsMissing
+        : null,
+    completed: true,
+  );
+}
+
+/// then stays put and the readings are retried on the next sync.
diff --git a/lib/features/health/providers/health_repository.dart b/lib/features/health/providers/health_repository.dart
new file mode 100644
index 000000000..d69849729
--- /dev/null
+++ b/lib/features/health/providers/health_repository.dart
@@ -0,0 +1,286 @@
+/*
+ * 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';
+
+  /// 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] in windows of [window],
+  /// handing each window's readings to [onBatch] as soon as it returned:
+  /// the peak memory stays at one window (see [HealthMetric.readWindow];
+  /// years of a dense type would fill the 256 MB Android app heap).
+  ///
+  /// Windows are contiguous and move forward; a record on or across a
+  /// boundary is delivered once, in its first window. Delivered batches stay
+  /// written when a later window fails, so [onBatch] has to be idempotent.
+  /// A failing type is dropped from the remaining windows; the error only
+  /// propagates when every type fails.
+  Future<void> read({
+    required List<HealthDataType> types,
+    required DateTime start,
+    required DateTime end,
+    required Duration window,
+    required Future<void> Function(List<HealthReading> batch, DateTime windowEnd) onBatch,
+  }) async {
+    final failed = <HealthDataType>{};
+    final counts = {for (final type in types) type: 0};
+    // Records that can reappear in a later window because their interval
+    // reaches the current window's end, per type: dedup key -> interval end
+    final carried = {for (final type in types) type: <String, DateTime>{}};
+    Object? firstError;
+
+    var windowStart = start;
+    while (windowStart.isBefore(end) && failed.length < types.length) {
+      final next = windowStart.add(window);
+      final windowEnd = next.isAfter(end) ? end : next;
+      final batch = <HealthReading>[];
+
+      for (final type in types) {
+        if (failed.contains(type)) {
+          continue;
+        }
+        final List<HealthDataPoint> points;
+        try {
+          points = await _health.getHealthDataFromTypes(
+            types: [type],
+            startTime: windowStart,
+            endTime: windowEnd,
+          );
+        } catch (e) {
+          failed.add(type);
+          firstError ??= e;
+          _logger.warning('Reading ${type.name} from the health platform failed: $e');
+          continue;
+        }
+        if (points.isEmpty) {
+          continue;
+        }
+        // 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
+        _logger.finer('Read ${points.length} ${type.name} records from $windowStart');
+
+        final carry = carried[type]!;
+        for (final point in _health.removeDuplicates(points)) {
+          final reading = HealthReading.fromDataPoint(point);
+          if (reading == null) {
+            continue;
+          }
+          if (carry.containsKey(_dedupKey(reading))) {
+            continue;
+          }
+          batch.add(reading);
+          counts[type] = counts[type]! + 1;
+          final intervalEnd = reading.dateTo ?? reading.date;
+          if (!intervalEnd.isBefore(windowEnd)) {
+            carry[_dedupKey(reading)] = intervalEnd;
+          }
+        }
+        // A record whose interval ended inside this window cannot come back
+        carry.removeWhere((_, intervalEnd) => intervalEnd.isBefore(windowEnd));
+      }
+
+      if (batch.isNotEmpty) {
+        await onBatch(batch, windowEnd);
+      }
+      windowStart = next;
+    }
+
+    for (final MapEntry(key: type, value: count) in counts.entries) {
+      if (count > 0) {
+        _logger.fine('Read $count ${type.name} records in total');
+      }
+    }
+    if (firstError != null && failed.length == types.length) {
+      throw firstError;
+    }
+  }
+
+  static String _dedupKey(HealthReading reading) =>
+      reading.externalId ??
+      '${reading.type.name}|${reading.date}|${reading.dateTo}|${reading.value}';
+}
diff --git a/lib/features/health/providers/health_sync.dart b/lib/features/health/providers/health_sync.dart
new file mode 100644
index 000000000..5daf62ce9
--- /dev/null
+++ b/lib/features/health/providers/health_sync.dart
@@ -0,0 +1,187 @@
+/*
+ * 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 syncs, on app start and on resume.
+  static const _autoSyncThrottle = 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: syncIfDue);
+    ref.onDispose(lifecycleListener.dispose);
+
+    return const HealthSyncState();
+  }
+
+  Future<void> _loadPersistedState() async {
+    if (await PreferenceHelper.instance.getHealthSyncEnabled()) {
+      state = state.copyWith(isEnabled: true);
+    }
+  }
+
+  /// 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(healthDataTypes)) {
+      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(healthDataTypes)) {
+      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 unless the last one finished less than
+  /// [_autoSyncThrottle] ago, for the automatic triggers (app start, resume).
+  ///
+  /// Every run re-reads the overlap window of each metric, which is a month of
+  /// platform records for the ones a watch writes continuously, so an app
+  /// restarted a few times in a row must not do that on every start. What the
+  /// user asks for from the settings goes through [sync] and is never skipped.
+  Future<void> syncIfDue() async {
+    final last = await PreferenceHelper.instance.getHealthSyncLastRun();
+    if (last != null && DateTime.now().difference(last) < _autoSyncThrottle) {
+      _logger.fine('Health sync ran at $last, skipping this one');
+      return;
+    }
+
+    await sync();
+  }
+
+  /// 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
+    if (result.completed) {
+      await PreferenceHelper.instance.setHealthSyncLastRun(DateTime.now());
+    }
+    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..2fc3e99a8
--- /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'16e34d617342221e827eaf521bbfdd3f012a146a';
+
+/// 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..e3fb98a91
--- /dev/null
+++ b/lib/features/measurements/charts/data.dart
@@ -0,0 +1,691 @@
+/*
+ * 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 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 ?? ChartSettings.fallbackWindow,
+  );
+  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].
+///
+/// Chart points from 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..28e61d012
--- /dev/null
+++ b/lib/features/measurements/charts/range.dart
@@ -0,0 +1,87 @@
+/*
+ * 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, at midnight so the window covers whole calendar
+  /// days like [countCutoff] does, null for the full history.
+  DateTime? get cutoff {
+    final days = _days;
+    if (days == null) {
+      return null;
+    }
+    final from = DateTime.now().subtract(Duration(days: days));
+    return DateTime(from.year, from.month, from.day);
+  }
+
+  /// 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..4eb3abed0
--- /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 _weeklyThresholdDays = 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 _sparseMinDays = 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 [_weeklyThresholdDays] 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 <= _weeklyThresholdDays) {
+        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 [_sparseMinDays].
+bool sparkIsSparse(List<MeasurementChartEntry> days) => days.length < _sparseMinDays;
+
+/// 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..521840647 100644
--- a/lib/features/measurements/measurements.dart
+++ b/lib/features/measurements/measurements.dart
@@ -18,11 +18,13 @@
 
 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) {
-    return where((e) => e.date.isAfter(start) && (end == null || e.date.isBefore(end))).toList();
+    // Inclusive at the start: day buckets sit exactly at midnight, and the
+    // range cutoff is one too
+    return where((e) => !e.date.isBefore(start) && (end == null || e.date.isBefore(end))).toList();
   }
 
   // assures values on the start (and optionally end) dates exist, by interpolating if needed
@@ -71,7 +73,7 @@ extension MeasurementChartEntryListExtensions on List<MeasurementChartEntry> {
       } else {
         // insert interpolated start value if needed
         if (!hasEntryOnStartDay && lastBeforeStart != null) {
-          result.insert(0, interpolateBetween(lastBeforeStart, entry, start));
+          result.insert(0, _interpolateBetween(lastBeforeStart, entry, start));
           hasEntryOnStartDay = true;
         }
 
@@ -82,7 +84,7 @@ extension MeasurementChartEntryListExtensions on List<MeasurementChartEntry> {
           // note: we only interpolate end if we have data going beyond end
           // if let's say your plan ends in a week from now, we wouldn't want to fake data until next week.
           if (!hasEntryOnEndDay && lastBeforeEnd != null) {
-            result.add(interpolateBetween(lastBeforeEnd, entry, end!));
+            result.add(_interpolateBetween(lastBeforeEnd, entry, end!));
             hasEntryOnEndDay = true;
           }
           // we added all our values and did all interpolations
@@ -96,7 +98,7 @@ extension MeasurementChartEntryListExtensions on List<MeasurementChartEntry> {
 }
 
 // caller needs to make sure that before.date < date < after.date
-MeasurementChartEntry interpolateBetween(
+MeasurementChartEntry _interpolateBetween(
   MeasurementChartEntry before,
   MeasurementChartEntry after,
   DateTime date,
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_calculation.dart b/lib/features/measurements/models/measurement_calculation.dart
new file mode 100644
index 000000000..4abd4e6c8
--- /dev/null
+++ b/lib/features/measurements/models/measurement_calculation.dart
@@ -0,0 +1,250 @@
+/*
+ * 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 calculations the server can run for a measurement category.
+///
+/// The server owns the maths and the validation; this table is what the app
+/// needs to render a form for a calculation and to read one back. It is
+/// mirrored here rather than fetched: the labels and the help texts are
+/// translated in the app anyway, as with the metric types. Keep it next to
+/// wger/measurements/dynamic/types.py.
+library;
+
+import 'package:flutter/material.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+/// One parameter of a calculation, as the form has to render it.
+///
+/// The bounds repeat what the server validates. They are here so the user does
+/// not run into a round trip that can only fail; the server stays the
+/// authority and refuses anything outside them either way.
+sealed class CalculationParam {
+  /// Key the value is stored under in `dynamic_params`
+  final String key;
+
+  const CalculationParam(this.key);
+}
+
+/// The units a length can be written in, as the server reads them (see
+/// LENGTH_UNITS in measurements/dynamic/types.py).
+///
+/// Spelled-out and translated forms are deliberately left out: that list has
+/// no end, and a category whose unit is not among these is offered but
+/// disabled, which shows the user what to change instead of hiding the
+/// category from them.
+const _lengthUnits = [
+  'mm',
+  'millimeter',
+  'millimeters',
+  'cm',
+  'centimeter',
+  'centimeters',
+  'm',
+  'meter',
+  'meters',
+  'in',
+  'inch',
+  'inches',
+  '"',
+  '\u2033',
+];
+
+/// One of the user's own categories, referenced by its id
+class CategoryParam extends CalculationParam {
+  /// Units a category has to be measured in to be offered
+  final List<String> unitFilter;
+
+  const CategoryParam(super.key, {required this.unitFilter});
+
+  /// Whether a category measured in [unit] fits this parameter. A trailing
+  /// dot is an abbreviation, not a different unit ("cm.")
+  bool accepts(String unit) {
+    final normalized = unit.trim().toLowerCase();
+    return unitFilter.contains(
+      normalized.endsWith('.') ? normalized.substring(0, normalized.length - 1) : normalized,
+    );
+  }
+}
+
+/// A single exercise, stored as its id
+class ExerciseParam extends CalculationParam {
+  const ExerciseParam(super.key);
+}
+
+/// Several exercises, stored as a list of ids
+class ExercisesParam extends CalculationParam {
+  final int minItems;
+  final int maxItems;
+
+  const ExercisesParam(super.key, {required this.minItems, required this.maxItems});
+}
+
+/// A bounded number with the value the server falls back to
+class IntParam extends CalculationParam {
+  final int min;
+  final int max;
+  final int fallback;
+
+  const IntParam(super.key, {required this.min, required this.max, required this.fallback});
+}
+
+/// One calculation the server offers, with everything the form needs for it
+class CalculationType {
+  /// The server's `dynamic_type`
+  final String slug;
+
+  /// Prefill for the category unit; the user can still change it
+  final String unit;
+
+  final List<CalculationParam> params;
+
+  /// Needs the height in the user profile, and computes nothing without it
+  final bool needsHeight;
+
+  const CalculationType({
+    required this.slug,
+    required this.unit,
+    required this.params,
+    this.needsHeight = false,
+  });
+}
+
+/// The calculations this release knows; the server may support more, or fewer
+const calculationTypes = <CalculationType>[
+  CalculationType(
+    slug: 'BMI',
+    unit: 'kg/m²',
+    params: [],
+    needsHeight: true,
+  ),
+  CalculationType(
+    slug: 'WHTR',
+    // A ratio of two lengths, so the number carries no unit
+    unit: '',
+    params: [
+      CategoryParam('category_id', unitFilter: _lengthUnits),
+    ],
+    needsHeight: true,
+  ),
+  CalculationType(
+    slug: 'ONE_REP_MAX',
+    unit: 'kg',
+    params: [
+      ExerciseParam('exercise_id'),
+      IntParam('max_reps', min: 1, max: 10, fallback: 5),
+    ],
+  ),
+  CalculationType(
+    slug: 'ONE_RM_TOTAL',
+    unit: 'kg',
+    params: [
+      ExercisesParam('exercise_ids', minItems: 2, maxItems: 5),
+      IntParam('max_reps', min: 1, max: 10, fallback: 5),
+      IntParam('window_days', min: 7, max: 120, fallback: 30),
+    ],
+  ),
+];
+
+/// Bench press, squat and deadlift, the total most people mean.
+///
+/// An instance that never synced them simply resolves nothing here.
+const bigThreeUuids = [
+  '3717d144-7815-4a97-9a56-956fb889c996',
+  'a2f5b6ef-b780-49c0-8d96-fdaff23e27ce',
+  'ee8e8db4-2d82-49e1-ab7f-891e9a354934',
+];
+
+/// The calculation [slug] stands for, or null if this release does not know it
+CalculationType? calculationTypeOf(String slug) {
+  for (final type in calculationTypes) {
+    if (type.slug == slug) {
+      return type;
+    }
+  }
+  return null;
+}
+
+/// Whether a stored calculation is one this release can render. An unknown one
+/// comes from a newer server: it is shown, but its parameters are left alone
+/// rather than overwritten with what this version happens to understand.
+bool isKnownCalculation(String slug) => slug == noDynamicType || calculationTypeOf(slug) != null;
+
+/// The parameters a freshly picked calculation starts with.
+///
+/// The numbers start at the server's own default so that the user sees it,
+/// and emptying the field means it again. Writing it out rather than leaving
+/// it absent is what keeps two clients from storing the same configuration
+/// differently: the server compares the parameters as they are stored, so an
+/// omitted value and a typed one are two configurations to it, and neither
+/// would recognise the other as a duplicate.
+Map<String, dynamic> defaultParams(CalculationType type) => {
+  for (final param in type.params)
+    param.key: switch (param) {
+      IntParam(:final fallback) => fallback,
+      ExercisesParam() => const <int>[],
+      _ => null,
+    },
+};
+
+extension CalculationTypeL10n on CalculationType {
+  /// Name the category is prefilled with, and what the type picker shows
+  String localizedName(BuildContext context) {
+    final l10n = AppLocalizations.of(context);
+    return switch (slug) {
+      'BMI' => l10n.calculationNameBmi,
+      'WHTR' => l10n.calculationNameWhtr,
+      'ONE_REP_MAX' => l10n.calculationNameOneRepMax,
+      'ONE_RM_TOTAL' => l10n.calculationNameOneRmTotal,
+      // Nothing to translate a calculation this release does not know by; the
+      // slug is at least honest about which one it is
+      _ => slug,
+    };
+  }
+
+  /// What the values are computed from, in words. Shown under the type picker
+  /// while the calculation is configured, and on the category from then on,
+  /// where it doubles as the explanation for one that is still empty.
+  ///
+  /// Null where the sentence would only repeat what the calculation is called:
+  /// a one-rep max reads the exercise it names, which the form asks for right
+  /// below and the category carries in its name. [category] names the source
+  /// category of the ratio and is ignored by every other type.
+  String? localizedDescription(BuildContext context, {String category = ''}) {
+    final l10n = AppLocalizations.of(context);
+    return switch (slug) {
+      'BMI' => l10n.calculationDescriptionBmi,
+      'WHTR' => l10n.calculationDescriptionWhtr(category),
+      _ => null,
+    };
+  }
+}
+
+extension CalculationParamL10n on CalculationParam {
+  /// Label of the field this parameter is entered in
+  String localizedLabel(BuildContext context) {
+    final l10n = AppLocalizations.of(context);
+    return switch (key) {
+      'category_id' => l10n.calculationParamCategory,
+      'max_reps' => l10n.calculationParamMaxReps,
+      'window_days' => l10n.calculationParamWindowDays,
+      // The exercise parameters render their own labels, see the picker
+      _ => key,
+    };
+  }
+}
diff --git a/lib/features/measurements/models/measurement_category.dart b/lib/features/measurements/models/measurement_category.dart
index 3dd72751e..3d6f940a2 100644
--- a/lib/features/measurements/models/measurement_category.dart
+++ b/lib/features/measurements/models/measurement_category.dart
@@ -17,13 +17,510 @@
  */
 
 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/core/formatting/formatting.dart';
 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,
+  );
+}
+
+/// What both line settings take when the user turns their line off
+const chartLineOff = 'none';
+
+/// 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 {
+  /// No trend line at all, see [chartLineOff]
+  none(chartLineOff, null),
+  reactive('reactive', 5),
+  balanced('balanced', 10),
+  sluggish('sluggish', 20);
+
+  final String wireValue;
+
+  /// Null for [TrendCharacter.none], which draws nothing
+  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.none => l10n.off,
+      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];
+
+  /// Window the numbers derived from the average use when the line is off
+  static const fallbackWindow = 7;
+
+  final TrendCharacter trend;
+
+  /// Window the moving average covers, in days, null when the user turned the
+  /// average line off
+  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 == chartLineOff
+          ? null
+          : 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 => durationUnit,
+  };
+
+  /// `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.weight,
+      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.energy,
+      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);
+}
+
+/// The server's `dynamic_type` for a category the user fills themselves
+const noDynamicType = 'NONE';
+
 @freezed
 class MeasurementCategory with _$MeasurementCategory {
   /// Inclusive upper bound for [name]
@@ -42,22 +539,147 @@ 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 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 List<MeasurementEntry> entries;
+  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;
+
+  /// What the server calculates the entries of this category from,
+  /// [noDynamicType] for one the user fills themselves. Deliberately the raw
+  /// string: a type added after this release still has to read as calculated,
+  /// see [isCalculated].
+  @override
+  final String dynamicType;
+
+  /// Configuration of the calculation, its keys depend on [dynamicType]. Null
+  /// for a category the server does not calculate.
+  @override
+  final Map<String, dynamic>? dynamicParams;
+
+  /// 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.dynamicType = noDynamicType,
+    this.dynamicParams,
+    this.children = const [],
   });
 
-  MeasurementEntry findEntryById(String id) {
-    return entries.firstWhere(
-      (entry) => entry.id == id,
-      orElse: () => throw const NoSuchEntryException(),
-    );
-  }
+  /// The typed category of [metricType] for [userId]: the deterministic id
+  /// the app and the server both derive, with the type's canonical name and
+  /// unit. [parentId] and [order] place a component in its group.
+  MeasurementCategory.forMetricType(
+    String userId,
+    MetricType metricType, {
+    String? parentId,
+    int order = 0,
+  }) : this(
+         id: deterministicCategoryId(userId, metricType),
+         name: metricType.canonicalName,
+         unit: metricType.defaultUnit,
+         metricType: metricType,
+         parentId: parentId,
+         order: order,
+       );
+
+  /// 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,
+    String? dynamicType,
+    Map<String, dynamic>? dynamicParams,
+  }) : this(
+         id: id,
+         name: name,
+         unit: unit,
+         metricType: metricType ?? MetricType.custom,
+         chartType: chartType,
+         chartConfig: chartConfig,
+         parentId: parentId,
+         order: order ?? 0,
+         isOfficial: isOfficial ?? false,
+         dynamicType: dynamicType ?? noDynamicType,
+         dynamicParams: dynamicParams,
+       );
+
+  /// 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 server maintains the entries of this category. They are
+  /// read-only, and adding one by hand is refused.
+  bool get isCalculated => dynamicType != noDynamicType;
+
+  /// 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 +687,14 @@ 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),
+      dynamicType: Value(dynamicType),
+      dynamicParams: Value(dynamicParams),
     );
   }
 }
diff --git a/lib/features/measurements/models/measurement_category.freezed.dart b/lib/features/measurements/models/measurement_category.freezed.dart
index 4d6754060..3d562d870 100644
--- a/lib/features/measurements/models/measurement_category.freezed.dart
+++ b/lib/features/measurements/models/measurement_category.freezed.dart
@@ -15,7 +15,31 @@ 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;/// What the server calculates the entries of this category from,
+/// [noDynamicType] for one the user fills themselves. Deliberately the raw
+/// string: a type added after this release still has to read as calculated,
+/// see [isCalculated].
+ String get dynamicType;/// Configuration of the calculation, its keys depend on [dynamicType]. Null
+/// for a category the server does not calculate.
+ Map<String, dynamic>? get dynamicParams;/// 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 +50,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)&&(identical(other.dynamicType, dynamicType) || other.dynamicType == dynamicType)&&const DeepCollectionEquality().equals(other.dynamicParams, dynamicParams)&&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,dynamicType,const DeepCollectionEquality().hash(dynamicParams),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, dynamicType: $dynamicType, dynamicParams: $dynamicParams, children: $children)';
 }
 
 
@@ -46,7 +70,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, String dynamicType, Map<String, dynamic>? dynamicParams, List<MeasurementCategory> children
 });
 
 
@@ -63,13 +87,21 @@ 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? dynamicType = null,Object? dynamicParams = freezed,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,dynamicType: null == dynamicType ? _self.dynamicType : dynamicType // ignore: cast_nullable_to_non_nullable
+as String,dynamicParams: freezed == dynamicParams ? _self.dynamicParams : dynamicParams // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>?,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..83a719e45 100644
--- a/lib/features/measurements/models/measurement_entry.dart
+++ b/lib/features/measurements/models/measurement_entry.dart
@@ -22,11 +22,17 @@ import 'package:wger/database/powersync/database.dart';
 
 part 'measurement_entry.freezed.dart';
 
+/// The server's `source` for an entry the user wrote themselves, the only one
+/// the app lets them edit or delete.
+const measurementSourceUser = 'user';
+
+/// The server's `source` for an entry it computed itself, see the calculated
+/// categories. Such an entry is read-only: it is replaced whenever the data
+/// behind it changes.
+const measurementSourceCalculated = 'calculated';
+
 @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 +49,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 = measurementSourceUser,
+    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 ?? measurementSourceUser,
+         externalId: externalId,
+         extraData: extraData,
+       );
+
   // Boilerplate
   MeasurementEntryTableCompanion toCompanion() {
     return MeasurementEntryTableCompanion(
@@ -59,6 +108,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..343f20ef4 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,51 @@ 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.forMetricType(userId, 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..01260b897 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'52860c3934c9f86860c431bc1cb48424808774f3';
+
+/// 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..da8afaa28 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,483 @@ 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(_dateBound(since)),
+    if (until != null) Variable.withString(_dateBound(until)),
+  ];
+
+  /// A date bound for the string comparisons the queries here do.
+  ///
+  /// Padded to the six fractional digits the sync writes, while Dart prints
+  /// three for a round instant. Since `'0' < 'Z'`, an unpadded bound compares
+  /// as later than a synced row on the very same instant, which is where the
+  /// daily aggregates of a health metric sit: on the day the window starts.
+  String _dateBound(DateTime value) {
+    final utc = value.toUtc().toIso8601String();
+    final dot = utc.indexOf('.');
+    final fraction = utc.substring(dot + 1, utc.length - 1);
+
+    return '${utc.substring(0, dot + 1)}${fraction.padRight(6, '0')}Z';
+  }
+
+  /// 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(_dateBound(since)),
+    ];
+    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,20 +537,65 @@ 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 {
     _logger.finer('Updating local measurement category ${category.id}');
     final stmt = _db.update(_db.measurementCategoryTable)..where((t) => t.id.equals(category.id!));
-    await stmt.write(category.toCompanion());
+    // metric_type stays untouched: it is identity and the server refuses a
+    // change, while a type this app version does not know reads as custom,
+    // so writing it back would queue exactly that refused change
+    await stmt.write(category.toCompanion().copyWith(metricType: const Value.absent()));
   }
 
   Future<void> addLocalDriftCategory(MeasurementCategory category) async {
     _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..0f182dd04 100644
--- a/lib/features/measurements/screens/measurement_entries_screen.dart
+++ b/lib/features/measurements/screens/measurement_entries_screen.dart
@@ -25,12 +25,15 @@ 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';
+import 'package:wger/features/measurements/widgets/forms/category.dart';
+import 'package:wger/features/measurements/widgets/forms/entry.dart';
+import 'package:wger/features/measurements/widgets/forms/group_entry.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 
-enum MeasurementOptions {
+enum _MeasurementOptions {
   edit,
   delete,
 }
@@ -46,106 +49,117 @@ 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),
+                        hasListView: true,
+                      ),
+                    );
+                    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 [
-                    PopupMenuItem<MeasurementOptions>(
-                      value: MeasurementOptions.edit,
+                  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),
+                  ),
+                ];
+              },
+            ),
+        ],
+      ),
+      // The entries of a calculated category are maintained by the server
+      floatingActionButton: category == null || category.isCalculated
+          ? 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..4f4037c4e
--- /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/formatting/formatting.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/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/calculation_mark.dart b/lib/features/measurements/widgets/calculation_mark.dart
new file mode 100644
index 000000000..cdbaa1979
--- /dev/null
+++ b/lib/features/measurements/widgets/calculation_mark.dart
@@ -0,0 +1,116 @@
+/*
+ * 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/measurements/models/measurement_calculation.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';
+
+/// Marks a category whose entries the server computes, and names what they are
+/// computed from.
+///
+/// The mark sits on the category rather than on every one of its entries: all
+/// of them are calculated, so a badge per row would repeat the same thing for
+/// each value. Renders nothing for a hand-kept category.
+class CalculationMark extends ConsumerWidget {
+  const CalculationMark(this.category, {this.dense = false, super.key});
+
+  final MeasurementCategory category;
+
+  /// Badge and provenance share one line instead of stacking. For the overview
+  /// tile, which is sized to the rows it already has.
+  final bool dense;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    if (!category.isCalculated) {
+      return const SizedBox.shrink();
+    }
+
+    final badge = _Badge(dense: dense);
+    // The ratio names the category it reads, so its sentence needs the name
+    final sourceId = category.dynamicParams?['category_id'];
+    final source = (ref.watch(measurementCategoriesProvider).value ?? const <MeasurementCategory>[])
+        .where((candidate) => candidate.id == sourceId)
+        .firstOrNull;
+    final description = calculationTypeOf(
+      category.dynamicType,
+    )?.localizedDescription(context, category: source?.displayName(context) ?? '');
+
+    // Not every calculation brings a sentence, and one from a newer server
+    // brings none either: the badge alone is what is still true of it
+    if (description == null) {
+      return badge;
+    }
+
+    final provenance = Text(
+      description,
+      style: Theme.of(context).textTheme.bodySmall,
+      maxLines: 1,
+      overflow: TextOverflow.ellipsis,
+    );
+
+    if (dense) {
+      return Row(
+        children: [
+          badge,
+          const SizedBox(width: 6),
+          Expanded(child: provenance),
+        ],
+      );
+    }
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        badge,
+        const SizedBox(height: 4),
+        provenance,
+      ],
+    );
+  }
+}
+
+/// The badge itself: outlined rather than filled, it qualifies the category
+/// instead of competing with its value.
+class _Badge extends StatelessWidget {
+  const _Badge({required this.dense});
+
+  final bool dense;
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    return Container(
+      padding: EdgeInsets.symmetric(horizontal: dense ? 4 : 6, vertical: dense ? 0 : 2),
+      decoration: BoxDecoration(
+        border: Border.all(color: theme.colorScheme.primary),
+        borderRadius: BorderRadius.circular(4),
+      ),
+      child: Text(
+        AppLocalizations.of(context).calculationBadge,
+        style: (dense ? theme.textTheme.labelSmall : theme.textTheme.labelMedium)?.copyWith(
+          color: theme.colorScheme.primary,
+          fontWeight: FontWeight.bold,
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/features/measurements/widgets/calculation_params.dart b/lib/features/measurements/widgets/calculation_params.dart
new file mode 100644
index 000000000..826407445
--- /dev/null
+++ b/lib/features/measurements/widgets/calculation_params.dart
@@ -0,0 +1,263 @@
+/*
+ * 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/services.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:wger/features/exercises/providers/exercises_notifier.dart';
+import 'package:wger/features/exercises/widgets/autocompleter.dart';
+import 'package:wger/features/measurements/models/measurement_calculation.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';
+
+/// The parameter fields of a calculation, between the type picker and the rest
+/// of the category form. Which fields appear follows from the type, see
+/// [CalculationType].
+///
+/// The fields validate against the same bounds the server does, so an invalid
+/// configuration is refused here rather than on the next push. That matters
+/// beyond saving a round trip: a category created offline reaches the server
+/// only later, and a refusal then arrives without the form that caused it.
+class CalculationParamsBlock extends ConsumerWidget {
+  const CalculationParamsBlock({
+    required this.type,
+    required this.params,
+    required this.onChanged,
+    this.categoryId,
+    super.key,
+  });
+
+  final CalculationType type;
+  final Map<String, dynamic> params;
+  final ValueChanged<Map<String, dynamic>> onChanged;
+
+  /// The category being edited, which cannot be its own source
+  final String? categoryId;
+
+  /// The ids a parameter holds, as a list, whether it takes one or several
+  static List<int> _idsOf(CalculationParam param, Map<String, dynamic> params) {
+    final value = params[param.key];
+    return switch (value) {
+      final List<dynamic> list => list.cast<int>(),
+      final int id => [id],
+      _ => const [],
+    };
+  }
+
+  void _set(String key, Object? value) => onChanged({...params, key: value});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.stretch,
+      children: [
+        for (final param in type.params)
+          switch (param) {
+            final CategoryParam p => _categoryPicker(context, ref, p),
+            final ExerciseParam p => _exercisePicker(context, ref, p),
+            final ExercisesParam p => _exercisePicker(context, ref, p),
+            final IntParam p => _number(context, p),
+          },
+      ],
+    );
+  }
+
+  /// A picker over the user's own categories. A calculated category cannot
+  /// feed another one, and nothing can feed itself; the server refuses both,
+  /// so neither is offered. One measured in a unit this calculation cannot
+  /// read is offered but disabled, see below.
+  Widget _categoryPicker(BuildContext context, WidgetRef ref, CategoryParam param) {
+    final i18n = AppLocalizations.of(context);
+    final candidates = [
+      for (final candidate
+          in ref.watch(measurementCategoriesProvider).value ?? const <MeasurementCategory>[])
+        if (candidate.id != categoryId && !candidate.isCalculated) candidate,
+    ];
+
+    // Still a field rather than a bare sentence: with nothing to pick there
+    // is nothing to save either, and without a validator here the form would
+    // let a configuration through that the server can only refuse. The helper
+    // gives way to the same sentence as an error once the user tries
+    if (candidates.isEmpty) {
+      return FormField<void>(
+        key: Key('calculation-param-${param.key}'),
+        validator: (_) => i18n.calculationNoSourceCategory,
+        builder: (field) => InputDecorator(
+          decoration: InputDecoration(
+            border: InputBorder.none,
+            helperText: i18n.calculationNoSourceCategory,
+            helperMaxLines: 3,
+            errorText: field.errorText,
+            errorMaxLines: 3,
+          ),
+          child: const SizedBox.shrink(),
+        ),
+      );
+    }
+
+    final selected = params[param.key];
+    return DropdownButtonFormField<String>(
+      key: Key('calculation-param-${param.key}'),
+      initialValue: candidates.any((c) => c.id == selected) ? selected as String : null,
+      decoration: InputDecoration(labelText: param.localizedLabel(context)),
+      items: [
+        // A category whose unit this calculation cannot read is shown rather
+        // than hidden: the unit next to it is what the user has to change, and
+        // a silently short list explains nothing
+        for (final candidate in candidates)
+          DropdownMenuItem(
+            value: candidate.id,
+            enabled: param.accepts(candidate.unit),
+            child: Text('${candidate.displayName(context)} (${candidate.unit})'),
+          ),
+      ],
+      validator: (value) => value == null ? i18n.calculationParamsIncomplete : null,
+      onChanged: (value) => _set(param.key, value),
+    );
+  }
+
+  /// The exercises a calculation reads, as removable chips over a search
+  /// field. One or several, depending on the parameter.
+  Widget _exercisePicker(BuildContext context, WidgetRef ref, CalculationParam param) {
+    final i18n = AppLocalizations.of(context);
+    final multi = param is ExercisesParam;
+    final selected = _idsOf(param, params);
+    final full = multi && selected.length >= param.maxItems;
+
+    // Names for the stored ids: the whole catalogue is local, so an existing
+    // configuration reads as exercises rather than as the numbers it is
+    final exercises = ref.watch(exercisesProvider).value;
+    final languageCode = Localizations.localeOf(context).languageCode;
+    String nameOf(int id) {
+      final exercise = exercises?.getByIdOrNull(id);
+      return exercise == null ? '#$id' : exercise.getTranslation(languageCode).name;
+    }
+
+    return FormField<List<int>>(
+      key: Key('calculation-param-${param.key}'),
+      initialValue: selected,
+      validator: (value) {
+        final count = value?.length ?? 0;
+        if (multi) {
+          return count < param.minItems || count > param.maxItems
+              ? i18n.calculationParamsIncomplete
+              : null;
+        }
+        return count == 0 ? i18n.calculationParamsIncomplete : null;
+      },
+      builder: (field) {
+        // The one place the selection changes: the field validates against
+        // its own value while the parameters are what gets stored, so the two
+        // are written together or they drift apart
+        void update(List<int> next) {
+          field.didChange(next);
+          _set(param.key, multi ? next : next.firstOrNull);
+        }
+
+        return InputDecorator(
+          decoration: InputDecoration(
+            helperText: multi
+                ? i18n.calculationHelpExercises(param.minItems, param.maxItems, selected.length)
+                : null,
+            errorText: field.errorText,
+            border: InputBorder.none,
+          ),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.stretch,
+            children: [
+              if (selected.isNotEmpty)
+                Wrap(
+                  spacing: 8,
+                  children: [
+                    for (final id in selected)
+                      InputChip(
+                        label: Text(nameOf(id)),
+                        onDeleted: () => update([
+                          for (final e in selected)
+                            if (e != id) e,
+                        ]),
+                      ),
+                  ],
+                ),
+              // The search field goes away once the parameter holds as many
+              // exercises as it may, so the only way on is removing one
+              if (!full)
+                ExerciseAutocompleter(
+                  onExerciseSelected: (exercise) {
+                    if (!multi) {
+                      update([exercise.id]);
+                    } else if (!selected.contains(exercise.id)) {
+                      update([...selected, exercise.id]);
+                    }
+                  },
+                ),
+            ],
+          ),
+        );
+      },
+    );
+  }
+
+  /// A bounded number, e.g. how many repetitions a set may have to still
+  /// count.
+  ///
+  /// Empty is a valid state: the parameter is dropped and the server applies
+  /// its own default, which is what the hint behind the empty field shows.
+  Widget _number(BuildContext context, IntParam param) {
+    final i18n = AppLocalizations.of(context);
+    final help = param.key == 'max_reps'
+        ? i18n.calculationHelpMaxReps(param.min, param.max)
+        : i18n.calculationHelpWindowDays(param.min, param.max);
+
+    return TextFormField(
+      key: Key('calculation-param-${param.key}'),
+      initialValue: params[param.key]?.toString() ?? '',
+      keyboardType: TextInputType.number,
+      inputFormatters: [FilteringTextInputFormatter.digitsOnly],
+      decoration: InputDecoration(
+        labelText: param.localizedLabel(context),
+        helperText: help,
+        hintText: '${param.fallback}',
+      ),
+      validator: (value) {
+        if (value == null || value.isEmpty) {
+          return null;
+        }
+        final parsed = int.tryParse(value);
+        return parsed == null || parsed < param.min || parsed > param.max ? help : null;
+      },
+      onChanged: (value) {
+        // An emptied field drops the key rather than storing a blank: absent
+        // is what tells the server to use its own default
+        if (value.isEmpty) {
+          onChanged({
+            for (final entry in params.entries)
+              if (entry.key != param.key) entry.key: entry.value,
+          });
+          return;
+        }
+        final parsed = int.tryParse(value);
+        if (parsed != null) {
+          _set(param.key, parsed);
+        }
+      },
+    );
+  }
+}
diff --git a/lib/features/measurements/widgets/categories.dart b/lib/features/measurements/widgets/categories.dart
index 585f6a631..fb6ddb77d 100644
--- a/lib/features/measurements/widgets/categories.dart
+++ b/lib/features/measurements/widgets/categories.dart
@@ -18,24 +18,107 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:wger/core/formatting/formatting.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/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..f7234e87f 100644
--- a/lib/features/measurements/widgets/categories_card.dart
+++ b/lib/features/measurements/widgets/categories_card.dart
@@ -17,58 +17,92 @@
  */
 
 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/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/charts/overall_change.dart';
 import 'package:wger/features/measurements/widgets/helpers.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 
-import 'charts.dart';
-import 'forms.dart';
+import 'forms/entry.dart';
+import 'forms/group_entry.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; empty hides the row, for
+  /// a card sitting under its own header.
+  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);
+    }
 
+    final cardTitle = title ?? currentCategory.displayName(context);
     return Card(
       elevation: elevation,
       child: SingleChildScrollView(
         scrollDirection: Axis.vertical,
         child: Column(
           children: [
-            Padding(
-              padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
-              child: Text(
-                currentCategory.name,
-                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,
+            if (cardTitle.isNotEmpty)
+              Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
+                child: Text(
+                  cardTitle,
+                  style: Theme.of(context).textTheme.titleLarge,
+                  textAlign: TextAlign.center,
+                  maxLines: 2,
+                  overflow: TextOverflow.ellipsis,
+                ),
               ),
+            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 +114,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 +132,7 @@ class CategoriesCard extends StatelessWidget {
                               FormScreen.routeName,
                               arguments: FormScreenArguments(
                                 AppLocalizations.of(context).newEntry,
-                                MeasurementEntryForm(currentCategory.id!),
+                                newEntryForm ?? MeasurementEntryForm(currentCategory.id!),
                               ),
                             );
                           },
@@ -113,4 +149,160 @@ 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; 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;
+
+    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 GroupComponentRows(
+            currentCategory,
+            showDots: !asRange,
+            trailing: (context, child) {
+              final value = latest[child.id];
+
+              return Text(
+                value != null
+                    ? measurementWithUnit(
+                        context,
+                        value.valueIn(child.unit, categoryUnit: child.unit),
+                        child.unit,
+                        decimals: child.metricType.displayDecimals,
+                      )
+                    : '—',
+                style: Theme.of(context).textTheme.bodyLarge,
+              );
+            },
+          );
+        },
+      ),
+    ];
+  }
+
+  /// 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: [
+                // The label runs long in several languages and the card is
+                // narrow on tablets, where the dashboard lays it out in columns
+                Expanded(
+                  child: TextButton(
+                    child: Text(
+                      AppLocalizations.of(context).goToDetailPage,
+                      overflow: TextOverflow.ellipsis,
+                    ),
+                    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
deleted file mode 100644
index f12762f01..000000000
--- a/lib/features/measurements/widgets/charts.dart
+++ /dev/null
@@ -1,290 +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: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';
-
-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),
-      ],
-    );
-  }
-}
diff --git a/lib/features/measurements/widgets/charts/bar_chart.dart b/lib/features/measurements/widgets/charts/bar_chart.dart
new file mode 100644
index 000000000..32ca24f26
--- /dev/null
+++ b/lib/features/measurements/widgets/charts/bar_chart.dart
@@ -0,0 +1,146 @@
+/*
+ * 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:fl_chart/fl_chart.dart';
+import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+import 'package:wger/core/formatting/formatting.dart';
+import 'package:wger/features/measurements/charts/colors.dart';
+import 'package:wger/features/measurements/charts/series.dart';
+import 'package:wger/features/measurements/widgets/charts/fl_axes.dart';
+
+/// 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 barTooltipData(context, _entries.length, (groupIndex, rod) {
+      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 = valueAxis(_unit, drawn.reduce(min), drawn.reduce(max));
+    final width = barWidth(_entries.length, availableWidth);
+
+    return BarChartData(
+      minY: yAxis?.min,
+      maxY: yAxis?.max,
+      barTouchData: tooltipData(context),
+      gridData: barGrid(context),
+      titlesData: barTitlesData(
+        context,
+        dates: [for (final entry in _entries) entry.date],
+        unit: _unit,
+        interval: 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: width,
+                  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(),
+    );
+  }
+}
diff --git a/lib/features/measurements/widgets/charts/chart_painting.dart b/lib/features/measurements/widgets/charts/chart_painting.dart
new file mode 100644
index 000000000..754fb7ecd
--- /dev/null
+++ b/lib/features/measurements/widgets/charts/chart_painting.dart
@@ -0,0 +1,62 @@
+/*
+ * 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 hand-painted charts (heatmap, spark, distribution) share, so the
+/// full chart and its spark stay the same picture at two sizes.
+library;
+
+import 'dart:math';
+import 'dart:ui' as ui;
+
+import 'package:flutter/material.dart';
+
+/// Colour of a heatmap 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 heatmapCellColor(
+  num? value, {
+  required num maxValue,
+  required Color filled,
+  required Color empty,
+}) {
+  if (value == null) {
+    return empty;
+  }
+  final share = maxValue <= 0 ? 1.0 : (value / maxValue).clamp(0.0, 1.0);
+  return Color.lerp(filled.withValues(alpha: 0.3), filled, share)!;
+}
+
+/// The gap between heatmap cells, following 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.
+double heatmapCellGap(double step) => (step * 0.18).clamp(1.0, 3.0);
+
+/// Rounded, but never so much that a small cell becomes a dot.
+Radius heatmapCellRadius(double cell) => Radius.circular(min(2, cell / 4));
+
+/// Lays [text] out as a single unwrapped line; the call sites position it.
+TextPainter singleLineLabel(String text, TextStyle style, {required double maxWidth}) =>
+    TextPainter(
+      text: TextSpan(text: text, style: style),
+      textDirection: ui.TextDirection.ltr,
+      maxLines: 1,
+      ellipsis: '',
+    )..layout(maxWidth: maxWidth);
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..66234aee4
--- /dev/null
+++ b/lib/features/measurements/widgets/charts/distribution_chart.dart
@@ -0,0 +1,349 @@
+/*
+ * 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/core/formatting/formatting.dart';
+import 'package:wger/features/measurements/charts/data.dart';
+import 'package:wger/features/measurements/widgets/charts/chart_painting.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));
+    }
+  }
+
+  TextPainter _layoutLabel(String text, {required double maxWidth}) =>
+      singleLineLabel(text, labelStyle, maxWidth: maxWidth);
+
+  @override
+  bool shouldRepaint(_DistributionPainter oldDelegate) =>
+      oldDelegate.selected != selected || oldDelegate.histogram != histogram;
+}
diff --git a/lib/features/measurements/widgets/charts/fl_axes.dart b/lib/features/measurements/widgets/charts/fl_axes.dart
new file mode 100644
index 000000000..225383871
--- /dev/null
+++ b/lib/features/measurements/widgets/charts/fl_axes.dart
@@ -0,0 +1,154 @@
+/*
+ * 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/>.
+ */
+
+/// The fl_chart scaffolding the measurement charts share: axes, grid, border
+/// and the tooltip shell, so every chart of the set draws them the same way.
+library;
+
+import 'dart:math';
+
+import 'package:fl_chart/fl_chart.dart';
+import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+import 'package:wger/core/formatting/formatting.dart';
+
+/// Number of dates to label on the x axis
+const _xLabelCount = 4;
+
+/// Widest a single bar gets, for charts with only a handful of entries
+const _maxBarWidth = 12.0;
+
+const hiddenTitles = AxisTitles(sideTitles: SideTitles(showTitles: false));
+
+/// 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 / _xLabelCount).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));
+      },
+    ),
+  );
+}
+
+/// The axes of the bar charts: value left, one date per group below, the
+/// mirroring sides hidden.
+FlTitlesData barTitlesData(
+  BuildContext context, {
+  required List<DateTime> dates,
+  required String unit,
+  required double? interval,
+}) => FlTitlesData(
+  show: true,
+  rightTitles: hiddenTitles,
+  topTitles: hiddenTitles,
+  bottomTitles: _dateIndexTitles(context, dates),
+  leftTitles: valueTitles(context, unit, interval),
+);
+
+/// 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 ? _maxBarWidth : (availableWidth / count * 0.7).clamp(1.0, _maxBarWidth);
+
+/// 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),
+);
+
+/// The tooltip shell of the bar charts: kept inside the chart (a tooltip near
+/// an edge would otherwise be cut off by it) and guarded against fl_chart
+/// handing over an index outside the entries. What a tooltip says comes from
+/// [itemFor].
+BarTouchData barTooltipData(
+  BuildContext context,
+  int entryCount,
+  BarTooltipItem? Function(int groupIndex, BarChartRodData rod) itemFor,
+) => BarTouchData(
+  touchTooltipData: BarTouchTooltipData(
+    fitInsideHorizontally: true,
+    fitInsideVertically: true,
+    getTooltipColor: (group) => Theme.of(context).colorScheme.primaryContainer,
+    getTooltipItem: (group, groupIndex, rod, rodIndex) =>
+        groupIndex < 0 || groupIndex >= entryCount ? null : itemFor(groupIndex, rod),
+  ),
+);
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..44d711601
--- /dev/null
+++ b/lib/features/measurements/widgets/charts/heatmap_chart.dart
@@ -0,0 +1,305 @@
+/*
+ * 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: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/features/measurements/widgets/charts/chart_painting.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),
+    );
+    final gap = heatmapCellGap(step);
+
+    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,
+  });
+
+  Color _cellColor(num? value) =>
+      heatmapCellColor(value, maxValue: grid.maxValue, filled: filled, empty: empty);
+
+  @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),
+          heatmapCellRadius(layout.cell),
+        );
+        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 = singleLineLabel(text, labelStyle, 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/line_chart.dart b/lib/features/measurements/widgets/charts/line_chart.dart
new file mode 100644
index 000000000..40c88f31c
--- /dev/null
+++ b/lib/features/measurements/widgets/charts/line_chart.dart
@@ -0,0 +1,384 @@
+/*
+ * 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/features/measurements/widgets/charts/fl_axes.dart';
+
+/// 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 hasSpread = carriesSpread && series.entries.any((e) => e.hasRange);
+      return _ResolvedSeries(
+        line,
+        series.label,
+        // A point without a spread (a day with a single measurement) pinches
+        // the band to the line instead of switching it off for the series
+        bounds: hasSpread
+            ? (
+                LineChartBarData(
+                  spots: _spots(series.entries, (e) => e.min ?? e.value),
+                  color: Colors.transparent,
+                  barWidth: 0,
+                  dotData: const FlDotData(show: false),
+                ),
+                LineChartBarData(
+                  spots: _spots(series.entries, (e) => e.max ?? e.value),
+                  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 : valueAxis(_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,
+    );
+  }
+}
diff --git a/lib/features/measurements/widgets/charts/overall_change.dart b/lib/features/measurements/widgets/charts/overall_change.dart
new file mode 100644
index 000000000..300a32940
--- /dev/null
+++ b/lib/features/measurements/widgets/charts/overall_change.dart
@@ -0,0 +1,47 @@
+/*
+ * 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/core/formatting/formatting.dart';
+import 'package:wger/features/measurements/charts/series.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+/// The one-number change between the first and last point of a series.
+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)}',
+    );
+  }
+}
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..c55339b25
--- /dev/null
+++ b/lib/features/measurements/widgets/charts/spark_charts.dart
@@ -0,0 +1,308 @@
+/*
+ * 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';
+import 'package:wger/features/measurements/widgets/charts/chart_painting.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 - heatmapCellGap(step);
+    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 = heatmapCellColor(
+          grid.valueAt(week, weekday),
+          maxValue: grid.maxValue,
+          filled: filled,
+          empty: empty,
+        );
+        canvas.drawRRect(
+          RRect.fromRectAndRadius(
+            Offset(left + week * step, top + weekday * step) & Size(cell, cell),
+            heatmapCellRadius(cell),
+          ),
+          paint,
+        );
+      }
+    }
+  }
+
+  @override
+  bool shouldRepaint(_SparkHeatmapPainter oldDelegate) =>
+      oldDelegate.grid != grid || oldDelegate.filled != filled;
+}
diff --git a/lib/features/measurements/widgets/charts/stacked_bar_chart.dart b/lib/features/measurements/widgets/charts/stacked_bar_chart.dart
new file mode 100644
index 000000000..0c98d3b7b
--- /dev/null
+++ b/lib/features/measurements/widgets/charts/stacked_bar_chart.dart
@@ -0,0 +1,124 @@
+/*
+ * 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:fl_chart/fl_chart.dart';
+import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+import 'package:wger/core/formatting/formatting.dart';
+import 'package:wger/features/measurements/charts/colors.dart';
+import 'package:wger/features/measurements/charts/series.dart';
+import 'package:wger/features/measurements/widgets/charts/fl_axes.dart';
+
+/// 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 barTooltipData(context, _entries.length, (groupIndex, rod) {
+      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 = valueAxis(_unit, 0, _entries.map((e) => e.total).fold<num>(0, max));
+    final width = barWidth(_entries.length, availableWidth);
+
+    return BarChartData(
+      minY: yAxis?.min,
+      maxY: yAxis?.max,
+      barTouchData: tooltipData(context),
+      gridData: barGrid(context),
+      titlesData: barTitlesData(
+        context,
+        dates: [for (final entry in _entries) entry.date],
+        unit: _unit,
+        interval: 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: width,
+              rodStackItems: stack,
+              borderRadius: const BorderRadius.vertical(top: Radius.circular(2)),
+            ),
+          ],
+        );
+      }).toList(),
+    );
+  }
+}
diff --git a/lib/features/measurements/widgets/entries.dart b/lib/features/measurements/widgets/entries.dart
index 9d4906fcd..bdc71cb96 100644
--- a/lib/features/measurements/widgets/entries.dart
+++ b/lib/features/measurements/widgets/entries.dart
@@ -16,61 +16,270 @@
  * 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/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/widgets/calculation_mark.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';
+import 'forms/entry.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,
+        if (category.isCalculated)
+          Padding(
+            padding: const EdgeInsets.fromLTRB(15, 8, 15, 0),
+            child: Align(
+              alignment: AlignmentDirectional.centerStart,
+              child: CalculationMark(category),
+            ),
+          ),
+        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())],
         ),
-        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(
+        _EntryList(
+          category: category,
+          unit: unit,
+          unitLabel: unitLabel,
+          editFormBuilder: editFormBuilder,
+        ),
+      ],
+    );
+  }
+
+  /// 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);
+
+    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())],
+        ),
+        GroupComponentRows(
+          category,
+          trailing: (_, _) => const Icon(Icons.chevron_right),
+        ),
+        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];
+        final isCalculated = currentEntry.source == measurementSourceCalculated;
+
+        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)),
+            // Entries the user did not write are read-only, for two
+            // different reasons: an import belongs to the app it came from,
+            // a calculated value to the data it is computed from
+            trailing: currentEntry.source != measurementSourceUser
+                ? Tooltip(
+                    message: isCalculated
+                        ? AppLocalizations.of(context).calculationEntryInfo
+                        : AppLocalizations.of(context).importedEntry,
+                    child: Icon(
+                      isCalculated ? Icons.calculate_outlined : Icons.monitor_heart_outlined,
+                    ),
+                  )
+                : PopupMenuButton(
                     itemBuilder: (BuildContext context) {
                       return [
                         PopupMenuItem(
@@ -80,20 +289,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 +313,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
deleted file mode 100644
index d0543300c..000000000
--- a/lib/features/measurements/widgets/forms.dart
+++ /dev/null
@@ -1,274 +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/widgets/datetime_input.dart';
-import 'package:wger/core/widgets/decimal_input.dart';
-import 'package:wger/core/widgets/error.dart';
-import 'package:wger/core/widgets/form_submit_button.dart';
-import 'package:wger/core/widgets/progress_indicator.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/l10n/generated/app_localizations.dart';
-
-class MeasurementCategoryForm extends ConsumerStatefulWidget {
-  final MeasurementCategory? _category;
-
-  const MeasurementCategoryForm([this._category]);
-
-  @override
-  ConsumerState<MeasurementCategoryForm> createState() => _MeasurementCategoryFormState();
-}
-
-class _MeasurementCategoryFormState extends ConsumerState<MeasurementCategoryForm> {
-  final _form = GlobalKey<FormState>();
-
-  late MeasurementCategory _draft;
-
-  @override
-  void initState() {
-    super.initState();
-    _draft = widget._category ?? MeasurementCategory();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Form(
-      key: _form,
-      child: Column(
-        children: [
-          // Name
-          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;
-            },
-          ),
-
-          // Unit
-          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;
-            },
-          ),
-          FormSubmitButton(
-            label: AppLocalizations.of(context).save,
-            onPressed: () async {
-              if (!_form.currentState!.validate()) {
-                return;
-              }
-              _form.currentState!.save();
-
-              final notifier = ref.read(measurementProvider.notifier);
-              if (_draft.id == null) {
-                await notifier.addCategory(_draft);
-              } else {
-                notifier.updateCategory(_draft);
-              }
-
-              if (context.mounted) {
-                Navigator.of(context).pop();
-              }
-            },
-          ),
-        ],
-      ),
-    );
-  }
-}
-
-class MeasurementEntryForm extends ConsumerStatefulWidget {
-  final String _categoryId;
-  final MeasurementEntry? _entry;
-
-  const MeasurementEntryForm(this._categoryId, [MeasurementEntry? entry]) : _entry = entry;
-
-  @override
-  ConsumerState<MeasurementEntryForm> createState() => _MeasurementEntryFormState();
-}
-
-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();
-  num? _value;
-  String _notes = '';
-
-  @override
-  void initState() {
-    super.initState();
-    _value = widget._entry?.value;
-    _notes = widget._entry?.notes ?? '';
-    _notesController.text = _notes;
-  }
-
-  @override
-  void dispose() {
-    _notesController.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final notifier = ref.read(measurementProvider.notifier);
-    final Future<MeasurementCategory?> categoryFuture = notifier.getCategoryById(
-      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 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,
-                  );
-                },
-              ),
-
-              // Value
-              DecimalInputWidget(
-                value: _value,
-                labelText: AppLocalizations.of(context).value,
-                suffixText: category.unit,
-                isRequired: true,
-                min: MeasurementEntry.minValue,
-                max: MeasurementEntry.maxValue,
-                onChanged: (value) => _value = value,
-              ),
-              // Notes
-              TextFormField(
-                decoration: InputDecoration(labelText: AppLocalizations.of(context).notes),
-                controller: _notesController,
-                onSaved: (newValue) {
-                  _notes = newValue ?? '';
-                },
-                validator: (value) {
-                  const minLength = 0;
-                  const maxLength = 100;
-                  if (value!.isNotEmpty && (value.length < minLength || value.length > maxLength)) {
-                    return AppLocalizations.of(context).enterCharacters(
-                      minLength.toString(),
-                      maxLength.toString(),
-                    );
-                  }
-                  return null;
-                },
-              ),
-
-              FormSubmitButton(
-                label: AppLocalizations.of(context).save,
-                onPressed: () async {
-                  final isValid = _form.currentState!.validate();
-                  if (!isValid) {
-                    return;
-                  }
-                  _form.currentState!.save();
-
-                  final entry = MeasurementEntry(
-                    id: _existingId,
-                    categoryId: category.id!,
-                    date: _date,
-                    value: _value!,
-                    notes: _notes,
-                  );
-                  if (entry.id == null) {
-                    await notifier.addEntry(entry);
-                  } else {
-                    await notifier.updateEntry(entry);
-                  }
-
-                  if (context.mounted) {
-                    Navigator.of(context).pop();
-                  }
-                },
-              ),
-            ],
-          ),
-        );
-      },
-    );
-  }
-}
diff --git a/lib/features/measurements/widgets/forms/category.dart b/lib/features/measurements/widgets/forms/category.dart
new file mode 100644
index 000000000..c00ff5a67
--- /dev/null
+++ b/lib/features/measurements/widgets/forms/category.dart
@@ -0,0 +1,642 @@
+/*
+ * 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_riverpod/flutter_riverpod.dart';
+import 'package:wger/core/widgets/form_submit_button.dart';
+import 'package:wger/features/account/providers/user_profile_notifier.dart';
+import 'package:wger/features/exercises/models/exercise.dart';
+import 'package:wger/features/exercises/providers/exercises_notifier.dart';
+import 'package:wger/features/measurements/models/measurement_calculation.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/calculation_params.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+class MeasurementCategoryForm extends ConsumerStatefulWidget {
+  final MeasurementCategory? _category;
+
+  const MeasurementCategoryForm([this._category]);
+
+  @override
+  ConsumerState<MeasurementCategoryForm> createState() => _MeasurementCategoryFormState();
+}
+
+class _MeasurementCategoryFormState extends ConsumerState<MeasurementCategoryForm> {
+  final _form = GlobalKey<FormState>();
+
+  late MeasurementCategory _draft;
+
+  /// What the name and the unit field were last seeded with, and the key they
+  /// are rebuilt under. Picking a calculation prefills both, which a
+  /// controllerless field only takes as a new [Key].
+  late String _nameSeed;
+  late String _unitSeed;
+
+  /// Whether the user wrote the name or the unit themselves. A prefill is a
+  /// suggestion, so it stops as soon as there is something to overwrite; an
+  /// existing category counts as written throughout.
+  late bool _nameEdited;
+  late bool _unitEdited;
+
+  @override
+  void initState() {
+    super.initState();
+    _draft = widget._category ?? MeasurementCategory();
+    _nameSeed = _draft.name;
+    _unitSeed = _draft.unit;
+    _nameEdited = widget._category != null;
+    _unitEdited = widget._category != null;
+  }
+
+  /// Switches the form to [type]: its parameters start at their defaults, and
+  /// name and unit are prefilled as long as the user has not written their own.
+  ///
+  /// [exercises] is the local catalogue, for the calculations that start with
+  /// a selection.
+  void _pickCalculation(CalculationType type, List<Exercise> exercises) {
+    setState(() {
+      _draft = _draft.copyWith(dynamicType: type.slug, dynamicParams: defaultParams(type));
+      if (!_nameEdited) {
+        _nameSeed = type.localizedName(context);
+        _draft = _draft.copyWith(name: _nameSeed);
+      }
+      if (!_unitEdited) {
+        _unitSeed = type.unit;
+        _draft = _draft.copyWith(unit: _unitSeed);
+      }
+      // Bench press, squat and deadlift, the total most people mean. The
+      // catalogue is local, so an instance that never synced them just starts
+      // with nothing
+      final multi = type.params.whereType<ExercisesParam>().firstOrNull;
+      if (multi != null) {
+        final bigThree = [
+          for (final uuid in bigThreeUuids)
+            ...exercises.where((e) => e.uuid == uuid).map((e) => e.id),
+        ];
+        if (bigThree.length == bigThreeUuids.length) {
+          _draft = _draft.copyWith(
+            dynamicParams: {...?_draft.dynamicParams, multi.key: bigThree},
+          );
+        }
+      }
+    });
+  }
+
+  /// Persists the draft, as a new category or as an update of the stored one.
+  Future<void> _submit() async {
+    if (!_form.currentState!.validate()) {
+      return;
+    }
+    _form.currentState!.save();
+
+    final notifier = ref.read(measurementProvider.notifier);
+    if (_draft.id == null) {
+      await notifier.addCategory(_draft);
+    } else {
+      await notifier.updateCategory(_draft);
+    }
+
+    if (mounted) {
+      Navigator.of(context).pop();
+    }
+  }
+
+  @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 {};
+
+    // 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;
+
+    // Watched rather than read where the prefill happens: a read subscribes
+    // the stream and returns before it has emitted, i.e. an empty catalogue
+    final exercises = ref.watch(exercisesProvider).value?.exercises ?? const <Exercise>[];
+
+    return Form(
+      key: _form,
+      // Scrolls itself: the form grows by a whole block when a calculation is
+      // picked, and the screen hands it the space rather than a viewport
+      child: SingleChildScrollView(
+        child: Column(
+          children: [
+            // Name and unit belong to the user only for a free-form category. A
+            // typed one takes both from its metric type
+            if (isCustom)
+              _IdentityFields(
+                nameSeed: _nameSeed,
+                unitSeed: _unitSeed,
+                unitOptional: _draft.isCalculated,
+                onNameEdited: () => _nameEdited = true,
+                onUnitEdited: () => _unitEdited = true,
+                onNameSaved: (value) => _draft = _draft.copyWith(name: value),
+                onUnitSaved: (value) => _draft = _draft.copyWith(unit: value),
+              ),
+
+            _CalculationSection(
+              draft: _draft,
+              stored: widget._category,
+              categories: categories,
+              // A typed category is written by the health import or by the
+              // server itself, and a group carries no entries at all
+              canCalculate: isCustom,
+              onPick: (type) => _pickCalculation(type, exercises),
+              onManual: () => setState(() {
+                _draft = _draft.copyWith(dynamicType: noDynamicType, dynamicParams: null);
+              }),
+              onParamsChanged: (params) => setState(() {
+                _draft = _draft.copyWith(dynamicParams: params);
+              }),
+            ),
+
+            // 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
+            _ChartSettingsSection(
+              draft: _draft,
+              hasChildren: hasChildren,
+              onChartTypeChanged: (value) => setState(() {
+                _draft = _draft.copyWith(chartType: value);
+              }),
+              onSettingChanged: (key, value) => setState(() {
+                _draft = _draft.withChartSetting(key, value);
+              }),
+            ),
+
+            _ParentGroupSection(
+              draft: _draft,
+              categories: categories,
+              hasChildren: hasChildren,
+              withEntries: withEntries,
+              onChanged: (value) => setState(() {
+                _draft = _draft.copyWith(parentId: value);
+              }),
+            ),
+            FormSubmitButton(
+              label: AppLocalizations.of(context).save,
+              onPressed: _submit,
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+/// Name and unit, the two fields only a free-form category has.
+///
+/// The keys are the seeds rather than the text: a controllerless field takes a
+/// new seed only as a new [Key], and one that followed what is typed would
+/// rebuild the field on every keystroke.
+class _IdentityFields extends StatelessWidget {
+  const _IdentityFields({
+    required this.nameSeed,
+    required this.unitSeed,
+    required this.unitOptional,
+    required this.onNameEdited,
+    required this.onUnitEdited,
+    required this.onNameSaved,
+    required this.onUnitSaved,
+  });
+
+  final String nameSeed;
+  final String unitSeed;
+
+  /// Whether an empty unit passes: a calculation defines what the number is,
+  /// so it may well be a bare ratio without one.
+  final bool unitOptional;
+
+  final VoidCallback onNameEdited;
+  final VoidCallback onUnitEdited;
+  final ValueChanged<String> onNameSaved;
+  final ValueChanged<String> onUnitSaved;
+
+  @override
+  Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
+
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        TextFormField(
+          key: ValueKey('name-$nameSeed'),
+          initialValue: nameSeed,
+          decoration: InputDecoration(
+            labelText: i18n.name,
+            helperText: i18n.measurementCategoriesHelpText,
+          ),
+          maxLength: MeasurementCategory.maxNameChars,
+          onChanged: (_) => onNameEdited(),
+          onSaved: (value) => onNameSaved(value ?? ''),
+          validator: (value) => _lengthError(i18n, value, MeasurementCategory.maxNameChars, false),
+        ),
+        TextFormField(
+          key: ValueKey('unit-$unitSeed'),
+          initialValue: unitSeed,
+          decoration: InputDecoration(
+            labelText: i18n.unit,
+            helperText: i18n.measurementEntriesHelpText,
+          ),
+          maxLength: MeasurementCategory.maxUnitChars,
+          onChanged: (_) => onUnitEdited(),
+          onSaved: (value) => onUnitSaved(value ?? ''),
+          validator: (value) =>
+              _lengthError(i18n, value, MeasurementCategory.maxUnitChars, unitOptional),
+        ),
+      ],
+    );
+  }
+
+  static String? _lengthError(AppLocalizations i18n, String? value, int max, bool optional) {
+    if (value!.isEmpty) {
+      return optional ? null : i18n.enterValue;
+    }
+
+    return value.length > max ? i18n.enterMaxCharacters(max.toString()) : null;
+  }
+}
+
+/// The group this category is part of, for the multi-value measurements (e.g.
+/// blood pressure). Renders nothing where nothing can be picked.
+///
+/// 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).
+class _ParentGroupSection extends StatelessWidget {
+  const _ParentGroupSection({
+    required this.draft,
+    required this.categories,
+    required this.hasChildren,
+    required this.withEntries,
+    required this.onChanged,
+  });
+
+  final MeasurementCategory draft;
+  final List<MeasurementCategory> categories;
+  final bool hasChildren;
+
+  /// Keyed by the categories that hold entries, which cannot become groups
+  final Map<String, MeasurementEntry> withEntries;
+
+  final ValueChanged<String?> onChanged;
+
+  @override
+  Widget build(BuildContext context) {
+    if (hasChildren || draft.metricType != MetricType.custom) {
+      return const SizedBox.shrink();
+    }
+
+    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 DropdownButtonFormField<String?>(
+      // A parent that dropped out of the candidates is no longer selectable
+      initialValue: candidates.any((c) => c.id == draft.parentId) ? draft.parentId : null,
+      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: onChanged,
+    );
+  }
+}
+
+/// How a category is drawn: the chart it is shown as, and the two settings of
+/// the line. Renders nothing where the metric type leaves no choice.
+class _ChartSettingsSection extends StatelessWidget {
+  const _ChartSettingsSection({
+    required this.draft,
+    required this.hasChildren,
+    required this.onChartTypeChanged,
+    required this.onSettingChanged,
+  });
+
+  /// The category as the form currently holds it
+  final MeasurementCategory draft;
+
+  /// Whether the category is a group. One is drawn by what its components are
+  /// to each other rather than by a preference, whatever its metric type says.
+  final bool hasChildren;
+
+  final ValueChanged<ChartType> onChartTypeChanged;
+
+  /// Writes one key of `chart_config`, see [MeasurementCategory.withChartSetting]
+  final void Function(String key, Object value) onSettingChanged;
+
+  @override
+  Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
+
+    // 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];
+
+    // 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 Column(
+      mainAxisSize: MainAxisSize.min,
+      crossAxisAlignment: CrossAxisAlignment.stretch,
+      children: [
+        // Only the shapes that are a matter of taste are offered, and only
+        // those the metric type can actually be drawn as
+        if (chartTypes.isNotEmpty)
+          DropdownButtonFormField<ChartType>(
+            // 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: i18n.chartType),
+            items: [
+              for (final type in chartTypes)
+                DropdownMenuItem(value: type, child: Text(type.localized(context))),
+            ],
+            onChanged: (value) {
+              if (value != null) {
+                onChartTypeChanged(value);
+              }
+            },
+          ),
+
+        // Disabled while the category is drawn as something that has neither
+        if (canDrawLine) ...[
+          DropdownButtonFormField<TrendCharacter>(
+            initialValue: settings.trend,
+            decoration: InputDecoration(labelText: i18n.chartTrend),
+            items: [
+              for (final trend in TrendCharacter.values)
+                DropdownMenuItem(value: trend, child: Text(trend.localized(context))),
+            ],
+            onChanged: drawsLine
+                ? (value) {
+                    if (value != null) {
+                      onSettingChanged('trend', value.wireValue);
+                    }
+                  }
+                : null,
+          ),
+          // The window is a number, "off" is the string the server stores, so
+          // the two share one field only as objects
+          DropdownButtonFormField<Object>(
+            initialValue: settings.averageWindow ?? chartLineOff,
+            decoration: InputDecoration(labelText: i18n.chartAverageWindow),
+            items: [
+              DropdownMenuItem(value: chartLineOff, child: Text(i18n.off)),
+              for (final days in ChartSettings.averageWindows)
+                DropdownMenuItem(value: days, child: Text(i18n.chartAverageWindowDays(days))),
+            ],
+            onChanged: drawsLine
+                ? (value) {
+                    if (value != null) {
+                      onSettingChanged('average_window', value);
+                    }
+                  }
+                : null,
+          ),
+        ],
+      ],
+    );
+  }
+}
+
+/// Who fills a category in: the user by hand, or the server by computing it.
+///
+/// Only free-form categories can be calculated: a typed one is written by the
+/// health import or by the server itself, and the server refuses the
+/// combination. Renders nothing where none of that applies.
+class _CalculationSection extends ConsumerWidget {
+  const _CalculationSection({
+    required this.draft,
+    required this.stored,
+    required this.categories,
+    required this.canCalculate,
+    required this.onPick,
+    required this.onManual,
+    required this.onParamsChanged,
+  });
+
+  /// The category as the form currently holds it
+  final MeasurementCategory draft;
+
+  /// The category as the form was opened with, null while one is created.
+  /// What a category computes is fixed once it exists, so this is what
+  /// decides whether the calculation is still up for change.
+  final MeasurementCategory? stored;
+
+  /// Every category of the user, for the duplicate checks and for the name
+  /// the ratio reads
+  final List<MeasurementCategory> categories;
+
+  /// Whether this category could be calculated at all
+  final bool canCalculate;
+
+  /// Switches to a calculation, which also prefills the name and the unit
+  final ValueChanged<CalculationType> onPick;
+
+  /// Hands the category back to the user
+  final VoidCallback onManual;
+
+  final ValueChanged<Map<String, dynamic>> onParamsChanged;
+
+  /// Whether the user already has this calculation, decided while the type is
+  /// picked. Only a calculation without parameters can be judged that early:
+  /// what the others compute depends on settings picked afterwards, so those
+  /// are judged on save, see [_isDuplicate].
+  bool _isTaken(CalculationType type) =>
+      type.params.isEmpty && categories.any((c) => c.dynamicType == type.slug && c.id != draft.id);
+
+  /// Whether the draft would compute exactly what another category already
+  /// computes. Mirrors _duplicate_calculation on the server, including its
+  /// limitation: a number left out and the same number typed in read as two
+  /// configurations, which lets a duplicate through rather than refusing two
+  /// categories that differ.
+  bool _isDuplicate() =>
+      draft.isCalculated &&
+      categories.any(
+        (c) =>
+            c.id != draft.id &&
+            c.dynamicType == draft.dynamicType &&
+            const DeepCollectionEquality().equals(
+              c.dynamicParams ?? const {},
+              draft.dynamicParams ?? const {},
+            ),
+      );
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final i18n = AppLocalizations.of(context);
+    // A calculation from a newer server: shown, but not rewritten from here.
+    // The parameters this release cannot render stay exactly as they are
+    final isUnknown = !isKnownCalculation(draft.dynamicType);
+    final calculation = calculationTypeOf(draft.dynamicType);
+    // Stopping a calculation means deleting the category, and the server
+    // refuses a change either way
+    final isLocked = stored?.isCalculated ?? false;
+    // BMI and the ratio divide by the height in the profile and compute
+    // nothing while it is missing. Null also covers a profile that has not
+    // synced yet, where the hint is a guess rather than a fact, so it waits
+    final profile = ref.watch(userProfileProvider).value;
+    final heightMissing = profile != null && profile.height == null;
+    // The ratio names the category it reads, so its description needs the name
+    final sourceName =
+        categories
+            .where((c) => c.id == draft.dynamicParams?['category_id'])
+            .firstOrNull
+            ?.displayName(context) ??
+        '';
+
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      crossAxisAlignment: CrossAxisAlignment.stretch,
+      children: [
+        if (isUnknown) _InfoBox(i18n.calculationUnknown),
+        // Only while the category is being created: the server fixes what a
+        // category computes on the first save, so a switch offered later
+        // could only ever go one way and would read as one that goes both
+        if (stored == null && canCalculate) ...[
+          const SizedBox(height: 8),
+          SegmentedButton<bool>(
+            segments: [
+              ButtonSegment(value: false, label: Text(i18n.calculationValuesManual)),
+              ButtonSegment(value: true, label: Text(i18n.calculationBadge)),
+            ],
+            selected: {draft.isCalculated},
+            onSelectionChanged: (selection) => selection.single
+                // A type the user already has would be refused on save, so the
+                // switch lands on the first one still free
+                ? onPick(
+                    calculationTypes.firstWhereOrNull((t) => !_isTaken(t)) ??
+                        calculationTypes.first,
+                  )
+                : onManual(),
+          ),
+        ],
+        if (calculation != null) ...[
+          DropdownButtonFormField<String>(
+            key: const Key('calculation-type'),
+            initialValue: calculation.slug,
+            decoration: InputDecoration(
+              labelText: i18n.calculationType,
+              helperText: isLocked ? i18n.calculationLocked : null,
+            ),
+            items: [
+              for (final type in calculationTypes)
+                if (_isTaken(type))
+                  DropdownMenuItem(
+                    value: type.slug,
+                    enabled: false,
+                    child: Text('${type.localizedName(context)} (${i18n.metricAlreadyTracked})'),
+                  )
+                else
+                  DropdownMenuItem(value: type.slug, child: Text(type.localizedName(context))),
+            ],
+            validator: (_) => _isDuplicate()
+                ? i18n.calculationDuplicate(calculation.localizedName(context))
+                : null,
+            onChanged: isLocked
+                ? null
+                : (slug) {
+                    final picked = slug == null ? null : calculationTypeOf(slug);
+                    if (picked != null) {
+                      onPick(picked);
+                    }
+                  },
+          ),
+          const SizedBox(height: 8),
+          if (calculation.localizedDescription(context, category: sourceName)
+              case final String description)
+            Text(description, style: Theme.of(context).textTheme.bodyMedium),
+          if (calculation.needsHeight && heightMissing)
+            _InfoBox(i18n.calculationMissingHeight, isWarning: true),
+          CalculationParamsBlock(
+            // Keyed by the calculation: the fields of two types share a
+            // parameter key, and a field that survives the switch would go on
+            // showing what the user typed for the type before it
+            key: ValueKey(calculation.slug),
+            type: calculation,
+            params: draft.dynamicParams ?? const {},
+            categoryId: draft.id,
+            onChanged: onParamsChanged,
+          ),
+        ],
+      ],
+    );
+  }
+}
+
+/// A boxed note next to the calculation fields: what is blocked, what cannot
+/// be changed here, what will not be computed yet.
+class _InfoBox extends StatelessWidget {
+  const _InfoBox(this.body, {this.isWarning = false});
+
+  final String body;
+
+  /// Something the user has to act on, rather than something to know
+  final bool isWarning;
+
+  @override
+  Widget build(BuildContext context) {
+    final scheme = Theme.of(context).colorScheme;
+    final color = isWarning ? scheme.onErrorContainer : scheme.onSurfaceVariant;
+
+    return Container(
+      width: double.infinity,
+      margin: const EdgeInsets.symmetric(vertical: 8),
+      padding: const EdgeInsets.all(12),
+      decoration: BoxDecoration(
+        color: isWarning ? scheme.errorContainer : scheme.surfaceContainerHighest,
+        borderRadius: BorderRadius.circular(12),
+      ),
+      child: Text(body, style: Theme.of(context).textTheme.bodySmall?.copyWith(color: color)),
+    );
+  }
+}
diff --git a/lib/features/measurements/widgets/forms/entry.dart b/lib/features/measurements/widgets/forms/entry.dart
new file mode 100644
index 000000000..b54c2f5ca
--- /dev/null
+++ b/lib/features/measurements/widgets/forms/entry.dart
@@ -0,0 +1,148 @@
+/*
+ * 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/widgets/datetime_input.dart';
+import 'package:wger/core/widgets/decimal_input.dart';
+import 'package:wger/core/widgets/error.dart';
+import 'package:wger/core/widgets/form_submit_button.dart';
+import 'package:wger/core/widgets/progress_indicator.dart';
+import 'package:wger/features/measurements/models/measurement_entry.dart';
+import 'package:wger/features/measurements/providers/measurement_notifier.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+class MeasurementEntryForm extends ConsumerStatefulWidget {
+  final String _categoryId;
+  final MeasurementEntry? _entry;
+
+  const MeasurementEntryForm(this._categoryId, [MeasurementEntry? entry]) : _entry = entry;
+
+  @override
+  ConsumerState<MeasurementEntryForm> createState() => _MeasurementEntryFormState();
+}
+
+class _MeasurementEntryFormState extends ConsumerState<MeasurementEntryForm> {
+  final _form = GlobalKey<FormState>();
+
+  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;
+
+  @override
+  void initState() {
+    super.initState();
+    _draft =
+        widget._entry ??
+        MeasurementEntry(
+          categoryId: widget._categoryId,
+          date: DateTime.now(),
+          value: 0,
+          notes: '',
+        );
+    _value = widget._entry?.value;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final notifier = ref.read(measurementProvider.notifier);
+    // 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 categoryAsync.when(
+      loading: () => const BoxedProgressIndicator(),
+      error: (error, _) => StreamErrorIndicator(error.toString()),
+      data: (category) {
+        if (category == null) {
+          return const Text('Category not found');
+        }
+
+        return Form(
+          key: _form,
+          child: Column(
+            children: [
+              DateTimeInputWidget(
+                value: _draft.date,
+                onChanged: (date) => _draft = _draft.copyWith(date: date),
+              ),
+
+              // Value
+              DecimalInputWidget(
+                value: _value,
+                labelText: AppLocalizations.of(context).value,
+                suffixText: category.unit,
+                isRequired: true,
+                min: category.metricType.limits(category.unit).min,
+                max: category.metricType.limits(category.unit).max,
+                onChanged: (value) => _value = value,
+              ),
+              // Notes
+              TextFormField(
+                decoration: InputDecoration(labelText: AppLocalizations.of(context).notes),
+                initialValue: _draft.notes,
+                onSaved: (newValue) {
+                  _draft = _draft.copyWith(notes: newValue ?? '');
+                },
+                validator: (value) {
+                  const minLength = 0;
+                  const maxLength = 100;
+                  if (value!.isNotEmpty && (value.length < minLength || value.length > maxLength)) {
+                    return AppLocalizations.of(context).enterCharacters(
+                      minLength.toString(),
+                      maxLength.toString(),
+                    );
+                  }
+                  return null;
+                },
+              ),
+
+              FormSubmitButton(
+                label: AppLocalizations.of(context).save,
+                onPressed: () async {
+                  final isValid = _form.currentState!.validate();
+                  if (!isValid) {
+                    return;
+                  }
+                  _form.currentState!.save();
+
+                  // 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 {
+                    await notifier.updateEntry(entry);
+                  }
+
+                  if (context.mounted) {
+                    Navigator.of(context).pop();
+                  }
+                },
+              ),
+            ],
+          ),
+        );
+      },
+    );
+  }
+}
diff --git a/lib/features/measurements/widgets/forms/group_entry.dart b/lib/features/measurements/widgets/forms/group_entry.dart
new file mode 100644
index 000000000..f0c864afd
--- /dev/null
+++ b/lib/features/measurements/widgets/forms/group_entry.dart
@@ -0,0 +1,102 @@
+/*
+ * 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/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/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/l10n/generated/app_localizations.dart';
+
+/// 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..95a8e8360 100644
--- a/lib/features/measurements/widgets/helpers.dart
+++ b/lib/features/measurements/widgets/helpers.dart
@@ -1,80 +1,151 @@
+import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
-import 'package:wger/features/measurements/measurements.dart';
-import 'package:wger/features/measurements/widgets/charts.dart';
-import 'package:wger/features/nutrition/models/nutritional_plan.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:wger/core/widgets/error.dart';
+import 'package:wger/core/widgets/legend.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/screens/measurement_entries_screen.dart';
+import 'package:wger/features/measurements/widgets/charts/bar_chart.dart';
+import 'package:wger/features/measurements/widgets/charts/distribution_chart.dart';
+import 'package:wger/features/measurements/widgets/charts/heatmap_chart.dart';
+import 'package:wger/features/measurements/widgets/charts/line_chart.dart';
+import 'package:wger/features/measurements/widgets/charts/overall_change.dart';
+import 'package:wger/features/measurements/widgets/charts/stacked_bar_chart.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,
+              // The average is still computed for the number below, the
+              // setting only decides whether the line is drawn
+              settings.averageWindow == null ? const [] : 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,
+/// The trend over [raw], null when the user turned the trend line off
+List<MeasurementChartEntry>? _trendlineFor(
+  List<MeasurementChartEntry> raw,
+  ChartSettings settings,
 ) {
-  final monthAgo = DateTime.now().subtract(const Duration(days: 30));
+  final period = settings.trend.emaPeriod;
+
+  return period == null ? null : smoothedTrendline(raw, period: period);
+}
+
+/// 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 period = settings.trend.emaPeriod;
+  final trendAll = summed || period == null ? null : smoothedTrendline(entriesAll, period: period);
   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,
@@ -84,39 +155,343 @@ List<Widget> getOverviewWidgetsSeries(
           text: AppLocalizations.of(context).indicatorRaw,
           isSquare: true,
         ),
-        Indicator(
-          color: Theme.of(context).colorScheme.tertiary,
-          text: AppLocalizations.of(context).indicatorAvg,
-          isSquare: true,
-        ),
+        if (settings.averageWindow != null)
+          Indicator(
+            color: Theme.of(context).colorScheme.tertiary,
+            text: AppLocalizations.of(context).indicatorAvg,
+            isSquare: true,
+          ),
+        if (trendAll != null)
+          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())],
+    );
+  }
+
+  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,
     );
   }
-  if (entriesAll.whereDate(fourMonthsAgo, null).length > 4) {
-    return (
-      entriesAll.whereDate(fourMonthsAgo, null),
-      entries7dAvg.whereDate(fourMonthsAgo, null),
+}
+
+/// 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,
+      );
+    }
+  }
+
+  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 ?? _trendlineFor(raw, settings),
+    planPeriods: planPeriods,
+  );
+}
+
+/// One row per component of [group]: a colour dot tying the row to its part
+/// of the group chart, the component's name, and [trailing]; tapping opens
+/// the component's entries.
+///
+/// The stacked chart draws only the components that are parts of the whole,
+/// so a row's colour comes from that list rather than from its position among
+/// all children, and a roll-up component gets no dot. [showDots] turns them
+/// off wholesale, for a range chart whose single bar needs no legend.
+class GroupComponentRows extends StatelessWidget {
+  const GroupComponentRows(this.group, {required this.trailing, this.showDots = true});
+
+  final MeasurementCategory group;
+
+  /// Built per component: the latest value on the card, a chevron on the
+  /// detail screen.
+  final Widget? Function(BuildContext context, MeasurementCategory child) trailing;
+
+  final bool showDots;
+
+  @override
+  Widget build(BuildContext context) {
+    final stacked = group.metricType.isSummedPerDay ? stackableComponents(group) : null;
+
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: group.children.mapIndexed((index, child) {
+        final colorIndex = stacked == null ? index : stacked.indexWhere((c) => c.id == child.id);
+
+        return ListTile(
+          dense: true,
+          leading: !showDots || colorIndex < 0
+              ? null
+              : Container(
+                  width: 12,
+                  height: 12,
+                  decoration: BoxDecoration(
+                    shape: BoxShape.circle,
+                    color: componentColor(context, colorIndex),
+                  ),
+                ),
+          title: Text(child.displayName(context)),
+          trailing: trailing(context, child),
+          onTap: () => Navigator.pushNamed(
+            context,
+            MeasurementEntriesScreen.routeName,
+            arguments: child.id,
+          ),
+        );
+      }).toList(),
     );
   }
-  return (entriesAll, entries7dAvg);
 }
diff --git a/lib/features/measurements/widgets/measurement_fab.dart b/lib/features/measurements/widgets/measurement_fab.dart
new file mode 100644
index 000000000..82ac4f3e5
--- /dev/null
+++ b/lib/features/measurements/widgets/measurement_fab.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/>.
+ */
+
+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/entry.dart';
+import 'package:wger/features/measurements/widgets/forms/group_entry.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 or by
+  /// the server, 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. A calculated one never does, also while it is still
+  /// empty, since the server refuses entries there.
+  bool _isHandKept(MeasurementCategory category, Map<String, MeasurementEntry> latest) {
+    if (category.isCalculated) {
+      return false;
+    }
+
+    final newest = category.hasChildren
+        ? category.children.map((c) => latest[c.id])
+        : [latest[category.id]];
+
+    return newest.nonNulls.every((entry) => entry.source == measurementSourceUser);
+  }
+
+  @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..8008254da
--- /dev/null
+++ b/lib/features/measurements/widgets/measurement_tile.dart
@@ -0,0 +1,576 @@
+/*
+ * 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/calculation_mark.dart';
+import 'package:wger/features/measurements/widgets/charts/spark_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(),
+              // Renders nothing for a hand-kept category, which is what keeps
+              // the row out of the tile's height budget for those
+              CalculationMark(category, dense: true),
+              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..5d5544227
--- /dev/null
+++ b/lib/features/measurements/widgets/metric_picker.dart
@@ -0,0 +1,134 @@
+/*
+ * 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/category.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();
+
+    // Alphabetical by the name the user reads: the order they are declared in
+    // means nothing to them, and the list is long enough to look through
+    final pickable = [
+      for (final metricType in MetricType.values)
+        if (metricType.isPickable) metricType,
+    ]..sort((a, b) => a.localized(context).compareTo(b.localized(context)));
+
+    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,
+            ),
+          ),
+          // First, and above the divider: it is the one that fits whatever
+          // the user wants to track, the rest are a catalogue of known ones
+          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(),
+                  hasListView: true,
+                ),
+              );
+            },
+          ),
+          const Divider(),
+          for (final metricType in pickable)
+            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,
+                  );
+                }
+              },
+            ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/features/measurements/widgets/weight_form.dart b/lib/features/measurements/widgets/weight_form.dart
new file mode 100644
index 000000000..b1170296b
--- /dev/null
+++ b/lib/features/measurements/widgets/weight_form.dart
@@ -0,0 +1,167 @@
+/*
+ * 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 MeasurementEntry _draft;
+  num? _weight;
+  late String _unit;
+
+  @override
+  void initState() {
+    super.initState();
+    _draft =
+        widget._entry ??
+        MeasurementEntry(
+          categoryId: widget._category.id!,
+          date: DateTime.now(),
+          value: 0,
+          notes: '',
+        );
+    _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: _draft.date,
+            onChanged: (value) => _draft = _draft.copyWith(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);
+              }
+            },
+          ),
+          // Notes
+          TextFormField(
+            key: const Key('notesInput'),
+            decoration: InputDecoration(labelText: AppLocalizations.of(context).notes),
+            initialValue: _draft.notes,
+            onSaved: (newValue) {
+              _draft = _draft.copyWith(notes: newValue ?? '');
+            },
+            validator: (value) {
+              const maxLength = 100;
+              if (value!.length > maxLength) {
+                return AppLocalizations.of(context).enterCharacters('0', maxLength.toString());
+              }
+              return null;
+            },
+          ),
+          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();
+
+              // The draft carries what the form does not offer (source,
+              // external id), so an edited import stays deduplicable; only the
+              // chosen unit is stamped into extra_data, other keys survive
+              final entry = _draft.copyWith(
+                value: _weight!,
+                extraData: {...?_draft.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/widgets/charts.dart b/lib/features/nutrition/widgets/charts.dart
index 348344738..296dc19ab 100644
--- a/lib/features/nutrition/widgets/charts.dart
+++ b/lib/features/nutrition/widgets/charts.dart
@@ -21,7 +21,7 @@ import 'dart:math';
 import 'package:fl_chart/fl_chart.dart';
 import 'package:flutter/material.dart';
 import 'package:wger/core/colors.dart';
-import 'package:wger/features/measurements/widgets/charts.dart';
+import 'package:wger/core/widgets/legend.dart';
 import 'package:wger/features/nutrition/models/nutritional_plan.dart';
 import 'package:wger/features/nutrition/models/nutritional_values.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
diff --git a/lib/features/nutrition/widgets/ingredient_filter_dialog.dart b/lib/features/nutrition/widgets/ingredient_filter_dialog.dart
index 8232c9efd..7c9693a7c 100644
--- a/lib/features/nutrition/widgets/ingredient_filter_dialog.dart
+++ b/lib/features/nutrition/widgets/ingredient_filter_dialog.dart
@@ -158,7 +158,7 @@ class _NutriscoreSlider extends StatelessWidget {
             min: 0,
             max: maxIndex.toDouble(),
             divisions: maxIndex,
-            label: value == null ? i18n.filterNutriscoreOff : value!.name.toUpperCase(),
+            label: value == null ? i18n.off : value!.name.toUpperCase(),
             onChanged: (v) => onChanged(_indexToValue(v.round())),
           ),
           Padding(
@@ -167,7 +167,7 @@ class _NutriscoreSlider extends StatelessWidget {
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: [
                 Text(
-                  i18n.filterNutriscoreOff,
+                  i18n.off,
                   style: Theme.of(context).textTheme.labelSmall,
                 ),
                 ...NutriScore.values.map(
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..43cf449a3 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/widgets/charts.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/body_weight_provider.dart';
+import 'package:wger/features/measurements/providers/measurement_notifier.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 ?? ChartSettings.fallbackWindow,
+    ).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..d58d27fd9
--- /dev/null
+++ b/lib/features/nutrition/widgets/plan_weight_chart.dart
@@ -0,0 +1,97 @@
+/*
+ * 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/formatting/formatting.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/body_weight_provider.dart';
+import 'package:wger/features/measurements/providers/measurement_notifier.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 ?? ChartSettings.fallbackWindow);
+
+    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 dc06d18f6..fb1834bef 100644
--- a/lib/features/nutrition/widgets/widgets.dart
+++ b/lib/features/nutrition/widgets/widgets.dart
@@ -101,11 +101,10 @@ class _IngredientTypeaheadState extends ConsumerState<IngredientTypeahead> {
         context,
       ).push<String?>(MaterialPageRoute(builder: (context) => const ScanReader()));
 
-      if (code == null) {
-        return '';
-      }
-
-      if (code == '-1') {
+      // A decoder that never returns looks exactly like a cancelled scan from
+      // here, so log the empty result as the only trace it leaves.
+      if (code == null || code.isEmpty || code == '-1') {
+        widget._logger.info('Barcode scanner returned no code');
         return '';
       }
       return code;
@@ -269,6 +268,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/models/session.dart b/lib/features/routines/models/session.dart
index cb65f26b2..a8e62932f 100644
--- a/lib/features/routines/models/session.dart
+++ b/lib/features/routines/models/session.dart
@@ -16,9 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import 'package:clock/clock.dart';
 import 'package:drift/drift.dart' as drift;
 import 'package:flutter/material.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:wger/core/date.dart';
 import 'package:wger/database/powersync/database.dart';
 import 'package:wger/features/exercises/models/exercise.dart';
 import 'package:wger/features/routines/models/log.dart';
@@ -56,6 +58,9 @@ extension WorkoutImpressionL10n on WorkoutImpression {
   }
 }
 
+/// How long after its start an ongoing session still picks up new logs
+const sessionMaxDuration = Duration(hours: 5);
+
 @freezed
 class WorkoutSession with _$WorkoutSession {
   /// Inclusive upper bound for [notes]
@@ -69,15 +74,13 @@ class WorkoutSession with _$WorkoutSession {
   @override
   final int? dayId;
   @override
-  final DateTime date;
-  @override
   final WorkoutImpression impression;
   @override
   final String? notes;
   @override
-  final TimeOfDay? timeStart;
+  final DateTime datetimeStart;
   @override
-  final TimeOfDay? timeEnd;
+  final DateTime? datetimeEnd;
   @override
   final List<Log> logs;
 
@@ -85,42 +88,88 @@ class WorkoutSession with _$WorkoutSession {
     this.id,
     this.dayId,
     required this.routineId,
-    required this.date,
+    required this.datetimeStart,
+    this.datetimeEnd,
     this.impression = WorkoutImpression.neutral,
     this.notes = '',
-    this.timeStart,
-    this.timeEnd,
     this.logs = const [],
   });
 
+  /// Builds the model from a database row.
+  ///
+  /// Rows that were replicated before 2.7 have no `datetime_start` in their
+  /// stored JSON and read as NULL, for as long as that local database lives.
+  /// They are rebuilt from the pre-2.7 date and time columns. Application code
+  /// uses the default constructor.
+  factory WorkoutSession.fromDb({
+    String? id,
+    int? routineId,
+    int? dayId,
+    String? notes,
+    WorkoutImpression impression = WorkoutImpression.neutral,
+    DateTime? datetimeStart,
+    DateTime? datetimeEnd,
+    DateTime? date,
+    TimeOfDay? timeStart,
+    TimeOfDay? timeEnd,
+  }) {
+    DateTime on(DateTime day, TimeOfDay? time) =>
+        DateTime(day.year, day.month, day.day, time?.hour ?? 0, time?.minute ?? 0);
+
+    final start = datetimeStart ?? (date == null ? clock.now() : on(date, timeStart));
+
+    var end = datetimeEnd;
+    if (end == null && date != null && timeEnd != null) {
+      end = on(date, timeEnd);
+      // An end before the start means the session ran past midnight
+      if (end.isBefore(start)) {
+        end = end.add(const Duration(days: 1));
+      }
+    }
+
+    return WorkoutSession(
+      id: id,
+      routineId: routineId,
+      dayId: dayId,
+      notes: notes,
+      impression: impression,
+      datetimeStart: start,
+      datetimeEnd: end,
+    );
+  }
+
   WorkoutSessionTableCompanion toCompanion() {
     return WorkoutSessionTableCompanion(
       id: id != null ? drift.Value(id!) : const drift.Value.absent(),
       routineId: drift.Value(routineId),
       dayId: drift.Value(dayId),
-      // Server-side `date` is a `DateField` (no time, no TZ). We  send here the
-      // calendar day the user picked, packaged as midnight-UTC so it round-trips
-      // through PowerSync's ISO8601 wire format and lands on the right day on
-      // the server.
-      date: drift.Value(DateTime.utc(date.year, date.month, date.day)),
       notes: drift.Value(notes),
       impression: drift.Value(impression),
-      // Explicit NULL, not absent: clearing a time has to clear the column too
-      timeStart: drift.Value(timeStart),
-      timeEnd: drift.Value(timeEnd),
+      // Explicit NULL, not absent: clearing the end has to clear the column too.
+      // The pre-2.7 columns are never written again, only read by fromDb.
+      datetimeStart: drift.Value(datetimeStart),
+      datetimeEnd: drift.Value(datetimeEnd),
     );
   }
 
+  /// The calendar day this session counts for, e.g. for the dashboard calendar
+  ///
+  /// A session that runs over midnight counts for the day it started on, cut
+  /// in the owner's profile zone like the server's local_day (the zone comes
+  /// from ownerTimeZoneProvider; the device zone stands in while it is null)
+  DateTime localDayIn(String? zoneName) => dayIn(datetimeStart, zoneName);
+
+  /// Duration between start and end, null while the session is still open
   Duration? get duration {
-    if (timeStart == null || timeEnd == null) {
+    final end = datetimeEnd;
+    if (end == null) {
       return null;
     }
-    final now = DateTime.now();
-    final startDate = DateTime(now.year, now.month, now.day, timeStart!.hour, timeStart!.minute);
-    final endDate = DateTime(now.year, now.month, now.day, timeEnd!.hour, timeEnd!.minute);
-    return endDate.difference(startDate);
+
+    return end.difference(datetimeStart);
   }
 
+  /// Returns a localized string representation of the duration (e.g., "2h 30m").
   String durationTxt(BuildContext context) {
     final duration = this.duration;
     if (duration == null) {
@@ -131,14 +180,16 @@ class WorkoutSession with _$WorkoutSession {
     ).durationHoursMinutes(duration.inHours, duration.inMinutes.remainder(60));
   }
 
+  /// Returns a formatted string: "2h 30m (09:00 AM - 11:30 AM)".
   String durationTxtWithStartEnd(BuildContext context) {
-    final duration = this.duration;
-    if (duration == null) {
+    final end = datetimeEnd;
+    if (end == null) {
       return '-/-';
     }
 
-    final startTime = MaterialLocalizations.of(context).formatTimeOfDay(timeStart!);
-    final endTime = MaterialLocalizations.of(context).formatTimeOfDay(timeEnd!);
+    final localizations = MaterialLocalizations.of(context);
+    final startTime = localizations.formatTimeOfDay(TimeOfDay.fromDateTime(datetimeStart));
+    final endTime = localizations.formatTimeOfDay(TimeOfDay.fromDateTime(end));
 
     return '${durationTxt(context)} ($startTime - $endTime)';
   }
diff --git a/lib/features/routines/models/session.freezed.dart b/lib/features/routines/models/session.freezed.dart
index 2fe4e547b..f1b1be07c 100644
--- a/lib/features/routines/models/session.freezed.dart
+++ b/lib/features/routines/models/session.freezed.dart
@@ -15,7 +15,7 @@ T _$identity<T>(T value) => value;
 mixin _$WorkoutSession {
 
 /// Client-generated UUID, is `null` only before the first persist
- String? get id; int? get routineId; int? get dayId; DateTime get date; WorkoutImpression get impression; String? get notes; TimeOfDay? get timeStart; TimeOfDay? get timeEnd; List<Log> get logs;
+ String? get id; int? get routineId; int? get dayId; WorkoutImpression get impression; String? get notes; DateTime get datetimeStart; DateTime? get datetimeEnd; List<Log> get logs;
 /// Create a copy of WorkoutSession
 /// with the given fields replaced by the non-null parameter values.
 @JsonKey(includeFromJson: false, includeToJson: false)
@@ -26,16 +26,16 @@ $WorkoutSessionCopyWith<WorkoutSession> get copyWith => _$WorkoutSessionCopyWith
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is WorkoutSession&&(identical(other.id, id) || other.id == id)&&(identical(other.routineId, routineId) || other.routineId == routineId)&&(identical(other.dayId, dayId) || other.dayId == dayId)&&(identical(other.date, date) || other.date == date)&&(identical(other.impression, impression) || other.impression == impression)&&(identical(other.notes, notes) || other.notes == notes)&&(identical(other.timeStart, timeStart) || other.timeStart == timeStart)&&(identical(other.timeEnd, timeEnd) || other.timeEnd == timeEnd)&&const DeepCollectionEquality().equals(other.logs, logs));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is WorkoutSession&&(identical(other.id, id) || other.id == id)&&(identical(other.routineId, routineId) || other.routineId == routineId)&&(identical(other.dayId, dayId) || other.dayId == dayId)&&(identical(other.impression, impression) || other.impression == impression)&&(identical(other.notes, notes) || other.notes == notes)&&(identical(other.datetimeStart, datetimeStart) || other.datetimeStart == datetimeStart)&&(identical(other.datetimeEnd, datetimeEnd) || other.datetimeEnd == datetimeEnd)&&const DeepCollectionEquality().equals(other.logs, logs));
 }
 
 
 @override
-int get hashCode => Object.hash(runtimeType,id,routineId,dayId,date,impression,notes,timeStart,timeEnd,const DeepCollectionEquality().hash(logs));
+int get hashCode => Object.hash(runtimeType,id,routineId,dayId,impression,notes,datetimeStart,datetimeEnd,const DeepCollectionEquality().hash(logs));
 
 @override
 String toString() {
-  return 'WorkoutSession(id: $id, routineId: $routineId, dayId: $dayId, date: $date, impression: $impression, notes: $notes, timeStart: $timeStart, timeEnd: $timeEnd, logs: $logs)';
+  return 'WorkoutSession(id: $id, routineId: $routineId, dayId: $dayId, impression: $impression, notes: $notes, datetimeStart: $datetimeStart, datetimeEnd: $datetimeEnd, logs: $logs)';
 }
 
 
@@ -46,7 +46,7 @@ abstract mixin class $WorkoutSessionCopyWith<$Res>  {
   factory $WorkoutSessionCopyWith(WorkoutSession value, $Res Function(WorkoutSession) _then) = _$WorkoutSessionCopyWithImpl;
 @useResult
 $Res call({
- String? id, int? dayId, int? routineId, DateTime date, WorkoutImpression impression, String? notes, TimeOfDay? timeStart, TimeOfDay? timeEnd, List<Log> logs
+ String? id, int? dayId, int? routineId, DateTime datetimeStart, DateTime? datetimeEnd, WorkoutImpression impression, String? notes, List<Log> logs
 });
 
 
@@ -63,17 +63,16 @@ class _$WorkoutSessionCopyWithImpl<$Res>
 
 /// Create a copy of WorkoutSession
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? id = freezed,Object? dayId = freezed,Object? routineId = freezed,Object? date = null,Object? impression = null,Object? notes = freezed,Object? timeStart = freezed,Object? timeEnd = freezed,Object? logs = null,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? id = freezed,Object? dayId = freezed,Object? routineId = freezed,Object? datetimeStart = null,Object? datetimeEnd = freezed,Object? impression = null,Object? notes = freezed,Object? logs = null,}) {
   return _then(WorkoutSession(
 id: freezed == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String?,dayId: freezed == dayId ? _self.dayId : dayId // ignore: cast_nullable_to_non_nullable
 as int?,routineId: freezed == routineId ? _self.routineId : routineId // ignore: cast_nullable_to_non_nullable
-as int?,date: null == date ? _self.date : date // ignore: cast_nullable_to_non_nullable
-as DateTime,impression: null == impression ? _self.impression : impression // ignore: cast_nullable_to_non_nullable
+as int?,datetimeStart: null == datetimeStart ? _self.datetimeStart : datetimeStart // ignore: cast_nullable_to_non_nullable
+as DateTime,datetimeEnd: freezed == datetimeEnd ? _self.datetimeEnd : datetimeEnd // ignore: cast_nullable_to_non_nullable
+as DateTime?,impression: null == impression ? _self.impression : impression // ignore: cast_nullable_to_non_nullable
 as WorkoutImpression,notes: freezed == notes ? _self.notes : notes // ignore: cast_nullable_to_non_nullable
-as String?,timeStart: freezed == timeStart ? _self.timeStart : timeStart // ignore: cast_nullable_to_non_nullable
-as TimeOfDay?,timeEnd: freezed == timeEnd ? _self.timeEnd : timeEnd // ignore: cast_nullable_to_non_nullable
-as TimeOfDay?,logs: null == logs ? _self.logs : logs // ignore: cast_nullable_to_non_nullable
+as String?,logs: null == logs ? _self.logs : logs // ignore: cast_nullable_to_non_nullable
 as List<Log>,
   ));
 }
diff --git a/lib/features/routines/providers/routines_notifier.dart b/lib/features/routines/providers/routines_notifier.dart
index cc9f16273..6e3225687 100644
--- a/lib/features/routines/providers/routines_notifier.dart
+++ b/lib/features/routines/providers/routines_notifier.dart
@@ -34,6 +34,7 @@ import 'package:wger/features/routines/models/slot_entry.dart';
 import 'package:wger/features/routines/models/weight_unit.dart';
 import 'package:wger/features/routines/providers/routines_repository.dart';
 import 'package:wger/features/routines/providers/workout_session_notifier.dart';
+
 part 'routines_notifier.g.dart';
 
 // Reference-data streams: kept alive across the app's lifetime so that
diff --git a/lib/features/routines/providers/workout_logs_repository.dart b/lib/features/routines/providers/workout_logs_repository.dart
index 0e6ae92f1..318ab65bb 100644
--- a/lib/features/routines/providers/workout_logs_repository.dart
+++ b/lib/features/routines/providers/workout_logs_repository.dart
@@ -23,6 +23,7 @@
 import 'package:drift/drift.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:logging/logging.dart';
+import 'package:wger/core/json.dart';
 import 'package:wger/database/powersync/database.dart';
 import 'package:wger/features/routines/models/log.dart';
 import 'package:wger/features/routines/models/session.dart';
@@ -121,37 +122,84 @@ class WorkoutLogRepository {
     _logger.finer('Adding local workout log entry ${log.date}');
 
     await _db.transaction(() async {
-      if (log.sessionId == null) {
-        final dayMidnightUtc = DateTime.utc(log.date.year, log.date.month, log.date.day);
-
-        final existing =
-            await (_db.select(_db.workoutSessionTable)
-                  ..where(
-                    (t) =>
-                        t.routineId.equalsNullable(log.routineId) &
-                        t.date.equalsValue(dayMidnightUtc),
-                  )
-                  ..limit(1))
-                .getSingleOrNull();
-
-        if (existing != null) {
-          log.sessionId = existing.id;
-        } else {
-          final newSession = WorkoutSession(
-            routineId: log.routineId,
-            dayId: dayId,
-            date: dayMidnightUtc,
-          );
-          final inserted = await _db
-              .into(_db.workoutSessionTable)
-              .insertReturning(newSession.toCompanion());
-          log.sessionId = inserted.id;
-          _logger.finer('Created lazy session ${inserted.id} for log');
-        }
-      }
+      log.sessionId ??= await _sessionIdFor(log, dayId: dayId);
 
       final inserted = await _db.into(_db.workoutLogTable).insertReturning(log.toCompanion());
       log.id = inserted.id;
     });
   }
+
+  /// The session a log without one belongs to, creating it if nothing fits.
+  ///
+  /// In order: a session the log falls into, then the most recent session that
+  /// is still open and started no more than [sessionMaxDuration] ago, then one
+  /// on the same day that carries no time at all, otherwise a new one. The first
+  /// three mirror what the server does for logs uploaded without a session.
+  Future<String?> _sessionIdFor(Log log, {int? dayId}) async {
+    final at = dateToUtcIso8601(log.date);
+
+    final covering =
+        await (_db.select(_db.workoutSessionTable)
+              ..where(
+                (t) =>
+                    t.routineId.equalsNullable(log.routineId) &
+                    t.datetimeStart.isSmallerOrEqualValue(at) &
+                    t.datetimeEnd.isBiggerOrEqualValue(at),
+              )
+              ..limit(1))
+            .getSingleOrNull();
+    if (covering != null) {
+      return covering.id;
+    }
+
+    final windowStart = dateToUtcIso8601(log.date.subtract(sessionMaxDuration));
+    final open =
+        await (_db.select(_db.workoutSessionTable)
+              ..where(
+                (t) =>
+                    t.routineId.equalsNullable(log.routineId) &
+                    t.datetimeEnd.isNull() &
+                    t.datetimeStart.isBiggerOrEqualValue(windowStart) &
+                    t.datetimeStart.isSmallerOrEqualValue(at),
+              )
+              ..orderBy([(t) => OrderingTerm.desc(t.datetimeStart)])
+              ..limit(1))
+            .getSingleOrNull();
+    if (open != null) {
+      return open.id;
+    }
+
+    // Sessions that came from the server without a time can only be matched by
+    // their day. Dropping this would create a duplicate next to every one of them.
+    final dayMidnightUtc = DateTime.utc(log.date.year, log.date.month, log.date.day);
+    final sameDay =
+        await (_db.select(_db.workoutSessionTable)
+              ..where(
+                (t) =>
+                    t.routineId.equalsNullable(log.routineId) &
+                    t.datetimeStart.isNull() &
+                    t.date.equalsValue(dayMidnightUtc),
+              )
+              ..limit(1))
+            .getSingleOrNull();
+    if (sameDay != null) {
+      return sameDay.id;
+    }
+
+    // The start has to be set, otherwise the lookups above can never find this
+    // session again and every further log would create one of its own. The day
+    // is set so the routine's date sequence advances (issue wger#2460).
+    final created = await _db
+        .into(_db.workoutSessionTable)
+        .insertReturning(
+          WorkoutSession(
+            routineId: log.routineId,
+            dayId: dayId,
+            datetimeStart: log.date,
+          ).toCompanion(),
+        );
+    _logger.finer('Created lazy session ${created.id} for log');
+
+    return created.id;
+  }
 }
diff --git a/lib/features/routines/providers/workout_session_repository.dart b/lib/features/routines/providers/workout_session_repository.dart
index bf4e52d47..79eb9523f 100644
--- a/lib/features/routines/providers/workout_session_repository.dart
+++ b/lib/features/routines/providers/workout_session_repository.dart
@@ -42,20 +42,23 @@ class WorkoutSessionRepository {
   Stream<List<WorkoutSession>> watchAllDrift() {
     _logger.finer('Watching all local workout session entries');
 
-    final query = _db.select(_db.workoutSessionTable).join([
-      leftOuterJoin(
-        _db.workoutLogTable,
-        _db.workoutLogTable.sessionId.equalsExp(_db.workoutSessionTable.id),
-      ),
-      leftOuterJoin(
-        _db.routineRepetitionUnitTable,
-        _db.routineRepetitionUnitTable.id.equalsExp(_db.workoutLogTable.repetitionsUnitId),
-      ),
-      leftOuterJoin(
-        _db.routineWeightUnitTable,
-        _db.routineWeightUnitTable.id.equalsExp(_db.workoutLogTable.weightUnitId),
-      ),
-    ])..orderBy([OrderingTerm(expression: _db.workoutSessionTable.date, mode: OrderingMode.desc)]);
+    final query =
+        _db.select(_db.workoutSessionTable).join([
+          leftOuterJoin(
+            _db.workoutLogTable,
+            _db.workoutLogTable.sessionId.equalsExp(_db.workoutSessionTable.id),
+          ),
+          leftOuterJoin(
+            _db.routineRepetitionUnitTable,
+            _db.routineRepetitionUnitTable.id.equalsExp(_db.workoutLogTable.repetitionsUnitId),
+          ),
+          leftOuterJoin(
+            _db.routineWeightUnitTable,
+            _db.routineWeightUnitTable.id.equalsExp(_db.workoutLogTable.weightUnitId),
+          ),
+        ])..orderBy([
+          OrderingTerm(expression: _db.workoutSessionTable.datetimeStart, mode: OrderingMode.desc),
+        ]);
 
     return query.watch().map((rows) {
       final sessions = <String, WorkoutSession>{};
@@ -103,7 +106,7 @@ class WorkoutSessionRepository {
   /// `session.id` is null, Drift mints one, so the returned session carries
   /// the id the caller needs to reference it.
   Future<WorkoutSession> addLocalDrift(WorkoutSession session) async {
-    _logger.finer('Adding local workout session entry ${session.date}');
+    _logger.finer('Adding local workout session entry ${session.datetimeStart}');
     return _db.into(_db.workoutSessionTable).insertReturning(session.toCompanion());
   }
 }
diff --git a/lib/features/routines/validators.dart b/lib/features/routines/validators.dart
index 5e79191f2..305982764 100644
--- a/lib/features/routines/validators.dart
+++ b/lib/features/routines/validators.dart
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import 'package:flutter/material.dart';
+import 'package:wger/features/routines/models/session.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 
 /// Cross-field validation for a workout log entry, mirroring the
@@ -33,21 +33,24 @@ String? validateWorkoutLogCrossField({
   return null;
 }
 
-/// Cross-field validation for a workout session, mirroring the backend
-/// `WorkoutSession.clean()` rules:
+/// Cross-field validation for a workout session, mirroring the backend rules:
+/// the end must not lie before the start, and the session must not last longer
+/// than [sessionMaxDuration].
 ///
-/// - [timeStart] and [timeEnd] must both be set or both be empty,
-/// - if both are set, [timeStart] must not be after [timeEnd].
+/// A session that ran past midnight ends on the following day, so its end is
+/// after its start as well.
 String? validateWorkoutSessionTimes({
-  required TimeOfDay? timeStart,
-  required TimeOfDay? timeEnd,
+  required DateTime datetimeStart,
+  required DateTime? datetimeEnd,
   required AppLocalizations i18n,
 }) {
-  if ((timeStart == null) != (timeEnd == null)) {
-    return i18n.timeStartEndBothOrNeither;
-  }
-  if (timeStart != null && timeEnd != null && timeStart.isAfter(timeEnd)) {
+  if (datetimeEnd != null && datetimeEnd.isBefore(datetimeStart)) {
     return i18n.timeStartAhead;
   }
+
+  if (datetimeEnd != null && datetimeEnd.difference(datetimeStart) > sessionMaxDuration) {
+    return i18n.sessionTooLong(sessionMaxDuration.inHours);
+  }
+
   return null;
 }
diff --git a/lib/features/routines/widgets/charts.dart b/lib/features/routines/widgets/charts.dart
index 311c8a871..9d190e109 100644
--- a/lib/features/routines/widgets/charts.dart
+++ b/lib/features/routines/widgets/charts.dart
@@ -38,8 +38,9 @@ class _LogChartWidgetFlState extends State<LogChartWidgetFl> {
   @override
   Widget build(BuildContext context) {
     // Exercises whose logs all lack repetitions or a weight are grouped into an
-    // empty map, there is nothing to plot then
-    if (widget._data.isEmpty) {
+    // empty map, and a single group can be empty on its own; there is nothing
+    // to plot either way
+    if (widget._data.values.every((logs) => logs.isEmpty)) {
       return const SizedBox.shrink();
     }
 
@@ -73,6 +74,16 @@ class _LogChartWidgetFlState extends State<LogChartWidgetFl> {
   }
 
   LineChartData mainData() {
+    // Every date that is plotted, in order. The map is keyed by repetitions,
+    // so its first and last group are unrelated series whose dates can sit
+    // anywhere in the range; an interval taken from those two is far smaller
+    // than the axis fl_chart actually draws, and it then builds one label per
+    // step across the whole span until the heap gives out.
+    final dates = [
+      for (final logs in widget._data.values)
+        for (final log in logs) log.date,
+    ]..sort();
+
     final colors = generateChartColors(
       widget._data.keys.length,
       Theme.of(context).colorScheme,
@@ -113,18 +124,7 @@ class _LogChartWidgetFlState extends State<LogChartWidgetFl> {
                 localizedDate(context).format(date),
               );
             },
-            interval: chartGetInterval(
-              widget._data.containsKey(widget._data.keys.first) &&
-                      widget._data[widget._data.keys.first]!.isNotEmpty
-                  ? widget._data[widget._data.keys.first]!.first.date
-                  : DateTime.now(),
-              widget._data.containsKey(widget._data.keys.last) &&
-                      widget._data[widget._data.keys.last]!.isNotEmpty
-                  ? widget._data[widget._data.keys.last]!.last.date
-                  : DateTime.now(),
-              // widget._data[widget._data.keys.first]!.first.date,
-              // widget._data[widget._data.keys.last]!.first.date,
-            ),
+            interval: chartGetInterval(dates.first, dates.last),
           ),
         ),
         leftTitles: AxisTitles(
diff --git a/lib/features/routines/widgets/forms/session.dart b/lib/features/routines/widgets/forms/session.dart
index b0e09ae49..0faf28e2e 100644
--- a/lib/features/routines/widgets/forms/session.dart
+++ b/lib/features/routines/widgets/forms/session.dart
@@ -60,7 +60,11 @@ class _SessionFormState extends ConsumerState<SessionForm> {
     super.initState();
     _draft =
         widget._session ??
-        WorkoutSession(routineId: widget._routineId, dayId: widget._dayId, date: clock.now());
+        WorkoutSession(
+          routineId: widget._routineId,
+          dayId: widget._dayId,
+          datetimeStart: clock.now(),
+        );
     notesController.text = _draft.notes ?? '';
   }
 
@@ -82,6 +86,24 @@ class _SessionFormState extends ConsumerState<SessionForm> {
     super.dispose();
   }
 
+  /// Anchors a picked time on the day the session belongs to
+  ///
+  /// Deliberately the device-zone day: the pickers show and edit device wall
+  /// clock, so the anchor has to be cut in the same zone or an edit could
+  /// move the session by a day
+  DateTime _onSessionDay(TimeOfDay time) {
+    final start = _draft.datetimeStart.toLocal();
+
+    return DateTime(start.year, start.month, start.day, time.hour, time.minute);
+  }
+
+  /// Same, but an end before the start means the session ran past midnight
+  DateTime _endOnSessionDay(TimeOfDay time) {
+    final end = _onSessionDay(time);
+
+    return end.isBefore(_draft.datetimeStart) ? end.add(const Duration(days: 1)) : end;
+  }
+
   @override
   Widget build(BuildContext context) {
     final sessionProvider = ref.read(workoutSessionProvider.notifier);
@@ -133,19 +155,21 @@ class _SessionFormState extends ConsumerState<SessionForm> {
               Flexible(
                 child: TimeInputWidget(
                   key: const ValueKey('time-start'),
-                  value: _draft.timeStart,
+                  value: TimeOfDay.fromDateTime(_draft.datetimeStart),
                   labelText: AppLocalizations.of(context).timeStart,
-                  onCleared: () => _draft = _draft.copyWith(timeStart: null),
-                  onChanged: (time) => _draft = _draft.copyWith(timeStart: time),
+                  onChanged: (time) => _draft = _draft.copyWith(datetimeStart: _onSessionDay(time)),
                 ),
               ),
               Flexible(
                 child: TimeInputWidget(
                   key: const ValueKey('time-end'),
-                  value: _draft.timeEnd,
+                  value: _draft.datetimeEnd != null
+                      ? TimeOfDay.fromDateTime(_draft.datetimeEnd!)
+                      : null,
                   labelText: AppLocalizations.of(context).timeEnd,
-                  onCleared: () => _draft = _draft.copyWith(timeEnd: null),
-                  onChanged: (time) => _draft = _draft.copyWith(timeEnd: time),
+                  onCleared: () => _draft = _draft.copyWith(datetimeEnd: null),
+                  onChanged: (time) =>
+                      _draft = _draft.copyWith(datetimeEnd: _endOnSessionDay(time)),
                 ),
               ),
             ],
@@ -162,8 +186,8 @@ class _SessionFormState extends ConsumerState<SessionForm> {
 
               final i18n = AppLocalizations.of(context);
               final error = validateWorkoutSessionTimes(
-                timeStart: _draft.timeStart,
-                timeEnd: _draft.timeEnd,
+                datetimeStart: _draft.datetimeStart,
+                datetimeEnd: _draft.datetimeEnd,
                 i18n: i18n,
               );
               if (error != null) {
diff --git a/lib/features/routines/widgets/gym_mode/session_page.dart b/lib/features/routines/widgets/gym_mode/session_page.dart
index 326fc4216..a8e92ca7b 100644
--- a/lib/features/routines/widgets/gym_mode/session_page.dart
+++ b/lib/features/routines/widgets/gym_mode/session_page.dart
@@ -17,6 +17,7 @@
  */
 
 import 'package:clock/clock.dart';
+import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:wger/core/consts.dart';
@@ -52,22 +53,31 @@ class _SessionPageState extends ConsumerState<SessionPage> {
             value: ref.watch(workoutSessionProvider),
             loggerName: 'SessionPage',
             data: (sessions) {
-              final found = sessions.firstWhere(
-                (s) => s.date.isSameDayAs(clock.now()) && s.routineId == gymState.routine.id,
-                orElse: () => WorkoutSession(
-                  dayId: gymState.dayId,
-                  date: clock.now(),
-                  routineId: gymState.routine.id,
-                ),
-              );
+              final now = clock.now();
+              final ours = sessions.where((s) => s.routineId == gymState.routine.id);
+
+              // A session that is still running wins over one that merely shares
+              // a calendar day, because a workout can cross midnight. The day is
+              // still the fallback, so an already finished one stays editable.
+              final found =
+                  ours.firstWhereOrNull(
+                    (s) =>
+                        s.datetimeEnd == null &&
+                        now.difference(s.datetimeStart) <= sessionMaxDuration,
+                  ) ??
+                  ours.firstWhereOrNull((s) => s.datetimeStart.isSameDayAs(now)) ??
+                  WorkoutSession(
+                    dayId: gymState.dayId,
+                    datetimeStart: gymState.workoutStart,
+                    routineId: gymState.routine.id,
+                  );
 
               // Prefill missing times. A session may have been created lazily
               // while logging sets (without times), so fall back to the gym
               // session's start and the current time.
-              final session = found.copyWith(
-                timeStart: found.timeStart ?? gymState.startTime,
-                timeEnd: found.timeEnd ?? TimeOfDay.fromDateTime(clock.now()),
-              );
+              // A session created lazily while logging has no end yet; prefill
+              // the current time so the form opens on a complete interval.
+              final session = found.copyWith(datetimeEnd: found.datetimeEnd ?? now);
 
               return Column(
                 children: [
diff --git a/lib/features/routines/widgets/gym_mode/summary.dart b/lib/features/routines/widgets/gym_mode/summary.dart
index cdd83cc6a..f688c25f6 100644
--- a/lib/features/routines/widgets/gym_mode/summary.dart
+++ b/lib/features/routines/widgets/gym_mode/summary.dart
@@ -25,6 +25,7 @@ import 'package:wger/core/date.dart';
 import 'package:wger/core/network/network_provider.dart';
 import 'package:wger/core/widgets/error.dart';
 import 'package:wger/core/widgets/progress_indicator.dart';
+import 'package:wger/features/account/providers/user_profile_notifier.dart';
 import 'package:wger/features/routines/models/session.dart';
 import 'package:wger/features/routines/providers/gym_state_notifier.dart';
 import 'package:wger/features/routines/providers/routines_notifier.dart';
@@ -75,6 +76,7 @@ class _WorkoutSummaryState extends ConsumerState<WorkoutSummary> {
     final routinesState = ref.watch(routinesRiverpodProvider).value;
     final routine = routinesState?.routines.firstWhereOrNull((r) => r.id == routineId);
     final trophyState = ref.watch(trophyStateProvider);
+    final ownerZone = ref.watch(ownerTimeZoneProvider);
 
     return Column(
       children: [
@@ -100,8 +102,10 @@ class _WorkoutSummaryState extends ConsumerState<WorkoutSummary> {
                 return const BoxedProgressIndicator();
               }
 
+              // Both sides of the comparison cut in the owner's zone, so the
+              // summary shows the session of the same "today" the server uses
               final session = routine.sessions.firstWhereOrNull(
-                (s) => s.date.isSameDayAs(clock.now()),
+                (s) => s.localDayIn(ownerZone).isSameDayAs(dayIn(clock.now(), ownerZone)),
               );
               final userTrophies = trophyState.prTrophies
                   .where((t) => t.contextData?.sessionId == session?.id)
diff --git a/lib/features/routines/widgets/logs/day_logs_container.dart b/lib/features/routines/widgets/logs/day_logs_container.dart
index 8b1cfe11e..a08aa85ee 100644
--- a/lib/features/routines/widgets/logs/day_logs_container.dart
+++ b/lib/features/routines/widgets/logs/day_logs_container.dart
@@ -19,7 +19,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:wger/core/date.dart';
+import 'package:wger/features/account/providers/user_profile_notifier.dart';
 import 'package:wger/features/routines/models/routine.dart';
+import 'package:wger/features/routines/models/session.dart';
 import 'package:wger/features/trophies/providers/trophy_notifier.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 
@@ -36,25 +38,44 @@ class DayLogWidget extends ConsumerWidget {
 
   const DayLogWidget(this._date, this._routine);
 
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    // A day can hold more than one session, e.g. a morning and an evening
+    // workout, and each of them is shown with its own logs
+    final ownerZone = ref.watch(ownerTimeZoneProvider);
+    final sessions =
+        _routine.sessions.where((s) => s.localDayIn(ownerZone).isSameDayAs(_date)).toList()
+          ..sort((a, b) => a.datetimeStart.compareTo(b.datetimeStart));
+
+    return Column(
+      spacing: 10,
+      children: sessions.map((session) => SessionLogWidget(session, _routine)).toList(),
+    );
+  }
+}
+
+class SessionLogWidget extends ConsumerWidget {
+  final WorkoutSession _session;
+  final Routine _routine;
+
+  const SessionLogWidget(this._session, this._routine);
+
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final i18n = AppLocalizations.of(context);
     final theme = Theme.of(context);
     final trophyState = ref.read(trophyStateProvider);
 
-    final session = _routine.sessions.firstWhere(
-      (s) => s.date.isSameDayAs(_date),
-    );
-    final exercises = session.exercises;
+    final exercises = _session.exercises;
 
     final prTrophies = trophyState.prTrophies
-        .where((t) => t.contextData?.sessionId == session.id)
+        .where((t) => t.contextData?.sessionId == _session.id)
         .toList();
 
     return Column(
       spacing: 10,
       children: [
-        Card(child: SessionInfo(session)),
+        Card(child: SessionInfo(_session, ref.watch(ownerTimeZoneProvider))),
         if (prTrophies.isNotEmpty)
           SizedBox(
             width: double.infinity,
@@ -64,7 +85,7 @@ class DayLogWidget extends ConsumerWidget {
               color: theme.colorScheme.tertiaryContainer,
             ),
           ),
-        MuscleGroupsCard(session.logs),
+        MuscleGroupsCard(_session.logs),
 
         Column(
           spacing: 10,
@@ -82,7 +103,7 @@ class DayLogWidget extends ConsumerWidget {
                         translation.name,
                         style: Theme.of(context).textTheme.titleLarge,
                       ),
-                      ...session.logs
+                      ..._session.logs
                           .where((l) => l.exerciseId == exercise.id)
                           .map(
                             (log) => Row(
diff --git a/lib/features/routines/widgets/logs/exercise_log_chart.dart b/lib/features/routines/widgets/logs/exercise_log_chart.dart
index e570040e5..dde50476f 100644
--- a/lib/features/routines/widgets/logs/exercise_log_chart.dart
+++ b/lib/features/routines/widgets/logs/exercise_log_chart.dart
@@ -19,7 +19,7 @@
 import 'package:flutter/material.dart';
 import 'package:wger/core/colors.dart';
 import 'package:wger/core/misc.dart';
-import 'package:wger/features/measurements/widgets/charts.dart';
+import 'package:wger/core/widgets/legend.dart';
 import 'package:wger/features/routines/models/log.dart';
 import 'package:wger/features/routines/widgets/charts.dart';
 
diff --git a/lib/features/routines/widgets/logs/log_overview_routine.dart b/lib/features/routines/widgets/logs/log_overview_routine.dart
index 4418bc071..099b46d68 100644
--- a/lib/features/routines/widgets/logs/log_overview_routine.dart
+++ b/lib/features/routines/widgets/logs/log_overview_routine.dart
@@ -21,6 +21,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:table_calendar/table_calendar.dart';
 import 'package:wger/core/consts.dart';
+import 'package:wger/features/account/providers/user_profile_notifier.dart';
 import 'package:wger/features/routines/models/routine.dart';
 import 'package:wger/features/routines/widgets/logs/day_logs_container.dart';
 import 'package:wger/features/trophies/providers/trophy_notifier.dart';
@@ -47,7 +48,7 @@ class WorkoutLogs extends ConsumerWidget {
         ),
         SizedBox(
           width: double.infinity,
-          child: WorkoutLogCalendar(_routine),
+          child: WorkoutLogCalendar(_routine, ref.watch(ownerTimeZoneProvider)),
         ),
       ],
     );
@@ -64,7 +65,11 @@ class WorkoutLogEvent {
 class WorkoutLogCalendar extends StatefulWidget {
   final Routine _routine;
 
-  const WorkoutLogCalendar(this._routine);
+  /// The owner's IANA zone the day markers are cut in, null falls back to
+  /// the device zone
+  final String? _ownerZone;
+
+  const WorkoutLogCalendar(this._routine, this._ownerZone);
 
   @override
   _WorkoutLogCalendarState createState() => _WorkoutLogCalendarState();
@@ -94,9 +99,9 @@ class _WorkoutLogCalendarState extends State<WorkoutLogCalendar> {
 
   void loadEvents() {
     for (final session in widget._routine.sessions) {
-      _events[DateFormatLists.format(session.date)] = [
-        session.date,
-      ];
+      // One entry per session, the calendar draws a marker for each of them
+      final day = session.localDayIn(widget._ownerZone);
+      _events.putIfAbsent(DateFormatLists.format(day), () => []).add(day);
     }
 
     _selectedEvents.value = _getEventsForDay(_selectedDay!);
@@ -157,7 +162,8 @@ class _WorkoutLogCalendarState extends State<WorkoutLogCalendar> {
         ValueListenableBuilder<List<DateTime>>(
           valueListenable: _selectedEvents,
           builder: (context, logEvents, _) {
-            // At the moment there is only one "event" per day
+            // Every event of a day carries that same day, the widget below
+            // renders all sessions logged on it
             return logEvents.isNotEmpty
                 ? DayLogWidget(logEvents.first, widget._routine)
                 : Container();
diff --git a/lib/features/routines/widgets/logs/session_info.dart b/lib/features/routines/widgets/logs/session_info.dart
index 35cdc68a4..39e9b967a 100644
--- a/lib/features/routines/widgets/logs/session_info.dart
+++ b/lib/features/routines/widgets/logs/session_info.dart
@@ -25,7 +25,10 @@ import 'package:wger/l10n/generated/app_localizations.dart';
 class SessionInfo extends StatefulWidget {
   final WorkoutSession _session;
 
-  const SessionInfo(this._session);
+  /// The owner's IANA zone for the day header, null falls back to the device
+  final String? _ownerZone;
+
+  const SessionInfo(this._session, this._ownerZone);
 
   @override
   State<SessionInfo> createState() => _SessionInfoState();
@@ -47,7 +50,7 @@ class _SessionInfoState extends State<SessionInfo> {
               style: Theme.of(context).textTheme.headlineSmall,
             ),
             subtitle: Text(
-              localizedDate(context).format(widget._session.date),
+              localizedDate(context).format(widget._session.localDayIn(widget._ownerZone)),
             ),
             onTap: () => setState(() => editMode = !editMode),
             trailing: Icon(editMode ? Icons.edit_off : Icons.edit),
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 6b137d100..18130575b 100644
--- a/lib/l10n/app_de.arb
+++ b/lib/l10n/app_de.arb
@@ -32,10 +32,6 @@
     },
     "newNutritionalPlan": "Neuer Ernährungsplan",
     "delete": "Löschen",
-    "loadingText": "Wird geladen …",
-    "@loadingText": {
-        "description": "Text to show when entries are being loaded in the background: Loading..."
-    },
     "edit": "Bearbeiten",
     "newEntry": "Neuer Eintrag",
     "@newEntry": {
@@ -102,13 +98,8 @@
     "addMeal": "Mahlzeit hinzufügen",
     "meal": "Mahlzeit",
     "add": "Hinzufügen",
-    "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": {
@@ -126,10 +117,6 @@
     "@comment": {
         "description": "Comment, additional information"
     },
-    "goToToday": "Zu heute gehen",
-    "@goToToday": {
-        "description": "Label on button to jump back to 'today' in the calendar widget"
-    },
     "selectIngredient": "Bitte wähle eine Zutat",
     "@selectIngredient": {
         "description": "Error message when the user hasn't selected an ingredient from the autocompleter"
@@ -153,8 +140,6 @@
     },
     "logHelpEntriesUnits": "Beachte, dass nur Einträge mit einer Gewichtseinheit (kg oder lb) und Wiederholungen aufgezeichnet werden, andere Kombinationen wie Zeit oder „bis zum Versagen“ werden hier ignoriert.",
     "logHelpEntries": "Gibt es an einem Tag mehrere Einträge mit der gleichen Anzahl von Wiederholungen, aber unterschiedlichen Gewichten, wird nur der Eintrag mit dem höheren Gewicht im Diagramm angezeigt.",
-    "loginInstead": "Du hast bereits einen Account? Stattdessen anmelden",
-    "registerInstead": "Du hast keinen Account? Jetzt registrieren",
     "reset": "Zurücksetzen",
     "@reset": {
         "description": "Button text allowing the user to reset the entered values to the default"
@@ -191,14 +176,6 @@
     "@invalidUrl": {
         "description": "Error message when the user enters an invalid URL, e.g. in the login form"
     },
-    "useCustomServer": "Verwende Benutzerdefinierten Server",
-    "@useCustomServer": {
-        "description": "Toggle button allowing users to switch between the default and a custom wger server"
-    },
-    "useDefaultServer": "Verwende Standard-Server",
-    "@useDefaultServer": {
-        "description": "Toggle button allowing users to switch between the default and a custom wger server"
-    },
     "register": "Registrieren",
     "@register": {
         "description": "Text for registration button"
@@ -250,8 +227,6 @@
     "@selectExercise": {
         "description": "Error message when the user hasn't selected an exercise in the form"
     },
-    "selectExercises": "Wenn du einen Supersatz machen willst, kannst du nach mehreren Übungen suchen, sie werden dann gruppiert",
-    "sameRepetitions": "Wenn du für alle Sätze die gleichen Wiederholungen und das gleiche Gewicht verwendest, kannst du nur eine Zeile ausfüllen. Gebe z. B. für 4 Sätze einfach 10 für die Wiederholungen ein, daraus wird automatisch „4 × 10“.",
     "setNr": "Satz {nr}",
     "@setNr": {
         "description": "Header in form indicating the number of the current set. Can also be translated as something like 'Set Nr. xy'.",
@@ -326,16 +301,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",
@@ -359,11 +324,6 @@
     "@optionsLabel": {
         "description": "Label for the popup with general app options"
     },
-    "setUnitsAndRir": "Einheiten und RiR einstellen",
-    "@setUnitsAndRir": {
-        "description": "Label shown on the slider where the user can toggle showing units and RiR",
-        "type": "text"
-    },
     "searchExercise": "Suche Übung zum Hinzufügen",
     "@searchExercise": {
         "description": "Label on set form. Selected exercises are added to the set"
@@ -502,7 +462,6 @@
     "legs": "Beine",
     "shoulders": "Schultern",
     "barbell": "Langhantel",
-    "noMeasurementEntries": "Du hast keine Messeingaben",
     "moreMeasurementEntries": "Neue Messung hinzufügen",
     "@moreMeasurementEntries": {
         "description": "Message shown when the user wants to add new measurement"
@@ -587,7 +546,6 @@
         "description": "Message when an action completed successfully, usually used as a heading"
     },
     "pull_up_bar": "Klimmzugstange",
-    "verifiedEmailReason": "Du musst deine E-Mail verifizieren, um Übungen hinzuzufügen",
     "kettlebell": "Kugelhantel",
     "verifiedEmail": "Verifizierte E-Mail",
     "unVerifiedEmail": "Unverifizierte E-Mail",
@@ -654,7 +612,6 @@
     },
     "useMetric": "Metrische Einheiten für das Körpergewicht verwenden",
     "done": "Fertig",
-    "searchNamesInEnglish": "Namen auch auf Englisch suchen",
     "goalMacro": "Makroziele",
     "@goalMacro": {
         "description": "The goal for macronutrients"
@@ -675,39 +632,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)"
@@ -746,7 +670,6 @@
             }
         }
     },
-    "settingsIngredientCacheDescription": "Zutaten-Cache",
     "routines": "Routinen",
     "newRoutine": "Neue Routine",
     "noRoutines": "Du hast keine Routinen",
@@ -758,17 +681,6 @@
     "restDay": "Ruhetag",
     "copyToClipboard": "In Zwischenablage kopieren",
     "min": "Min",
-    "apiToken": "API Token",
-    "useApiToken": "API Token benutzen",
-    "useUsernameAndPassword": "Nutzername und Passwort benutzen",
-    "invalidApiToken": "Bitte geben Sie einen gültigen API-Schlüssel ein",
-    "@invalidApiToken": {
-        "description": "Error message when the user enters an invalid API key"
-    },
-    "apiTokenValidChars": "Ein API-Schlüssel darf nur die Buchstaben a-f und die Zahlen 0-9 enthalten und genau 40 Zeichen lang sein",
-    "@apiTokenValidChars": {
-        "description": "Error message when the user tries to input a API key with forbidden characters"
-    },
     "exerciseNr": "Übung {nr}",
     "@exerciseNr": {
         "description": "Header in form indicating the number of the current exercise. Can also be translated as something like 'Set Nr. xy'.",
@@ -820,7 +732,6 @@
     "aboutJoinCommunityTitle": "Treten Sie der Community bei",
     "aboutDiscordTitle": "Discord",
     "others": "Sonstiges",
-    "setHasProgression": "Set hat Fortschritt",
     "progressionRules": "Diese Übung unterliegt Fortschrittsregeln und kann in der mobilen App nicht bearbeitet werden. Bitte verwenden Sie die Webanwendung, um diese Übung zu bearbeiten.",
     "goalTypeBasic": "Normal",
     "@goalTypeBasic": {
@@ -849,7 +760,6 @@
     "@resistance_band": {
         "description": "Generated entry for translation for server strings"
     },
-    "setHasProgressionWarning": "Bitte beachten Sie, dass es derzeit nicht möglich ist, alle Einstellungen für ein Set in der mobilen Anwendung zu bearbeiten oder den automatischen Fortschritt zu konfigurieren. Nutzen Sie vorerst bitte die Webanwendung.",
     "useColors": "farbig",
     "barWeight": "Gewicht der Stange",
     "selectAvailablePlates": "Verfügbare Platten auswählen",
@@ -883,7 +793,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 +880,6 @@
             }
         }
     },
-    "superset": "Supersatz",
     "isVegan": "Vegan",
     "isVegetarian": "Vegetarisch",
     "filter": "Filtern",
@@ -1008,7 +916,6 @@
         }
     },
     "weightOrRepsRequired": "Bitte Gewicht, Wiederholungen oder beides eingeben",
-    "timeStartEndBothOrNeither": "Entweder Start- und Endzeit beide setzen oder beide leer lassen",
     "personalRecords": "Persönliche Rekorde",
     "noTrophies": "Du hast noch keine Trophäen",
     "preview": "Vorschau",
@@ -1057,10 +964,6 @@
     "@filterNutriscore": {
         "description": "Heading for the Nutri-Score slider in the ingredient search filter dialog"
     },
-    "filterNutriscoreOff": "Aus",
-    "@filterNutriscoreOff": {
-        "description": "Label for the first slider stop, which disables the Nutri-Score filter"
-    },
     "filterNutriscoreNoFilter": "Kein Filter",
     "@filterNutriscoreNoFilter": {
         "description": "Helper text shown under the Nutri-Score slider when it is at the Off position"
@@ -1170,5 +1073,108 @@
     "settingsVerboseLogging": "Ausführliches Protokoll",
     "settingsVerboseLoggingDescription": "Hilfreich, wenn du anhaltende Probleme meldest.",
     "syncStatusStalledNotStartedHint": "Die App hat eine Synchronisierung angefordert, sie wurde aber nie gestartet. Ein Neustart der App hilft meistens.",
-    "syncStatusStalledNotAppliedHint": "Es kommen Daten an, sie können aber nicht übernommen werden, deshalb erscheint nichts Neues. Melde das bitte zusammen mit den kopierten Details, dann können wir es beheben."
+    "syncStatusStalledNotAppliedHint": "Es kommen Daten an, sie können aber nicht übernommen werden, deshalb erscheint nichts Neues. Melde das bitte zusammen mit den kopierten Details, dann können wir es beheben.",
+    "whatToTrack": "Was möchtest du aufzeichnen?",
+    "customMeasurement": "Eigene Messung",
+    "metricAlreadyTracked": "Wird bereits aufgezeichnet",
+    "indicatorTrend": "Trend",
+    "off": "Aus",
+    "@off": {
+        "description": "Generic label for the option that switches something off, e.g. a filter or a line of a chart"
+    },
+    "aboutPrivacyPolicyTitle": "Nutzungsbedingungen und Datenschutz",
+    "reorderCategories": "Kategorien neu anordnen",
+    "metricCustom": "Benutzerdefiniert",
+    "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",
+    "metricSleep": "Schlaf",
+    "metricSleepTotal": "Gesamt",
+    "metricSleepLight": "Leicht",
+    "metricSleepDeep": "Tief",
+    "metricSleepRem": "REM",
+    "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",
+    "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}}",
+    "sessionTooLong": "Eine Trainingseinheit darf nicht länger als {hours} Stunden dauern",
+    "calculationValuesManual": "Von Hand eingetragen",
+    "calculationType": "Berechnung",
+    "calculationUnknown": "Diese Berechnung wurde in einer neueren Version von wger eingerichtet und kann hier nicht geändert werden.",
+    "calculationParamsIncomplete": "Die Berechnung ist noch nicht vollständig eingerichtet",
+    "calculationDuplicate": "Du hast bereits eine {name}-Kategorie mit diesen Einstellungen",
+    "calculationLocked": "Die Berechnung kann nicht geändert werden. Lösche die Kategorie, um sie zu beenden.",
+    "calculationMissingHeight": "In deinem Profil fehlt die Körpergröße, daher können noch keine Werte berechnet werden.",
+    "calculationNoSourceCategory": "Du hast noch keine andere Kategorie, aus der gelesen werden kann.",
+    "calculationBadge": "Berechnet",
+    "calculationEntryInfo": "Dieser Wert wird von wger berechnet und kann nicht geändert werden",
+    "calculationNameBmi": "BMI",
+    "calculationNameWhtr": "Taille-Größe-Verhältnis",
+    "calculationNameOneRepMax": "1RM",
+    "calculationNameOneRmTotal": "1RM-Summe",
+    "calculationDescriptionBmi": "Aus deinem Körpergewicht und der Körpergröße in deinem Profil",
+    "calculationDescriptionWhtr": "Aus {category} und der Körpergröße in deinem Profil",
+    "calculationParamCategory": "Quellkategorie",
+    "calculationParamMaxReps": "Maximale Wiederholungen",
+    "calculationParamWindowDays": "Zeitfenster in Tagen",
+    "calculationHelpExercises": "Zwischen {min} und {max} Übungen, {count} ausgewählt.",
+    "calculationHelpMaxReps": "{min} bis {max}. Sätze darüber werden ignoriert.",
+    "calculationHelpWindowDays": "{min} bis {max}. Wie weit zurück ein bester Satz zählt.",
+    "useDynamicColor": "Dynamische Farben verwenden"
 }
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 2305bfb31..9f77c663d 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",
@@ -531,11 +531,66 @@
   "min": "Min",
   "max": "Max",
   "@weight": {
-    "description": "The weight of a workout log or body weight entry"
+    "description": "The weight of a workout log or body weight entry, and the name of the body weight measurement category"
+  },
+  "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"
   },
-  "chartAllTimeTitle": "{name} all-time",
-  "@chartAllTimeTitle": {
-    "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
+  "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": {
-      "chartName": {
+      "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": {
+      "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,111 @@
   },
   "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": {
+    "description": "Metric type for a measurement category"
+  },
+  "reorderCategories": "Reorder categories",
+  "@reorderCategories": {
+    "description": "measurement categories reordering"
+  },
+  "metricCustom": "Custom",
+  "@metricCustom": {
+    "description": "Label for custom metric type"
+  },
+  "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"
+  },
+  "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",
+  "@metricSleepTotal": {
+    "description": "Component of the 'Sleep' category, listed under that heading, so 'sleep' is not repeated. The total time asleep in a night, all sleep stages together"
+  },
+  "metricSleepLight": "Light",
+  "@metricSleepLight": {
+    "description": "Component of the 'Sleep' category, listed under that heading, so 'sleep' is not repeated. The light sleep stage, meaning shallow sleep, never 'light' as in brightness or weight"
+  },
+  "metricSleepDeep": "Deep",
+  "@metricSleepDeep": {
+    "description": "Component of the 'Sleep' category, listed under that heading, so 'sleep' is not repeated. The deep sleep stage, also called slow-wave sleep"
+  },
+  "metricSleepRem": "REM",
+  "@metricSleepRem": {
+    "description": "Component of the 'Sleep' category, listed under that heading, so 'sleep' is not repeated. The REM (rapid eye movement) sleep stage, usually kept as the abbreviation"
+  },
+  "metricSleepAwake": "Awake",
+  "@metricSleepAwake": {
+    "description": "Component of the 'Sleep' category, listed under that heading. 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"
@@ -634,7 +900,7 @@
   },
   "energy": "Energy",
   "@energy": {
-    "description": "Energy in a meal, ingredient etc. e.g. in kJ"
+    "description": "Energy in a meal, ingredient etc. e.g. in kJ, and the name of the energy burned measurement category"
   },
   "energyShort": "E",
   "@energyShort": {
@@ -810,6 +1076,10 @@
   "aboutDiscordTitle": "Discord",
   "aboutViewDocsTitle": "Open documentation",
   "aboutViewLicensesTitle": "View licenses",
+  "aboutPrivacyPolicyTitle": "Terms and privacy policy",
+  "@aboutPrivacyPolicyTitle": {
+    "description": "Menu entry on the about page that opens the terms of service and privacy policy"
+  },
   "others": "Others",
   "calendar": "Calendar",
   "@calendar": {},
@@ -969,7 +1239,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 +1293,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 +1339,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 +1569,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"
@@ -1459,9 +1721,9 @@
   "@filterNutriscore": {
     "description": "Heading for the Nutri-Score slider in the ingredient search filter dialog"
   },
-  "filterNutriscoreOff": "Off",
-  "@filterNutriscoreOff": {
-    "description": "Label for the first slider stop, which disables the Nutri-Score filter"
+  "off": "Off",
+  "@off": {
+    "description": "Generic label for the option that switches something off, e.g. a filter or a line of a chart"
   },
   "filterNutriscoreNoFilter": "No filter",
   "@filterNutriscoreNoFilter": {
@@ -1501,8 +1763,210 @@
   "@weightOrRepsRequired": {
     "description": "Validation error when both weight and repetitions are empty in a workout log"
   },
-  "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"
+  "sessionTooLong": "A session cannot be longer than {hours} hours",
+  "@sessionTooLong": {
+    "description": "Validation error when a workout session exceeds the maximum length",
+    "placeholders": {
+      "hours": {
+        "type": "int"
+      }
+    }
+  },
+  "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"
+  },
+  "calculationValuesManual": "Entered by hand",
+  "@calculationValuesManual": {
+    "description": "One of two options when creating a measurement category: the user types the values in themselves. The other option is 'Calculated'"
+  },
+  "calculationType": "Calculation",
+  "@calculationType": {
+    "description": "Label of the field that picks what the server calculates for a category"
+  },
+  "calculationUnknown": "This calculation was set up in a newer version of wger and cannot be changed here.",
+  "@calculationUnknown": {
+    "description": "Shown when the server uses a calculation type this version of the app does not know"
+  },
+  "calculationParamsIncomplete": "The calculation is not configured completely yet",
+  "@calculationParamsIncomplete": {
+    "description": "Validation error when a calculation is still missing one of its settings"
+  },
+  "calculationDuplicate": "You already have a {name} category with these settings",
+  "@calculationDuplicate": {
+    "description": "Refuses a second calculated category that would compute exactly the same series",
+    "placeholders": {
+      "name": { "type": "String", "example": "Waist to height ratio" }
+    }
+  },
+  "calculationLocked": "The calculation cannot be changed. Delete the category to stop calculating it.",
+  "@calculationLocked": {
+    "description": "Helper text under the disabled calculation picker when editing a category that already calculates"
+  },
+  "calculationMissingHeight": "The height in your profile is missing, so no values can be computed yet.",
+  "@calculationMissingHeight": {
+    "description": "Warning shown when a calculation needs the height from the user profile but it is not set"
+  },
+  "calculationNoSourceCategory": "You have no other category to read from yet.",
+  "@calculationNoSourceCategory": {
+    "description": "Shown when a calculation needs another measurement category to read from and the user has none yet"
+  },
+  "calculationBadge": "Calculated",
+  "@calculationBadge": {
+    "description": "Badge marking a measurement category whose values the server computes, and the matching option when creating one. Keep it short, it sits next to a category title and opposite 'Entered by hand'"
+  },
+  "calculationEntryInfo": "This value is calculated by wger and cannot be edited",
+  "@calculationEntryInfo": {
+    "description": "Tooltip on a measurement entry that wger computed, so it cannot be edited by hand"
+  },
+  "calculationNameBmi": "BMI",
+  "@calculationNameBmi": {
+    "description": "Body mass index, the name of a calculated measurement category. It is also prefilled as the category name and stored, so keep it short. Usually left as the abbreviation"
+  },
+  "calculationNameWhtr": "Waist to height ratio",
+  "@calculationNameWhtr": {
+    "description": "Name of a calculated category: waist circumference divided by height. It is also prefilled as the category name and stored, so keep it short"
+  },
+  "calculationNameOneRepMax": "One-rep max",
+  "@calculationNameOneRepMax": {
+    "description": "Name of a calculated category: the heaviest weight liftable for a single repetition. It is also prefilled as the category name and stored, so keep it short"
+  },
+  "calculationNameOneRmTotal": "One-rep max total",
+  "@calculationNameOneRmTotal": {
+    "description": "Name of a calculated category: the one-rep maxima of several exercises added up. It is also prefilled as the category name and stored, so keep it short"
+  },
+  "calculationDescriptionBmi": "From your body weight and the height in your profile",
+  "@calculationDescriptionBmi": {
+    "description": "Explains where a calculated category takes its numbers from, shown under the calculation type picker"
+  },
+  "calculationDescriptionWhtr": "From {category} and the height in your profile",
+  "@calculationDescriptionWhtr": {
+    "description": "Explains where a calculated category takes its numbers from. {category} is the name of another measurement category, e.g. 'Waist'",
+    "placeholders": {
+      "category": { "type": "String", "example": "Waist" }
+    }
+  },
+  "calculationParamCategory": "Source category",
+  "@calculationParamCategory": {
+    "description": "Form field label: which other measurement category a calculation reads its values from"
+  },
+  "calculationParamMaxReps": "Max reps counted",
+  "@calculationParamMaxReps": {
+    "description": "Form field label: the highest number of repetitions a set may have to still count"
+  },
+  "calculationParamWindowDays": "Window in days",
+  "@calculationParamWindowDays": {
+    "description": "Form field label: how many days back the calculation looks for a best set"
+  },
+  "calculationHelpExercises": "Between {min} and {max} exercises, {count} selected.",
+  "@calculationHelpExercises": {
+    "description": "Helper text under the exercise picker of a calculated category. {count} is how many are picked so far",
+    "placeholders": {
+      "min": { "type": "int" },
+      "max": { "type": "int" },
+      "count": { "type": "int" }
+    }
+  },
+  "calculationHelpMaxReps": "{min} to {max}. Sets above this are ignored.",
+  "@calculationHelpMaxReps": {
+    "description": "Helper text under the 'Max reps counted' field. Sets with more repetitions than this are left out of the calculation",
+    "placeholders": {
+      "min": { "type": "int" },
+      "max": { "type": "int" }
+    }
+  },
+  "calculationHelpWindowDays": "{min} to {max}. How far back a best set counts.",
+  "@calculationHelpWindowDays": {
+    "description": "Helper text under the 'Window in days' field, how many days back a best set still counts",
+    "placeholders": {
+      "min": { "type": "int" },
+      "max": { "type": "int" }
+    }
   }
 }
diff --git a/lib/l10n/app_es.arb b/lib/l10n/app_es.arb
index a445e6729..eeb9974c7 100644
--- a/lib/l10n/app_es.arb
+++ b/lib/l10n/app_es.arb
@@ -50,10 +50,6 @@
     "@enterValue": {
         "description": "Error message when the user hasn't entered a value on a required field"
     },
-    "goToToday": "Ir a \"hoy\"",
-    "@goToToday": {
-        "description": "Label on button to jump back to 'today' in the calendar widget"
-    },
     "calendar": "Calendario",
     "aboutDescription": "¡Gracias por usar wger! wger es un proyecto colaborativo de código abierto, realizado por entusiastas del fitness de todo el planeta.",
     "@aboutDescription": {
@@ -75,10 +71,6 @@
         }
     },
     "delete": "Borrar",
-    "loadingText": "Cargando...",
-    "@loadingText": {
-        "description": "Text to show when entries are being loaded in the background: Loading..."
-    },
     "edit": "Editar",
     "noWeightEntries": "No tienes entradas de peso registradas",
     "@noWeightEntries": {
@@ -157,7 +149,6 @@
     "@addSet": {
         "description": "Label for the button that adds a set (to a workout day)"
     },
-    "cancel": "Cancelar",
     "save": "Guardar",
     "description": "Descripción",
     "logHelpEntriesUnits": "Tenga en cuenta que solo se registran las entradas con una unidad de peso (kg o lb) y las repeticiones; aquí se ignoran otras combinaciones, como el tiempo o hasta el fallo.",
@@ -167,11 +158,6 @@
     "@gymMode": {
         "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": {
@@ -185,7 +171,6 @@
     "@impression": {
         "description": "General impression (e.g. for a workout session) such as good, bad, etc."
     },
-    "sameRepetitions": "Si haces las mismas repeticiones y el mismo peso para todas las series, solo puedes completar una fila. Por ejemplo, para 4 series solo ingrese 10 para las repeticiones, esto automáticamente se convierte en \"4 x 10\".",
     "comment": "Comentar",
     "@comment": {
         "description": "Comment, additional information"
@@ -244,8 +229,6 @@
     "@labelWorkoutLogs": {
         "description": "(Workout) logs"
     },
-    "loginInstead": "¿Ya tiene una cuenta? Inicia sesión",
-    "registerInstead": "¿No tienes una cuenta? Regístrate ahora",
     "reset": "Reiniciar",
     "@reset": {
         "description": "Button text allowing the user to reset the entered values to the default"
@@ -282,14 +265,6 @@
     "@invalidUrl": {
         "description": "Error message when the user enters an invalid URL, e.g. in the login form"
     },
-    "useCustomServer": "Utilizar un servidor personalizado",
-    "@useCustomServer": {
-        "description": "Toggle button allowing users to switch between the default and a custom wger server"
-    },
-    "useDefaultServer": "Usar el servidor predeterminado",
-    "@useDefaultServer": {
-        "description": "Toggle button allowing users to switch between the default and a custom wger server"
-    },
     "register": "Registrarse",
     "@register": {
         "description": "Text for registration button"
@@ -314,16 +289,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",
@@ -439,11 +404,6 @@
     "@gPerBodyKg": {
         "description": "Label used for total sums of e.g. calories or similar in grams per Kg of body weight"
     },
-    "setUnitsAndRir": "Unidades de serie y ReR",
-    "@setUnitsAndRir": {
-        "description": "Label shown on the slider where the user can toggle showing units and RiR",
-        "type": "text"
-    },
     "recentlyUsedIngredients": "Ingredientes añadidos recientemente",
     "@recentlyUsedIngredients": {
         "description": "A message when a user adds a new ingredient to a meal."
@@ -490,7 +450,6 @@
     "@close": {
         "description": "Translation for close"
     },
-    "noMeasurementEntries": "No has ingresado medidas",
     "moreMeasurementEntries": "Agrega una nueva medida",
     "@moreMeasurementEntries": {
         "description": "Message shown when the user wants to add new measurement"
@@ -582,11 +541,9 @@
     },
     "add_exercise_image_license": "Las imágenes deben ser compatibles con la licencia CC BY SA. Si tienes dudas, sube solamente fotos que hayas tomado tú mismo.",
     "biceps": "Bíceps",
-    "verifiedEmailReason": "Necesitas verificar tu correo electrónico para contribuir con ejercicios",
     "pull_up_bar": "Barra de dominadas",
     "shoulders": "Hombros",
     "sz_bar": "Barra SZ",
-    "searchNamesInEnglish": "También busque nombres en Ingles",
     "cacheWarning": "Debido al cache, puede tomar un tiempo hasta que los cambios sean visibles en toda la aplicación.",
     "cardio": "Aerobico",
     "contributeExerciseWarning": "Sólo puedes contribuir ejercicios únicamente si tu cuenta tiene más de {days} días y tu email está verificado",
@@ -648,23 +605,11 @@
         "description": "Message returned if no exercises match the searched string"
     },
     "aboutMastodonTitle": "Mastodon",
-    "settingsExerciseCacheDescription": "Cache de ejercicios",
     "aboutDonateTitle": "Realizar una donación",
     "aboutDonateText": "Si bien el proyecto es gratuito y siempre lo seguirá siendo, ¡ejecutar el servidor no lo es! El desarrollo también requiere mucho tiempo y esfuerzo por parte de los voluntarios. Su contribución respalda directamente estos costos, lo que ayuda a mantener el servicio confiable.",
     "selectAvailablePlates": "Elige los discos disponibles",
     "barWeight": "Peso de la barra",
     "useColors": "Usar colores",
-    "useApiToken": "Usar tokens API",
-    "useUsernameAndPassword": "Utilizar usuario y contraseña",
-    "apiToken": "Token API",
-    "invalidApiToken": "Por favor, Introduzca una clave API válida",
-    "@invalidApiToken": {
-        "description": "Error message when the user enters an invalid API key"
-    },
-    "apiTokenValidChars": "Una clave API solo puede contener las letras a-f, números 0-9 y tener exactamente 40 caracteres de longitud",
-    "@apiTokenValidChars": {
-        "description": "Error message when the user tries to input a API key with forbidden characters"
-    },
     "noIngredientsDefined": "Aún no se definen ingredientes",
     "routines": "Rutinas",
     "newRoutine": "Nueva rutina",
@@ -733,29 +678,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",
@@ -807,7 +729,6 @@
     "fitInWeekHelp": "Si está activado, los días se repetirán en un ciclo semanal, de la otra manera, los días serán secuenciales sin importar el inicio de una nueva semana.",
     "addSuperset": "Añadir superserie",
     "setHasNoExercises": "¡Esta rutina no tiene ejercicios!",
-    "settingsIngredientCacheDescription": "Cache de ingredientes",
     "simpleMode": "Modo simple",
     "simpleModeHelp": "Ocultar ajustes avanzados cuando se editan los ejercicios",
     "progressionRules": "Este ejercicio tiene reglas de progresión y no puede ser editado en la aplicación móvil. Por favor, usa la aplicación web para editarlo.",
@@ -843,29 +764,12 @@
     "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",
-    "creationDate": "Fecha de comienzo",
-    "@creationDate": {
-        "description": "The Start date of a nutritional plan"
-    },
     "openEnded": "Indefinido",
     "@openEnded": {
         "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": {
@@ -911,22 +815,6 @@
         "description": "Add button text"
     },
     "enterTextInLanguage": "¡Por favor ingrese el texto en el idioma correcto!",
-    "galleryImageTypeNotSupported": "Las imágenes {imageType} actualmente no son compatibles con esta plataforma.",
-    "@galleryImageTypeNotSupported": {
-        "placeholders": {
-            "imageType": {
-                "type": "String"
-            }
-        }
-    },
-    "galleryImageTypeNotSupportedDetail": "Esta imagen está en formato {imageType}, que actualmente no es compatible con esta plataforma.",
-    "@galleryImageTypeNotSupportedDetail": {
-        "placeholders": {
-            "imageType": {
-                "type": "String"
-            }
-        }
-    },
     "dayTypeCustom": "Personalizado",
     "dayTypeAmrap": "Tantas rondas como sea posible",
     "dayTypeHiit": "Entrenamiento en intervalos de alta intensidad",
@@ -970,7 +858,6 @@
             }
         }
     },
-    "superset": "Superserie",
     "endWorkout": "Finalizar entrenamiento",
     "@endWorkout": {
         "description": "Use the imperative, label on button to finish the current workout in gym mode"
@@ -1091,10 +978,6 @@
     "@filterNutriscore": {
         "description": "Heading for the Nutri-Score slider in the ingredient search filter dialog"
     },
-    "filterNutriscoreOff": "Apagado",
-    "@filterNutriscoreOff": {
-        "description": "Label for the first slider stop, which disables the Nutri-Score filter"
-    },
     "filterNutriscoreNoFilter": "Sin filtro",
     "@filterNutriscoreNoFilter": {
         "description": "Helper text shown under the Nutri-Score slider when it is at the Off position"
@@ -1192,7 +1075,6 @@
     "syncStatusNeverSynced": "Aún no sincronizado",
     "sessionExpired": "Tu sesión ha expirado, inicia sesión de nuevo",
     "weightOrRepsRequired": "Introduce un peso, repeticiones o ambos",
-    "timeStartEndBothOrNeither": "Indica la hora de inicio y de fin, o deja ambas vacías",
     "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",
@@ -1209,5 +1091,108 @@
     "settingsVerboseLogging": "Registro detallado",
     "settingsVerboseLoggingDescription": "Útil cuando informas de problemas persistentes.",
     "syncStatusStalledNotStartedHint": "La aplicación solicitó sincronizar, pero la sincronización nunca se inició. Reiniciar la aplicación suele solucionarlo.",
-    "syncStatusStalledNotAppliedHint": "Están llegando datos, pero no se pueden aplicar, así que no aparece nada nuevo. Infórmanos del problema junto con los detalles copiados para que podamos solucionarlo."
+    "syncStatusStalledNotAppliedHint": "Están llegando datos, pero no se pueden aplicar, así que no aparece nada nuevo. Infórmanos del problema junto con los detalles copiados para que podamos solucionarlo.",
+    "whatToTrack": "¿Qué quieres registrar?",
+    "customMeasurement": "Medición personalizada",
+    "metricAlreadyTracked": "Ya se está registrando",
+    "indicatorTrend": "tendencia",
+    "off": "Apagado",
+    "@off": {
+        "description": "Generic label for the option that switches something off, e.g. a filter or a line of a chart"
+    },
+    "aboutPrivacyPolicyTitle": "Términos y política de privacidad",
+    "reorderCategories": "Reordenar categorías",
+    "metricCustom": "Personalizado",
+    "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",
+    "metricSleep": "Sueño",
+    "metricSleepTotal": "Total",
+    "metricSleepLight": "Ligero",
+    "metricSleepDeep": "Profundo",
+    "metricSleepRem": "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",
+    "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}}",
+    "sessionTooLong": "Una sesión de entrenamiento no puede durar más de {hours} horas",
+    "calculationValuesManual": "Introducido a mano",
+    "calculationType": "Cálculo",
+    "calculationUnknown": "Este cálculo se configuró en una versión más reciente de wger y no se puede cambiar aquí.",
+    "calculationParamsIncomplete": "El cálculo todavía no está configurado por completo",
+    "calculationDuplicate": "Ya tienes una categoría {name} con estos ajustes",
+    "calculationLocked": "El cálculo no se puede cambiar. Borra la categoría para dejar de calcularla.",
+    "calculationMissingHeight": "Falta la altura en tu perfil, por lo que todavía no se pueden calcular valores.",
+    "calculationNoSourceCategory": "Todavía no tienes otra categoría de la que leer.",
+    "calculationBadge": "Calculado",
+    "calculationEntryInfo": "Este valor lo calcula wger y no se puede editar",
+    "calculationNameBmi": "IMC",
+    "calculationNameWhtr": "Relación cintura-estatura",
+    "calculationNameOneRepMax": "1RM",
+    "calculationNameOneRmTotal": "Suma de 1RM",
+    "calculationDescriptionBmi": "De tu peso corporal y la altura de tu perfil",
+    "calculationDescriptionWhtr": "De {category} y la altura de tu perfil",
+    "calculationParamCategory": "Categoría de origen",
+    "calculationParamMaxReps": "Repeticiones máximas contadas",
+    "calculationParamWindowDays": "Ventana en días",
+    "calculationHelpExercises": "Entre {min} y {max} ejercicios, {count} seleccionados.",
+    "calculationHelpMaxReps": "De {min} a {max}. Las series por encima se ignoran.",
+    "calculationHelpWindowDays": "De {min} a {max}. Hasta dónde cuenta la mejor serie.",
+    "useDynamicColor": "Usar color dinámico"
 }
diff --git a/lib/l10n/app_fa.arb b/lib/l10n/app_fa.arb
index 57fe4d229..fdce9afa0 100644
--- a/lib/l10n/app_fa.arb
+++ b/lib/l10n/app_fa.arb
@@ -16,14 +16,6 @@
     "@register": {
         "description": "Text for registration button"
     },
-    "useDefaultServer": "استفاده از سرور پیش فرض",
-    "@useDefaultServer": {
-        "description": "Toggle button allowing users to switch between the default and a custom wger server"
-    },
-    "useCustomServer": "استفاده از سرور سفارشی (خصوصی)",
-    "@useCustomServer": {
-        "description": "Toggle button allowing users to switch between the default and a custom wger server"
-    },
     "edit": "ویرایش",
     "invalidUrl": "لطفا یک لینک معتبر وارد کنید",
     "@invalidUrl": {
@@ -65,21 +57,10 @@
     "@start": {
         "description": "Label on button to start the gym mode (i.e., an imperative)"
     },
-    "useApiToken": "استفاده از توکن API",
-    "useUsernameAndPassword": "استفاده از نام کاربری و رمز عبور",
     "comment": "نظر",
     "@comment": {
         "description": "Comment, additional information"
     },
-    "apiToken": "توکن API",
-    "invalidApiToken": "لطفا یک کلید API معتبر وارد کنید",
-    "@invalidApiToken": {
-        "description": "Error message when the user enters an invalid API key"
-    },
-    "apiTokenValidChars": "یک کلید API می‌تواند فقط شامل حروف انگلیسی a تا f، اعداد انگلیسی 0 تا 9 و دقیقاً 40 کاراکتر باشد",
-    "@apiTokenValidChars": {
-        "description": "Error message when the user tries to input a API key with forbidden characters"
-    },
     "customServerUrl": "آدرس اینترنتی (URL) به منبع WGER",
     "@customServerUrl": {
         "description": "Label in the form where the users can enter their own wger instance"
@@ -92,8 +73,6 @@
     "@reset": {
         "description": "Button text allowing the user to reset the entered values to the default"
     },
-    "registerInstead": "حساب کاربری ندارید؟ همین حالا ثبت نام کنید",
-    "loginInstead": "حساب کاربری دارید؟ وارد شوید",
     "nutritionalPlan": "برنامه غذایی",
     "labelBottomNavWorkout": "تمرین ورزشی",
     "@labelBottomNavWorkout": {
@@ -137,11 +116,6 @@
         "description": "The value of a measurement entry"
     },
     "newDay": "روز جدید",
-    "newSet": "مجموعه جدید",
-    "@newSet": {
-        "description": "Header when adding a new set to a workout day"
-    },
-    "selectExercises": "اگر می‌خواهید مجموعه ای از حرکات را انجام دهید، می‌توانید چندین تمرین را جستجو کنید، آنها در یک گروه قرار می‌گیرند",
     "gymMode": "حالت باشگاه",
     "@gymMode": {
         "description": "Label when starting the gym mode"
@@ -225,39 +199,6 @@
     },
     "min": "حداقل",
     "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": "اندازه گیری",
     "measurements": "اندازه گیری ها",
     "@measurements": {
@@ -265,10 +206,6 @@
     },
     "measurementCategoriesHelpText": "دسته اندازه گیری ، مانند \"دوسر\" یا \"چربی بدن\"",
     "measurementEntriesHelpText": "واحد مورد استفاده برای اندازه گیری دسته مانند \"سانتی متر\" یا \"٪\"",
-    "creationDate": "تاریخ شروع",
-    "@creationDate": {
-        "description": "The Start date of a nutritional plan"
-    },
     "endDate": "تاریخ پایان",
     "@endDate": {
         "description": "The End date of a nutritional plan"
@@ -321,7 +258,6 @@
     "@noMatchingExerciseFound": {
         "description": "Message returned if no exercises match the searched string"
     },
-    "searchNamesInEnglish": "اسامی را به زبان انگلیسی هم جستجو کنید",
     "equipment": "تجهیزات",
     "@equipment": {
         "description": "Equipment needed to perform an exercise"
diff --git a/lib/l10n/app_fr.arb b/lib/l10n/app_fr.arb
index fe1d8096a..f70cd5723 100644
--- a/lib/l10n/app_fr.arb
+++ b/lib/l10n/app_fr.arb
@@ -27,10 +27,6 @@
     "@enterValue": {
         "description": "Error message when the user hasn't entered a value on a required field"
     },
-    "goToToday": "Aller à aujourd’hui",
-    "@goToToday": {
-        "description": "Label on button to jump back to 'today' in the calendar widget"
-    },
     "calendar": "Calendrier",
     "toggleDetails": "Afficher les détails",
     "@toggleDetails": {
@@ -38,10 +34,6 @@
     },
     "newNutritionalPlan": "Nouveau programme nutritionnel",
     "delete": "Supprimer",
-    "loadingText": "Chargement…",
-    "@loadingText": {
-        "description": "Text to show when entries are being loaded in the background: Loading..."
-    },
     "edit": "Modifier",
     "noWeightEntries": "Aucune entrée de poids",
     "@noWeightEntries": {
@@ -112,17 +104,12 @@
     "addMeal": "Ajouter un repas",
     "meal": "Repas",
     "add": "Ajouter",
-    "cancel": "Supprimer",
     "save": "Sauvegarder",
     "description": "Description",
     "gymMode": "Mode entraînement",
     "@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": {
@@ -165,16 +152,10 @@
     "@labelWorkoutPlan": {
         "description": "Title for screen workout plan"
     },
-    "registerInstead": "Vous n'avez pas de compte ? Inscrivez-vous maintenant",
-    "loginInstead": "Déjà un compte ? Connectez-vous",
     "reset": "Réinitialiser",
     "@reset": {
         "description": "Button text allowing the user to reset the entered values to the default"
     },
-    "useCustomServer": "Utiliser un serveur personnalisé",
-    "@useCustomServer": {
-        "description": "Toggle button allowing users to switch between the default and a custom wger server"
-    },
     "customServerHint": "Entrez l’adresse de votre propre serveur, sinon le serveur par défaut sera utilisé",
     "@customServerHint": {
         "description": "Hint text for the form where the users can enter their own wger instance"
@@ -207,10 +188,6 @@
     "@invalidUrl": {
         "description": "Error message when the user enters an invalid URL, e.g. in the login form"
     },
-    "useDefaultServer": "Utiliser le serveur par défaut",
-    "@useDefaultServer": {
-        "description": "Toggle button allowing users to switch between the default and a custom wger server"
-    },
     "register": "S’inscrire",
     "@register": {
         "description": "Text for registration button"
@@ -270,8 +247,6 @@
         "description": "Label for the button that adds a set (to a workout day)"
     },
     "todaysWorkout": "Entraînement d’aujourd’hui",
-    "selectExercises": "Si vous voulez faire une supersérie, vous pouvez rechercher plusieurs exercices, ils seront regroupés",
-    "sameRepetitions": "Si vous faites les mêmes répétitions et le même poids pour toutes les séries, vous pouvez simplement remplir une ligne. Par exemple, pour 4 séries, il suffit d’entrer 10 pour les répétitions, ce qui devient automatiquement « 4 × 10 ».",
     "setNr": "Série {nr}",
     "@setNr": {
         "description": "Header in form indicating the number of the current set. Can also be translated as something like 'Set Nr. xy'.",
@@ -323,16 +298,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",
@@ -347,11 +312,6 @@
     "@optionsLabel": {
         "description": "Label for the popup with general app options"
     },
-    "setUnitsAndRir": "Définir les unités et RiR",
-    "@setUnitsAndRir": {
-        "description": "Label shown on the slider where the user can toggle showing units and RiR",
-        "type": "text"
-    },
     "goToDetailPage": "Aller à la page de détails",
     "jumpTo": "Aller à",
     "@jumpTo": {
@@ -534,7 +494,6 @@
         },
         "description": "List of alternative names for an exercise"
     },
-    "verifiedEmailReason": "Vous devez vérifier votre adresse e-mail pour contribuer aux exercices",
     "verifiedEmailInfo": "Un email de vérification a été envoyé à {email}",
     "@verifiedEmailInfo": {
         "placeholders": {
@@ -574,7 +533,6 @@
     "miles": "Miles",
     "legs": "Jambes",
     "quads": "Quadriceps",
-    "noMeasurementEntries": "Vous n'avez pas d'entrées de mesure",
     "aboutPageTitle": "À propos de nous et assistance",
     "userProfile": "Votre profil",
     "exerciseList": "Liste d'exercices",
@@ -629,7 +587,6 @@
     "@lb": {
         "description": "Generated entry for translation for server strings"
     },
-    "searchNamesInEnglish": "Recherchez également des noms en anglais",
     "max_reps": "Reps Maxi",
     "@max_reps": {
         "description": "Generated entry for translation for server strings"
@@ -699,7 +656,6 @@
     "aboutDonateText": "Si le projet est gratuit et le restera, l'exploitation du serveur ne l'est pas ! Le développement requiert également beaucoup de temps et d'efforts de la part des bénévoles. Votre contribution finance directement ces coûts et contribue à la fiabilité du service.",
     "settingsTitle": "Paramètres",
     "settingsCacheTitle": "Cache",
-    "settingsExerciseCacheDescription": "Cache d'exercices",
     "settingsCacheDeletedSnackbar": "Cache nettoyé avec succès",
     "log": "Journaliser",
     "@log": {
@@ -709,32 +665,11 @@
     "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",
     "newRoutine": "Nouvelle routine",
     "noRoutines": "Vous n’avez aucune de routine",
-    "useUsernameAndPassword": "Utiliser le nom d’utilisateur et mot de passe",
     "routines": "Routines",
     "restTime": "Temps de repos",
     "restDay": "Jour de repos",
@@ -749,7 +684,6 @@
             }
         }
     },
-    "apiToken": "Jeton API",
     "routineDays": "Jours de routine",
     "resultingRoutine": "Routine résultante",
     "errorInfoDescription": "Nous sommes désolés, mais quelque chose s'est mal passé. Vous pouvez nous aider à résoudre ce problème en le signalant sur GitHub.",
@@ -773,30 +707,8 @@
     "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",
-    "apiTokenValidChars": "Une clé API ne peut contenir que les lettres a-f, les chiffres 0-9 et 40 caractères exactement",
-    "@apiTokenValidChars": {
-        "description": "Error message when the user tries to input a API key with forbidden characters"
-    },
-    "invalidApiToken": "Veuillez saisir une clé API valide",
-    "@invalidApiToken": {
-        "description": "Error message when the user enters an invalid API key"
-    },
     "exerciseNr": "Exercice {nr}",
     "@exerciseNr": {
         "description": "Header in form indicating the number of the current exercise. Can also be translated as something like 'Set Nr. xy'.",
@@ -830,11 +742,8 @@
     "@toAddMealsToThePlanGoToNutritionalPlanDetails": {
         "description": "Message shown to guide users to the nutritional plan details page to add meals"
     },
-    "setHasProgression": "La série a une progression",
     "aboutContributeTitle": "Contribuer",
-    "setHasProgressionWarning": "Veuillez noter qu'il n'est actuellement pas possible de modifier tous les paramètres d'une série sur l'application mobile ni de configurer la progression automatique. Pour l'instant, veuillez utiliser l'application web.",
     "setHasNoExercises": "Cette série n'a pas encore d'exercices !",
-    "settingsIngredientCacheDescription": "Cache d'ingrédients",
     "simpleMode": "Mode simple",
     "simpleModeHelp": "Masquer certains des paramètres les plus avancés lors de l'édition des exercices",
     "progressionRules": "Cet exercice a des règles de progression et ne peut pas être édité sur l'application mobile. Veuillez utiliser l'application web pour éditer cet exercice.",
@@ -877,7 +786,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 +872,6 @@
             }
         }
     },
-    "superset": "Superset",
     "personalRecords": "Enregistrements personnels",
     "noTrophies": "Vous n'avez pas encore de trophées",
     "serverUpdateTitle": "Mise à jour du serveur requise",
@@ -1062,10 +969,6 @@
     "@filterNutriscore": {
         "description": "Heading for the Nutri-Score slider in the ingredient search filter dialog"
     },
-    "filterNutriscoreOff": "Off",
-    "@filterNutriscoreOff": {
-        "description": "Label for the first slider stop, which disables the Nutri-Score filter"
-    },
     "filterNutriscoreNoFilter": "Pas de filtre",
     "@filterNutriscoreNoFilter": {
         "description": "Helper text shown under the Nutri-Score slider when it is at the Off position"
@@ -1163,7 +1066,6 @@
     "syncStatusNeverSynced": "Pas encore synchronisé",
     "sessionExpired": "Votre session a expiré, veuillez vous reconnecter",
     "weightOrRepsRequired": "Veuillez saisir un poids, des répétitions, ou les deux",
-    "timeStartEndBothOrNeither": "Indiquez l'heure de début et de fin, ou laissez les deux vides",
     "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",
@@ -1180,5 +1082,108 @@
     "settingsVerboseLogging": "Journalisation détaillée",
     "settingsVerboseLoggingDescription": "Utile lorsque vous signalez des problèmes persistants.",
     "syncStatusStalledNotStartedHint": "L'application a demandé une synchronisation, mais celle-ci n'a jamais démarré. Redémarrer l'application suffit généralement.",
-    "syncStatusStalledNotAppliedHint": "Des données arrivent mais ne peuvent pas être appliquées, donc rien de nouveau n'apparaît. Signalez-le avec les détails copiés pour que nous puissions le corriger."
+    "syncStatusStalledNotAppliedHint": "Des données arrivent mais ne peuvent pas être appliquées, donc rien de nouveau n'apparaît. Signalez-le avec les détails copiés pour que nous puissions le corriger.",
+    "whatToTrack": "Que voulez-vous suivre ?",
+    "customMeasurement": "Mesure personnalisée",
+    "metricAlreadyTracked": "Déjà suivi",
+    "indicatorTrend": "tendance",
+    "off": "Off",
+    "@off": {
+        "description": "Generic label for the option that switches something off, e.g. a filter or a line of a chart"
+    },
+    "aboutPrivacyPolicyTitle": "Conditions et politique de confidentialité",
+    "reorderCategories": "Réorganiser les catégories",
+    "metricCustom": "Personnalisé",
+    "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",
+    "metricSleep": "Sommeil",
+    "metricSleepTotal": "Total",
+    "metricSleepLight": "Léger",
+    "metricSleepDeep": "Profond",
+    "metricSleepRem": "REM",
+    "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é",
+    "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}}",
+    "sessionTooLong": "Une session d’entraînement ne peut pas durer plus de {hours} heures",
+    "calculationValuesManual": "Saisi à la main",
+    "calculationType": "Calcul",
+    "calculationUnknown": "Ce calcul a été configuré dans une version plus récente de wger et ne peut pas être modifié ici.",
+    "calculationParamsIncomplete": "Le calcul n'est pas encore entièrement configuré",
+    "calculationDuplicate": "Vous avez déjà une catégorie {name} avec ces réglages",
+    "calculationLocked": "Le calcul ne peut pas être modifié. Supprimez la catégorie pour arrêter de la calculer.",
+    "calculationMissingHeight": "La taille manque dans votre profil, aucune valeur ne peut donc encore être calculée.",
+    "calculationNoSourceCategory": "Vous n'avez pas encore d'autre catégorie dans laquelle puiser.",
+    "calculationBadge": "Calculé",
+    "calculationEntryInfo": "Cette valeur est calculée par wger et ne peut pas être modifiée",
+    "calculationNameBmi": "IMC",
+    "calculationNameWhtr": "Rapport taille-hauteur",
+    "calculationNameOneRepMax": "1RM",
+    "calculationNameOneRmTotal": "Total 1RM",
+    "calculationDescriptionBmi": "À partir de votre poids et de la taille indiquée dans votre profil",
+    "calculationDescriptionWhtr": "À partir de {category} et de la taille indiquée dans votre profil",
+    "calculationParamCategory": "Catégorie source",
+    "calculationParamMaxReps": "Répétitions maximales comptées",
+    "calculationParamWindowDays": "Fenêtre en jours",
+    "calculationHelpExercises": "Entre {min} et {max} exercices, {count} sélectionnés.",
+    "calculationHelpMaxReps": "De {min} à {max}. Les séries au-dessus sont ignorées.",
+    "calculationHelpWindowDays": "De {min} à {max}. Jusqu’où remonte la meilleure série.",
+    "useDynamicColor": "Utiliser les couleurs dynamiques"
 }
diff --git a/lib/l10n/app_he.arb b/lib/l10n/app_he.arb
index 24344f600..9da650478 100644
--- a/lib/l10n/app_he.arb
+++ b/lib/l10n/app_he.arb
@@ -1,5 +1,4 @@
 {
-    "sameRepetitions": "אם אתם משתמשים באותה כמות של חזרות ומשקל עבור כל הסטים, ניתן למלא רק שורה אחת. למשל עבור 4 סטים, הזינו 10 עבור חזרות, ואוטומטית הערך יהיה \"4x10\".",
     "equipment": "ציוד",
     "@equipment": {
         "description": "Equipment needed to perform an exercise"
@@ -12,10 +11,6 @@
     "@logout": {
         "description": "Text for logout button"
     },
-    "useCustomServer": "שימוש בשרת מותאם אישית",
-    "@useCustomServer": {
-        "description": "Toggle button allowing users to switch between the default and a custom wger server"
-    },
     "invalidUrl": "אנא הכנס/י כתובת URL תקינה",
     "@invalidUrl": {
         "description": "Error message when the user enters an invalid URL, e.g. in the login form"
@@ -128,10 +123,6 @@
         "description": "A (logged) workout session"
     },
     "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"
@@ -272,24 +263,14 @@
     },
     "goToDetailPage": "עבור לדף פירוט",
     "calendar": "לוח שנה",
-    "goToToday": "עבור להיום",
-    "@goToToday": {
-        "description": "Label on button to jump back to 'today' in the calendar widget"
-    },
     "enterValue": "אנא הכנס ערך",
     "@enterValue": {
         "description": "Error message when the user hasn't entered a value on a required field"
     },
-    "setUnitsAndRir": "יחידות סט וחזרות בעתודה",
-    "@setUnitsAndRir": {
-        "description": "Label shown on the slider where the user can toggle showing units and RiR",
-        "type": "text"
-    },
     "reset": "איפוס",
     "@reset": {
         "description": "Button text allowing the user to reset the entered values to the default"
     },
-    "loginInstead": "כבר יש לך חשבון? ניתן להיכנס",
     "selectExercise": "אנא בחר/י אימון",
     "@selectExercise": {
         "description": "Error message when the user hasn't selected an exercise in the form"
@@ -347,10 +328,6 @@
     "@register": {
         "description": "Text for registration button"
     },
-    "useDefaultServer": "שימוש בשרת ברירת מחדל",
-    "@useDefaultServer": {
-        "description": "Toggle button allowing users to switch between the default and a custom wger server"
-    },
     "passwordsDontMatch": "הסיסמאות לא תואמות",
     "@passwordsDontMatch": {
         "description": "Error message when the user enters two different passwords during registration"
@@ -359,7 +336,6 @@
     "@invalidEmail": {
         "description": "Error message when the user enters an invalid email"
     },
-    "registerInstead": "אין לך חשבון? הירשם עכשיו",
     "labelBottomNavWorkout": "אימון",
     "@labelBottomNavWorkout": {
         "description": "Label used in bottom navigation, use a short word"
@@ -386,17 +362,11 @@
     "@gPerBodyKg": {
         "description": "Label used for total sums of e.g. calories or similar in grams per Kg of body weight"
     },
-    "loadingText": "טוען...",
-    "@loadingText": {
-        "description": "Text to show when entries are being loaded in the background: Loading..."
-    },
     "aboutDescription": "תודה לך על השימוש בווגר! ווגר הוא פרויקט קוד פתוח שנעשה על ידי אוהבי כושר מרחבי העולם.",
     "@aboutDescription": {
         "description": "Text in the about dialog"
     },
-    "selectExercises": "אם ברצונך לבצע סופר סט ניתן לחפש כמה אימונים כך שהם יהיו מקובצים ביחד",
     "logHelpEntries": "אם ביום אחד ישנה יותר מרשומה אחת עם אותה כמות חזרות, אבל משקל שונה, רק הרשומה עם המשקל הגבוה יותר תופיע בדיאגרמה.",
-    "searchNamesInEnglish": "לחפש גם לפי השמות באנגלית",
     "success": "הפעולה צלחה",
     "@success": {
         "description": "Message when an action completed successfully, usually used as a heading"
@@ -416,13 +386,6 @@
         "description": "Message returned if no exercises match the searched string"
     },
     "useColors": "שימוש בצבעים",
-    "useApiToken": "שימוש באסימון API",
-    "useUsernameAndPassword": "שימוש בשם משתמש וסיסמה",
-    "apiToken": "אסימון API",
-    "invalidApiToken": "נא להקליד אסימון API תקין",
-    "@invalidApiToken": {
-        "description": "Error message when the user enters an invalid API key"
-    },
     "routines": "שגרות",
     "newRoutine": "שגרה חדשה",
     "noRoutines": "אין לך שגרות",
@@ -531,7 +494,6 @@
     "translateExercise": "לתרגם את התרגיל הזה כעת",
     "settingsTitle": "הגדרות",
     "settingsCacheTitle": "מטמון",
-    "settingsExerciseCacheDescription": "מטמון תרגילים",
     "aboutPageTitle": "מידע כללי ותמיכה",
     "simpleMode": "מצב פשוט",
     "arms": "זרועות",
@@ -692,7 +654,6 @@
         }
     },
     "setHasNoExercises": "עדיין אין אימונים בסט זה!",
-    "settingsIngredientCacheDescription": "מטמון מרכיב",
     "settingsCacheDeletedSnackbar": "המטמון נוקה בהצלחה",
     "textPromptTitle": "מוכנים להתחיל?",
     "abs": "שרירי בטן",
@@ -712,10 +673,6 @@
     "darkMode": "עיצוב כהה תמיד",
     "lightMode": "עיצוב בהיר תמיד",
     "barWeight": "משקל Bar",
-    "apiTokenValidChars": "מפתח API יכול להכיל רק את האותיות a-f, את הספרות 0-9, ועליו להיות באורך 40 תווים בדיוק",
-    "@apiTokenValidChars": {
-        "description": "Error message when the user tries to input a API key with forbidden characters"
-    },
     "exerciseNr": "תרגיל {nr}",
     "@exerciseNr": {
         "description": "Header in form indicating the number of the current exercise. Can also be translated as something like 'Set Nr. xy'.",
@@ -736,39 +693,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": "בעוד המיזם הזה חופשי ותמיד יישאר כך, תפעול השרת כן עולה לנו כסף! גם הפיתוח דורש השקעה משמעותית של זמן ומאמץ של מתנדבים. התרומה שלך תלך ישירות לכיסוי העלויות האלה, המאפשרות לספק את השירות שלנו נאמנה.",
     "aboutContributeText": "אנחנו מעודדים את כל סוגי התרומה. בין אם היא מתבטאת בפיתוח קוד, תרגום, או אפילו רק תשוקה לכושר, אנו מעריכים כל סוג של תמיכה!",
     "aboutMastodonTitle": "Mastodon",
@@ -778,7 +702,6 @@
     "@variations": {
         "description": "Variations of one exercise (e.g. benchpress and benchpress narrow)"
     },
-    "verifiedEmailReason": "עליך לאמת את הדואר האלקטרוני שלך כדי לתרום תרגילים",
     "oneNamePerLine": "שם אחד בכל שורה",
     "whatVariationsExist": "מהן הווריאציות שיש לתרגיל זה, אם קיימות?",
     "contributeExercise": "לתרום תרגיל",
diff --git a/lib/l10n/app_hi.arb b/lib/l10n/app_hi.arb
index d3503a960..395cc5573 100644
--- a/lib/l10n/app_hi.arb
+++ b/lib/l10n/app_hi.arb
@@ -7,18 +7,10 @@
     "@logout": {
         "description": "Text for logout button"
     },
-    "useDefaultServer": "डिफ़ॉल्ट सर्वर का प्रयोग करें",
-    "@useDefaultServer": {
-        "description": "Toggle button allowing users to switch between the default and a custom wger server"
-    },
     "register": "रजिस्टर",
     "@register": {
         "description": "Text for registration button"
     },
-    "useCustomServer": "कस्टम सर्वर का प्रयोग करें",
-    "@useCustomServer": {
-        "description": "Toggle button allowing users to switch between the default and a custom wger server"
-    },
     "invalidUrl": "कृपया एक वैलिड URL दीजिये",
     "@invalidUrl": {
         "description": "Error message when the user enters an invalid URL, e.g. in the login form"
@@ -34,8 +26,6 @@
     "customServerUrl": "कस्टम सर्वर URL wger के लिए",
     "customServerHint": "अपने स्वयं के सर्वर का पता दर्ज करें, अन्यथा डिफ़ॉल्ट का उपयोग किया जाएगा",
     "reset": "रीसेट",
-    "registerInstead": "इसके बजाय रजिस्टर करें",
-    "loginInstead": "इसके बजाय लॉग इन करें",
     "labelBottomNavWorkout": "कसरत",
     "labelBottomNavNutrition": "पोषण",
     "labelWorkoutLogs": "प्रशिक्षण लॉग",
@@ -58,14 +48,11 @@
     "set": "सेट",
     "dayDescriptionHelp": "इस दिन क्या किया जाता है (जैसे 'पुल डे') या शरीर के किन अंगों को प्रशिक्षित किया जाता है (जैसे 'छाती और कंधे') का विवरण",
     "setNr": "सेट {nr}",
-    "sameRepetitions": "यदि आप सभी सेटों के लिए समान दोहराव और वजन करते हैं तो आप केवल एक पंक्ति भर सकते हैं। उदाहरण के लिए, 4 सेटों के लिए, दोहराव के लिए केवल 10 दर्ज करें, यह स्वचालित रूप से \"4 x 10\" हो जाता है।",
     "comment": "टिप्पणी",
     "impression": "प्रभाव जमाना",
     "notes": "टिप्पणियाँ",
     "workoutSession": "कसरत सत्र",
     "newDay": "नया दिन",
-    "newSet": "नया सेट",
-    "selectExercises": "यदि आप एक सुपरसेट करना चाहते हैं तो आप कई अभ्यास खोज सकते हैं, उन्हें एक साथ समूहीकृत किया जाएगा",
     "gymMode": "जिम मोड",
     "plateCalculator": "प्लेट्स",
     "plateCalculatorNotDivisible": "उपलब्ध प्लेटों के साथ वजन तक पहुंचना संभव नहीं है",
@@ -130,7 +117,6 @@
     "newEntry": "नया प्रविष्टि",
     "noWeightEntries": "आपके पास कोई वजन प्रविष्टि नहीं है",
     "edit": "संपादित करें",
-    "loadingText": "लोड हो रहा है...",
     "delete": "हटाएं",
     "confirmDelete": "क्या आप वाकई '{toDelete}' को हटाना चाहते हैं?",
     "newNutritionalPlan": "नई पोषण योजना",
@@ -142,7 +128,6 @@
     "selectExercise": "कृपया एक पाठ्यक्रम का चयन करें",
     "enterCharacters": "कृपया {min} और {max} वर्णों के बीच दर्ज करें",
     "nrOfSets": "प्रति व्यायाम सेट: {nrOfSets}",
-    "setUnitsAndRir": "इकाइयाँ सेट करें और RiR",
     "enterValidNumber": "कृपया वैध संख्या दर्ज करें",
     "selectIngredient": "कृपया एक सामग्री का चयन करें",
     "recentlyUsedIngredients": "हाल ही में उपयोग की गई सामग्री",
diff --git a/lib/l10n/app_hr.arb b/lib/l10n/app_hr.arb
index 709890c0c..a8cda9f2f 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": {
@@ -1131,9 +1082,9 @@
     "@filterNutriscore": {
         "description": "Heading for the Nutri-Score slider in the ingredient search filter dialog"
     },
-    "filterNutriscoreOff": "Isključeno",
-    "@filterNutriscoreOff": {
-        "description": "Label for the first slider stop, which disables the Nutri-Score filter"
+    "off": "Isključeno",
+    "@off": {
+        "description": "Generic label for the option that switches something off, e.g. a filter or a line of a chart"
     },
     "filterNutriscoreNoFilter": "Bez filtra",
     "@filterNutriscoreNoFilter": {
@@ -1381,10 +1332,6 @@
     "@weightOrRepsRequired": {
         "description": "Validation error when both weight and repetitions are empty in a workout log"
     },
-    "timeStartEndBothOrNeither": "Postavi vrijeme početka i vrijeme kraja ili ostavi oba polja prazna",
-    "@timeStartEndBothOrNeither": {
-        "description": "Validation error when only one of start/end time is set on a workout session"
-    },
     "refreshTokenHelperText": "Generiraj JWT token za osvježavanje na wger web-stranici i zalijepi ga ovdje. Korisno kada se tvof server nalazi iza proxyja za autorizaciju ili kada želiš preskočiti uobičajeni tok prijave.",
     "@refreshTokenHelperText": {
         "description": "Helper text on the refresh-token paste field"
diff --git a/lib/l10n/app_hu.arb b/lib/l10n/app_hu.arb
index f84ba9e9a..412ddf210 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",
@@ -1354,9 +1305,9 @@
     "@filterNutriscore": {
         "description": "Heading for the Nutri-Score slider in the ingredient search filter dialog"
     },
-    "filterNutriscoreOff": "Ki",
-    "@filterNutriscoreOff": {
-        "description": "Label for the first slider stop, which disables the Nutri-Score filter"
+    "off": "Ki",
+    "@off": {
+        "description": "Generic label for the option that switches something off, e.g. a filter or a line of a chart"
     },
     "filterNutriscoreNoFilter": "Nincs szűrés",
     "@filterNutriscoreNoFilter": {
@@ -1395,9 +1346,5 @@
     "weightOrRepsRequired": "Adj meg súlyt, ismétlésszámot vagy mindkettőt",
     "@weightOrRepsRequired": {
         "description": "Validation error when both weight and repetitions are empty in a workout log"
-    },
-    "timeStartEndBothOrNeither": "Add meg a kezdési és a befejezési időt is, vagy hagyd mindkettőt üresen",
-    "@timeStartEndBothOrNeither": {
-        "description": "Validation error when only one of start/end time is set on a workout session"
     }
 }
diff --git a/lib/l10n/app_id.arb b/lib/l10n/app_id.arb
index 8be3054b2..ed4ea80a8 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": {
@@ -1166,9 +1117,9 @@
     "@filterNutriscore": {
         "description": "Heading for the Nutri-Score slider in the ingredient search filter dialog"
     },
-    "filterNutriscoreOff": "Mati",
-    "@filterNutriscoreOff": {
-        "description": "Label for the first slider stop, which disables the Nutri-Score filter"
+    "off": "Mati",
+    "@off": {
+        "description": "Generic label for the option that switches something off, e.g. a filter or a line of a chart"
     },
     "filterNutriscoreNoFilter": "Tanpa filter",
     "@filterNutriscoreNoFilter": {
diff --git a/lib/l10n/app_it.arb b/lib/l10n/app_it.arb
index 128bc072d..063cee369 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": {
@@ -1161,9 +1112,9 @@
     "@filterNutriscore": {
         "description": "Heading for the Nutri-Score slider in the ingredient search filter dialog"
     },
-    "filterNutriscoreOff": "Spento",
-    "@filterNutriscoreOff": {
-        "description": "Label for the first slider stop, which disables the Nutri-Score filter"
+    "off": "Spento",
+    "@off": {
+        "description": "Generic label for the option that switches something off, e.g. a filter or a line of a chart"
     },
     "filterNutriscoreNoFilter": "Nessun filtro",
     "@filterNutriscoreNoFilter": {
diff --git a/lib/l10n/app_ja.arb b/lib/l10n/app_ja.arb
index 899d6007d..78599dc70 100644
--- a/lib/l10n/app_ja.arb
+++ b/lib/l10n/app_ja.arb
@@ -11,14 +11,6 @@
     "@register": {
         "description": "Text for registration button"
     },
-    "useDefaultServer": "デフォルトサーバを使用する",
-    "@useDefaultServer": {
-        "description": "Toggle button allowing users to switch between the default and a custom wger server"
-    },
-    "useCustomServer": "カスタムサーバを使用する",
-    "@useCustomServer": {
-        "description": "Toggle button allowing users to switch between the default and a custom wger server"
-    },
     "invalidUrl": "有効なURLを入力してください",
     "@invalidUrl": {
         "description": "Error message when the user enters an invalid URL, e.g. in the login form"
@@ -59,8 +51,6 @@
     "@reset": {
         "description": "Button text allowing the user to reset the entered values to the default"
     },
-    "registerInstead": "新規登録",
-    "loginInstead": "既にアカウントをお持ちの方はこちらからログイン",
     "labelBottomNavWorkout": "運動",
     "@labelBottomNavWorkout": {
         "description": "Label used in bottom navigation, use a short word"
@@ -146,7 +136,6 @@
             }
         }
     },
-    "sameRepetitions": "If you do the same repetitions and weight for all sets you can just fill in one row. For example for 4 sets just enter 10 for the repetitions, this automatically becomes \"4 x 10\".",
     "comment": "コメント",
     "@comment": {
         "description": "Comment, additional information"
@@ -164,11 +153,6 @@
         "description": "A (logged) workout session"
     },
     "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",
     "gymMode": "ジムモード",
     "@gymMode": {
         "description": "Label when starting the gym mode"
@@ -335,10 +319,6 @@
         "description": "Message shown when the user has no logged weight entries"
     },
     "edit": "Edit",
-    "loadingText": "Loading...",
-    "@loadingText": {
-        "description": "Text to show when entries are being loaded in the background: Loading..."
-    },
     "delete": "Delete",
     "confirmDelete": "Are you sure you want to delete '{toDelete}'?",
     "@confirmDelete": {
@@ -361,10 +341,6 @@
         "description": "Text in the about dialog"
     },
     "calendar": "Calendar",
-    "goToToday": "Go to today",
-    "@goToToday": {
-        "description": "Label on button to jump back to 'today' in the calendar widget"
-    },
     "enterValue": "Please enter a value",
     "@enterValue": {
         "description": "Error message when the user hasn't entered a value on a required field"
@@ -396,11 +372,6 @@
             }
         }
     },
-    "setUnitsAndRir": "Set units and RiR",
-    "@setUnitsAndRir": {
-        "description": "Label shown on the slider where the user can toggle showing units and RiR",
-        "type": "text"
-    },
     "enterValidNumber": "Please enter a valid number",
     "@enterValidNumber": {
         "description": "Error message when the user has submitted an invalid number (e.g. '3,.,.,.')"
@@ -434,16 +405,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",
     "dataCopied": "Data copied to new entry",
     "@dataCopied": {
@@ -516,7 +477,6 @@
     "@bench": {
         "description": "Generated entry for translation for server strings"
     },
-    "settingsExerciseCacheDescription": "エクササイズキャッシュ",
     "settingsTitle": "設定",
     "settingsCacheTitle": "キャッシュ",
     "back": "戻る",
@@ -543,17 +503,6 @@
     "selectAvailablePlates": "利用可能なプレートを選択してください",
     "barWeight": "バーの重さ",
     "useColors": "色を使用する",
-    "useApiToken": "APIトークンを使用する",
-    "useUsernameAndPassword": "ユーザー名とパスワードを使用する",
-    "apiToken": "APIトークン",
-    "invalidApiToken": "有効なAPIキーを入力してください",
-    "@invalidApiToken": {
-        "description": "Error message when the user enters an invalid API key"
-    },
-    "apiTokenValidChars": "APIキーはアルファベットのa~f、数字の0~9のみで構成されており、ちょうど40文字の長さです",
-    "@apiTokenValidChars": {
-        "description": "Error message when the user tries to input a API key with forbidden characters"
-    },
     "exerciseList": "エクササイズ一覧",
     "exercises": "ワークアウトを構成する複数のエクササイズ",
     "@exercises": {
@@ -568,7 +517,6 @@
     "@noMatchingExerciseFound": {
         "description": "Message returned if no exercises match the searched string"
     },
-    "searchNamesInEnglish": "英語での名前検索",
     "endDate": "終了日",
     "startDate": "開始日",
     "routines": "ルーティン",
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 c654201b5..0429e8821 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!",
@@ -1099,9 +1050,9 @@
     },
     "editorItalic": "Cursief",
     "editorList": "Lijst",
-    "filterNutriscoreOff": "Uit",
-    "@filterNutriscoreOff": {
-        "description": "Label for the first slider stop, which disables the Nutri-Score filter"
+    "off": "Uit",
+    "@off": {
+        "description": "Generic label for the option that switches something off, e.g. a filter or a line of a chart"
     },
     "searchModeExact": "Exact",
     "@searchModeExact": {
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 7be99e46d..330b94703 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"
@@ -1053,9 +1004,9 @@
     "@filterNutriscore": {
         "description": "Heading for the Nutri-Score slider in the ingredient search filter dialog"
     },
-    "filterNutriscoreOff": "Desligado",
-    "@filterNutriscoreOff": {
-        "description": "Label for the first slider stop, which disables the Nutri-Score filter"
+    "off": "Desligado",
+    "@off": {
+        "description": "Generic label for the option that switches something off, e.g. a filter or a line of a chart"
     },
     "filterNutriscoreNoFilter": "Sem filtro",
     "@filterNutriscoreNoFilter": {
diff --git a/lib/l10n/app_pt_BR.arb b/lib/l10n/app_pt_BR.arb
index 83252975c..da6fa0b07 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": {
@@ -1139,9 +1090,9 @@
     "@filterNutriscore": {
         "description": "Heading for the Nutri-Score slider in the ingredient search filter dialog"
     },
-    "filterNutriscoreOff": "Desligado",
-    "@filterNutriscoreOff": {
-        "description": "Label for the first slider stop, which disables the Nutri-Score filter"
+    "off": "Desligado",
+    "@off": {
+        "description": "Generic label for the option that switches something off, e.g. a filter or a line of a chart"
     },
     "filterNutriscoreNoFilter": "Sem filtro",
     "@filterNutriscoreNoFilter": {
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 991fd5117..6f3d10cd1 100644
--- a/lib/l10n/app_sk.arb
+++ b/lib/l10n/app_sk.arb
@@ -12,14 +12,6 @@
     "@register": {
         "description": "Text for registration button"
     },
-    "useDefaultServer": "Použiť predvolený server",
-    "@useDefaultServer": {
-        "description": "Toggle button allowing users to switch between the default and a custom wger server"
-    },
-    "useCustomServer": "Použiť vlastný server",
-    "@useCustomServer": {
-        "description": "Toggle button allowing users to switch between the default and a custom wger server"
-    },
     "invalidUrl": "Zadajte platnú URL adresu",
     "@invalidUrl": {
         "description": "Error message when the user enters an invalid URL, e.g. in the login form"
@@ -51,17 +43,6 @@
     "@invalidUsername": {
         "description": "Error message when the user enters an invalid username"
     },
-    "useApiToken": "Použite token API",
-    "useUsernameAndPassword": "Použite používateľské meno a heslo",
-    "apiToken": "API token",
-    "invalidApiToken": "Zadajte platný kľúč API",
-    "@invalidApiToken": {
-        "description": "Error message when the user enters an invalid API key"
-    },
-    "apiTokenValidChars": "Kľúč API môže obsahovať iba písmená a-f, číslice 0-9 a musí mať presne 40 znakov",
-    "@apiTokenValidChars": {
-        "description": "Error message when the user tries to input a API key with forbidden characters"
-    },
     "customServerUrl": "URL inštancie wger",
     "@customServerUrl": {
         "description": "Label in the form where the users can enter their own wger instance"
@@ -74,8 +55,6 @@
     "@reset": {
         "description": "Button text allowing the user to reset the entered values to the default"
     },
-    "registerInstead": "Nemáte účet? Zaregistrujte sa teraz",
-    "loginInstead": "Už máte účet? Prihláste sa",
     "labelBottomNavWorkout": "Tréning",
     "@labelBottomNavWorkout": {
         "description": "Label used in bottom navigation, use a short word"
@@ -130,7 +109,6 @@
     "@noMatchingExerciseFound": {
         "description": "Message returned if no exercises match the searched string"
     },
-    "searchNamesInEnglish": "Hľadať aj mená v angličtine",
     "equipment": "Vybavenie",
     "@equipment": {
         "description": "Equipment needed to perform an exercise"
@@ -169,7 +147,6 @@
     "weightUnit": "Jednotka hmotnosti",
     "repetitionUnit": "Opakovacie jednotky",
     "dayDescriptionHelp": "Popis toho, čo sa v tento deň robí (napr. „ťahací deň“) alebo ktoré časti tela sa trénujú (napr. „hrudník a ramená“)",
-    "sameRepetitions": "",
     "comment": "Komentár",
     "@comment": {
         "description": "Comment, additional information"
@@ -190,11 +167,6 @@
     "routineDays": "Dni v rutine",
     "resultingRoutine": "Výsledná rutina",
     "newDay": "Nový deň",
-    "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",
     "gymMode": "Režim posilňovňa",
     "@gymMode": {
         "description": "Label when starting the gym mode"
diff --git a/lib/l10n/app_sl.arb b/lib/l10n/app_sl.arb
index 9929bb071..14a7debd4 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": {
@@ -1387,9 +1350,9 @@
     "@filterNutriscore": {
         "description": "Heading for the Nutri-Score slider in the ingredient search filter dialog"
     },
-    "filterNutriscoreOff": "Izklopljeno",
-    "@filterNutriscoreOff": {
-        "description": "Label for the first slider stop, which disables the Nutri-Score filter"
+    "off": "Izklopljeno",
+    "@off": {
+        "description": "Generic label for the option that switches something off, e.g. a filter or a line of a chart"
     },
     "filterNutriscoreNoFilter": "Brez filtra",
     "@filterNutriscoreNoFilter": {
@@ -1428,9 +1391,5 @@
     "weightOrRepsRequired": "Vnesite težo, ponovitve ali oboje",
     "@weightOrRepsRequired": {
         "description": "Validation error when both weight and repetitions are empty in a workout log"
-    },
-    "timeStartEndBothOrNeither": "Nastavite tako začetni kot končni čas ali pa oba pustite prazna",
-    "@timeStartEndBothOrNeither": {
-        "description": "Validation error when only one of start/end time is set on a workout session"
     }
 }
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 22481157c..06f182f6c 100644
--- a/lib/l10n/app_tr.arb
+++ b/lib/l10n/app_tr.arb
@@ -51,8 +51,6 @@
     "@labelBottomNavWorkout": {
         "description": "Label used in bottom navigation, use a short word"
     },
-    "loginInstead": "Zaten hesabınız var mı? Oturum açın",
-    "registerInstead": "Hesabınız yok mu? Şimdi kaydolun",
     "reset": "Sıfırla",
     "@reset": {
         "description": "Button text allowing the user to reset the entered values to the default"
@@ -93,14 +91,6 @@
     "@invalidUrl": {
         "description": "Error message when the user enters an invalid URL, e.g. in the login form"
     },
-    "useCustomServer": "Özel sunucu kullan",
-    "@useCustomServer": {
-        "description": "Toggle button allowing users to switch between the default and a custom wger server"
-    },
-    "useDefaultServer": "Varsayılan sunucuyu kullan",
-    "@useDefaultServer": {
-        "description": "Toggle button allowing users to switch between the default and a custom wger server"
-    },
     "register": "Kayıt ol",
     "@register": {
         "description": "Text for registration button"
@@ -142,8 +132,6 @@
             }
         }
     },
-    "sameRepetitions": "Eğer tüm setler için aynı ağırlıklarla aynı setleri yapıyorsanız, sadece bir satır doldurabilirsiniz. Örneğin, 4 set için sadece 10 girin, bu otomatik olarak \"4 x 10\"a dönüşüyor.",
-    "selectExercises": "Eğer bir süper set yapmak istiyorsanız, birkaç egzersiz için arama yapabilirsiniz, birlikte gruplanacaklardır",
     "logHelpEntries": "Tek bir günde, aynı sayıda tekrara sahip ancak farklı ağırlıklara sahip birden fazla giriş varsa, diyagramda yalnızca daha yüksek ağırlığa sahip giriş gösterilir.",
     "addSet": "Set ekle",
     "@addSet": {
@@ -190,10 +178,6 @@
         "description": "A (logged) workout session"
     },
     "newDay": "Yeni gün",
-    "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"
@@ -333,10 +317,6 @@
             }
         }
     },
-    "goToToday": "Bugüne git",
-    "@goToToday": {
-        "description": "Label on button to jump back to 'today' in the calendar widget"
-    },
     "appUpdateContent": "Uygulamanın bu sürümü sunucuyla uyumlu değil, lütfen uygulamanızı güncelleyin.",
     "productFound": "Ürün bulundu",
     "@productFound": {
@@ -402,11 +382,6 @@
             }
         }
     },
-    "setUnitsAndRir": "RiR ve birimleri ayarla",
-    "@setUnitsAndRir": {
-        "description": "Label shown on the slider where the user can toggle showing units and RiR",
-        "type": "text"
-    },
     "selectIngredient": "Lütfen bir malzeme seçin",
     "@selectIngredient": {
         "description": "Error message when the user hasn't selected an ingredient from the autocompleter"
@@ -458,10 +433,6 @@
     "@noWeightEntries": {
         "description": "Message shown when the user has no logged weight entries"
     },
-    "loadingText": "Yükleniyor...",
-    "@loadingText": {
-        "description": "Text to show when entries are being loaded in the background: Loading..."
-    },
     "takePicture": "Fotoğraf çek",
     "dataCopied": "Veriler yeni girişe kopyalandı",
     "@dataCopied": {
@@ -493,7 +464,6 @@
         }
     },
     "add_exercise_image_license": "Görseller CC BY SA lisansı ile uyumlu olmalıdır. Emin değilseniz, yalnızca kendi çektiğiniz fotoğrafları yükleyin.",
-    "verifiedEmailReason": "Egzersizlere katkıda bulunmak için e-posta adresinizi doğrulamanız gerekiyor",
     "alternativeNames": "Alternatif isimler",
     "minutes": "Dakika",
     "seconds": "Saniye",
@@ -558,7 +528,6 @@
     "@baseData": {
         "description": "The base data for an exercise such as category, trained muscles, etc."
     },
-    "noMeasurementEntries": "Ölçüm girdiniz yok",
     "moreMeasurementEntries": "Yeni ölçüm ekle",
     "@moreMeasurementEntries": {
         "description": "Message shown when the user wants to add new measurement"
@@ -580,7 +549,6 @@
         "description": "Message when an action completed successfully, usually used as a heading"
     },
     "cacheWarning": "Önbelleğe alma nedeniyle değişikliklerin uygulama genelinde görünür olması biraz zaman alabilir.",
-    "searchNamesInEnglish": "Ayrıca İngilizce adları da arayın",
     "textPromptTitle": "Başlamaya hazır mısınız?",
     "textPromptSubheading": "Başlamak için eylem düğmesine basın",
     "verify": "Doğrula",
@@ -621,7 +589,6 @@
     },
     "aboutDonateTitle": "Bağış yap",
     "aboutDonateText": "Projeye yardımcı olmak, sunucu masraflarını karşılamak ve geliştirmeyi desteklemek için bağış yapın",
-    "settingsExerciseCacheDescription": "Egzersiz önbelleği",
     "settingsCacheDeletedSnackbar": "Önbellek başarıyla temizlendi",
     "log": "Kaydet",
     "@log": {
@@ -683,40 +650,6 @@
     "ingredientLogged": "Malzeme günlüğe kaydedildi",
     "selectMealToLog": "Günlüğe kaydetmek için bir yemek seçin",
     "noIngredientsDefined": "Henüz malzeme tanımlanmadı",
-    "settingsIngredientCacheDescription": "Malzeme önbelleği",
-    "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..62a08ddd4 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": "編輯動作時，隱藏部分進階設定",
@@ -1040,9 +991,9 @@
     "@filterNutriscore": {
         "description": "Heading for the Nutri-Score slider in the ingredient search filter dialog"
     },
-    "filterNutriscoreOff": "關閉",
-    "@filterNutriscoreOff": {
-        "description": "Label for the first slider stop, which disables the Nutri-Score filter"
+    "off": "關閉",
+    "@off": {
+        "description": "Generic label for the option that switches something off, e.g. a filter or a line of a chart"
     },
     "filterNutriscoreNoFilter": "不套用篩選",
     "@filterNutriscoreNoFilter": {
diff --git a/lib/main.dart b/lib/main.dart
index f3049784c..114f7ec85 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -24,6 +24,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:logging/logging.dart';
+import 'package:timezone/data/latest.dart' as tzdata;
 import 'package:wger/core/app_link_router.dart';
 import 'package:wger/core/app_settings_notifier.dart';
 import 'package:wger/core/consts.dart';
@@ -55,7 +56,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 +73,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';
@@ -112,6 +114,9 @@ void main() async {
   // Logger
   _setupLogging();
 
+  // Timezone database, needed to cut calendar days in the profile zone
+  tzdata.initializeTimeZones();
+
   final logger = Logger('main');
 
   // SharedPreferences to SharedPreferencesAsync migration function
@@ -267,6 +272,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/api_client.dart b/lib/powersync/api_client.dart
index c28a1d5f2..2c2d60c8d 100644
--- a/lib/powersync/api_client.dart
+++ b/lib/powersync/api_client.dart
@@ -24,11 +24,10 @@ import 'package:http/http.dart' as http;
 /// Thin REST client used by the PowerSync connector.
 ///
 /// In production the [http.Client] passed in is the project-wide
-/// `AuthHttpClient`, which injects the right `Authorization` header
-/// (`Bearer` for headless JWT, `Token` for legacy permanent tokens) and
-/// runs pre-emptive refresh ahead of token expiry. This class itself
-/// therefore stays auth-agnostic: it only sets `Content-Type` and lets
-/// the client own everything else.
+/// `AuthHttpClient`, which injects the `Authorization` header and runs
+/// pre-emptive refresh ahead of token expiry. This class itself therefore
+/// stays auth-agnostic: it only sets `Content-Type` and lets the client own
+/// everything else.
 class ApiClient {
   late final uri = Uri.parse('$serverUrl/api/v2/upload-powersync-data');
 
diff --git a/lib/powersync/connector.dart b/lib/powersync/connector.dart
index 07654a938..cf70f1462 100644
--- a/lib/powersync/connector.dart
+++ b/lib/powersync/connector.dart
@@ -231,7 +231,6 @@ class DjangoConnector extends PowerSyncBackendConnector {
   /// are read-only on the serializer and therefore safe to leave out.
   static const Map<String, Set<String>> _dateOnlyFields = {
     'manager_routine': {'start', 'end'},
-    'manager_workoutsession': {'date'},
     'nutrition_nutritionplan': {'start', 'end'},
     'gallery_image': {'date'},
   };
@@ -270,7 +269,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/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc
index af197928e..0a4006bd2 100644
--- a/linux/flutter/generated_plugin_registrant.cc
+++ b/linux/flutter/generated_plugin_registrant.cc
@@ -9,6 +9,7 @@
 #include <dynamic_color/dynamic_color_plugin.h>
 #include <file_selector_linux/file_selector_plugin.h>
 #include <flutter_secure_storage_linux/flutter_secure_storage_linux_plugin.h>
+#include <flutter_timezone/flutter_timezone_plugin.h>
 #include <gtk/gtk_plugin.h>
 #include <url_launcher_linux/url_launcher_plugin.h>
 
@@ -22,6 +23,9 @@ void fl_register_plugins(FlPluginRegistry* registry) {
   g_autoptr(FlPluginRegistrar) flutter_secure_storage_linux_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterSecureStorageLinuxPlugin");
   flutter_secure_storage_linux_plugin_register_with_registrar(flutter_secure_storage_linux_registrar);
+  g_autoptr(FlPluginRegistrar) flutter_timezone_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterTimezonePlugin");
+  flutter_timezone_plugin_register_with_registrar(flutter_timezone_registrar);
   g_autoptr(FlPluginRegistrar) gtk_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "GtkPlugin");
   gtk_plugin_register_with_registrar(gtk_registrar);
diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake
index 7b3b66c18..56752df29 100644
--- a/linux/flutter/generated_plugins.cmake
+++ b/linux/flutter/generated_plugins.cmake
@@ -6,6 +6,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
   dynamic_color
   file_selector_linux
   flutter_secure_storage_linux
+  flutter_timezone
   gtk
   url_launcher_linux
 )
diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
index eb9b91c91..316227cfd 100644
--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -7,9 +7,11 @@ import Foundation
 
 import app_links
 import connectivity_plus
+import device_info_plus
 import dynamic_color
 import file_selector_macos
 import flutter_secure_storage_darwin
+import flutter_timezone
 import package_info_plus
 import shared_preferences_foundation
 import url_launcher_macos
@@ -18,9 +20,11 @@ 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"))
+  FlutterTimezonePlugin.register(with: registry.registrar(forPlugin: "FlutterTimezonePlugin"))
   FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
   UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj
index 156baf450..2429d48ea 100644
--- a/macos/Runner.xcodeproj/project.pbxproj
+++ b/macos/Runner.xcodeproj/project.pbxproj
@@ -516,6 +516,7 @@
 					"@executable_path/../Frameworks",
 				);
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				STRIP_STYLE = "non-global";
 				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
diff --git a/pubspec.lock b/pubspec.lock
index a9c523d8f..832c4d807 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -361,6 +361,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.7.15"
+  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:
@@ -637,6 +653,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_timezone:
+    dependency: "direct main"
+    description:
+      name: flutter_timezone
+      sha256: "869677426fde92dbe170fb7d2d4929f2a8343c2f5f62f08b0bb64f908630b073"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.1.0"
   flutter_typeahead:
     dependency: "direct main"
     description:
@@ -719,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:
@@ -768,7 +801,7 @@ packages:
     source: hosted
     version: "4.1.2"
   image:
-    dependency: transitive
+    dependency: "direct dev"
     description:
       name: image
       sha256: "1976370a4df3091bb0f72409c187ad1f9132a818bc6b95ca59c0bae1c75c688e"
@@ -1569,6 +1602,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.6.17"
+  timezone:
+    dependency: "direct main"
+    description:
+      name: timezone
+      sha256: "981d1020d6ef8fe1e7b3de5054e5b25579ae7c403d7734adc508ffc47668e9cb"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.11.1"
   typed_data:
     dependency: transitive
     description:
@@ -1809,6 +1850,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 d6cb5f442..2628cb974 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.5+260
+version: 2.1.0+260
 
 environment:
   sdk: '>=3.10.0 <4.0.0'
@@ -51,6 +51,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
@@ -73,6 +82,14 @@ dependencies:
   state_notifier: ^1.0.0
   connectivity_plus: ^7.3.1
   powersync: ^2.3.3
+  flutter_timezone: ^5.1.0
+  timezone: ^0.11.1
+
+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:
@@ -91,6 +108,8 @@ dev_dependencies:
   flutter_lints: ^6.0.0
   flutter_native_splash: ^2.4.8
   freezed: ^3.2.0
+  # Used to strip the alpha channel from the generated store screenshots
+  image: ^4.9.1
   json_serializable: ^6.14.1
   mockito: ^5.6.4
   network_image_mock: ^2.1.1
diff --git a/test/core/date_test.dart b/test/core/date_test.dart
index 96cdb28f8..953b18578 100644
--- a/test/core/date_test.dart
+++ b/test/core/date_test.dart
@@ -17,9 +17,31 @@
  */
 
 import 'package:flutter_test/flutter_test.dart';
+import 'package:timezone/data/latest.dart' as tzdata;
 import 'package:wger/core/date.dart';
 
 void main() {
+  group('dayIn', () {
+    setUpAll(tzdata.initializeTimeZones);
+
+    test('cuts the day in the given zone', () {
+      // Auckland (UTC+12 in August) is already past midnight at this instant
+      expect(dayIn(DateTime.utc(2026, 8, 10, 12, 30), 'Pacific/Auckland'), DateTime(2026, 8, 11));
+      expect(dayIn(DateTime.utc(2026, 8, 10, 11, 30), 'Pacific/Auckland'), DateTime(2026, 8, 10));
+    });
+
+    test('an unreported zone falls back to the device day', () {
+      final instant = DateTime(2026, 8, 10, 23, 30);
+
+      expect(dayIn(instant, null), DateTime(2026, 8, 10));
+      expect(dayIn(instant, ''), DateTime(2026, 8, 10));
+    });
+
+    test('an unknown zone name falls back to the device day', () {
+      expect(dayIn(DateTime(2026, 8, 10, 23, 30), 'Mars/Olympus_Mons'), DateTime(2026, 8, 10));
+    });
+  });
+
   group('daysInRange', () {
     test('covers both ends of the range', () {
       final days = daysInRange(DateTime(2026, 5, 4), DateTime(2026, 5, 7));
diff --git a/test/core/formatting_test.dart b/test/core/formatting_test.dart
new file mode 100644
index 000000000..bbbc72ed6
--- /dev/null
+++ b/test/core/formatting_test.dart
@@ -0,0 +1,203 @@
+/*
+ * 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('valueAxis', () {
+    test('leaves an ordinary spread to the chart', () {
+      expect(valueAxis('kg', 80, 92), isNull);
+    });
+
+    test('reads a duration in hours', () {
+      // The duration axis keeps deciding for its own unit
+      expect(valueAxis('min', 0, 300)?.interval, durationAxis('min', 0, 300)?.interval);
+    });
+
+    test('gives a flat series room around it', () {
+      // Every reading the same: fl_chart would divide a range of nothing into
+      // steps below the value's own precision and never finish walking it
+      final axis = valueAxis('kg', 111.18, 111.18)!;
+
+      expect(axis.min, lessThan(111.18));
+      expect(axis.max, greaterThan(111.18));
+      expect(axis.interval, isNull);
+    });
+
+    test('counts a spread of rounding errors as flat', () {
+      // What an average over identical values produces
+      final axis = valueAxis('kg', 111.17999999999999, 111.18)!;
+
+      expect(axis.max - axis.min, greaterThan(1));
+    });
+
+    test('keeps a small but real spread', () {
+      // A ratio moves in the third decimal and still means something
+      expect(valueAxis('', 0.470, 0.471), isNull);
+    });
+
+    test('has room to show even a flat zero', () {
+      final axis = valueAxis('kg', 0, 0)!;
+
+      expect(axis.min, lessThan(0));
+      expect(axis.max, greaterThan(0));
+    });
+  });
+
+  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/helpers_test.dart b/test/core/helpers_test.dart
index 5e28eb692..d77f12544 100644
--- a/test/core/helpers_test.dart
+++ b/test/core/helpers_test.dart
@@ -181,6 +181,29 @@ void main() {
     });
   });
 
+  group('makePageUri', () {
+    test('builds the page URL on the server itself', () {
+      expect(
+        makePageUri('https://wger.de', 'software/terms-of-service').toString(),
+        'https://wger.de/software/terms-of-service',
+      );
+    });
+
+    test('handles a trailing slash on the server URL', () {
+      expect(
+        makePageUri('https://wger.de/', 'software/terms-of-service').toString(),
+        'https://wger.de/software/terms-of-service',
+      );
+    });
+
+    test('keeps a subpath and a non-default port (self-hosted setups)', () {
+      expect(
+        makePageUri('http://localhost:8000/wger', 'software/terms-of-service').toString(),
+        'http://localhost:8000/wger/software/terms-of-service',
+      );
+    });
+  });
+
   group('findLivePowerSyncUrl', () {
     const serverUrl = 'https://wger.example.com';
 
diff --git a/test/core/network/auth_credentials_storage_test.dart b/test/core/network/auth_credentials_storage_test.dart
index 54436efa9..165662474 100644
--- a/test/core/network/auth_credentials_storage_test.dart
+++ b/test/core/network/auth_credentials_storage_test.dart
@@ -94,11 +94,11 @@ void main() {
       expect(loggedKeyringWarning(), isTrue);
     });
 
-    test('clearJwt clears the prefs, logs, and does not rethrow', () async {
+    test('clearCredentials clears the prefs, logs, and does not rethrow', () async {
       when(secureStorage.deleteRefreshToken()).thenThrow(keyringLocked);
       await PreferenceHelper.asyncPref.setString(PREFS_ACCESS_TOKEN, 'stale');
 
-      await expectLater(storage.clearJwt(), completes);
+      await expectLater(storage.clearCredentials(), completes);
 
       verify(secureStorage.deleteRefreshToken()).called(1);
       expect(await PreferenceHelper.asyncPref.getString(PREFS_ACCESS_TOKEN), isNull);
diff --git a/test/core/network/auth_http_client_test.dart b/test/core/network/auth_http_client_test.dart
index 1b2a62df9..8db362daf 100644
--- a/test/core/network/auth_http_client_test.dart
+++ b/test/core/network/auth_http_client_test.dart
@@ -26,7 +26,8 @@ import 'package:mockito/mockito.dart';
 import 'package:wger/core/network/auth_http_client.dart';
 import 'package:wger/core/network/auth_notifier.dart';
 import 'package:wger/core/network/auth_state.dart';
-import 'package:wger/core/network/network_provider.dart' show ReachabilityReportingClient;
+import 'package:wger/core/network/network_provider.dart'
+    show ReachabilityReportingClient, authHttpClientProvider;
 
 import 'auth_http_client_test.mocks.dart';
 
@@ -130,17 +131,6 @@ void main() {
       expect(refreshCalls, 0);
     });
 
-    test('legacy credential → Authorization: Token <key>', () async {
-      auth = const AuthState(credential: LegacyCredential('legacy-key'));
-
-      final headers = await sendAndCapture(
-        http.Request('GET', Uri.parse('https://wger.example/api/v2/routine/')),
-      );
-
-      expect(headers[HttpHeaders.authorizationHeader], 'Token legacy-key');
-      expect(refreshCalls, 0);
-    });
-
     test('no auth state → no Authorization header set', () async {
       auth = null;
       final headers = await sendAndCapture(
@@ -198,16 +188,6 @@ void main() {
       expect(refreshCalls, 0);
     });
 
-    test('does not fire for the legacy permanent token', () async {
-      auth = const AuthState(credential: LegacyCredential('legacy-key'));
-
-      await sendAndCapture(
-        http.Request('GET', Uri.parse('https://wger.example/api/v2/routine/')),
-      );
-
-      expect(refreshCalls, 0);
-    });
-
     test('does not fire when accessExpiresAt is null', () async {
       auth = const AuthState(credential: JwtCredential(accessToken: 'opaque-jwt'));
 
@@ -324,8 +304,34 @@ void main() {
       verify(inner.send(any)).called(1); // No retry attempted.
     });
 
-    test('legacy 401 → no retry, original 401 surfaces', () async {
-      auth = const AuthState(credential: LegacyCredential('legacy-key'));
+    test('refresh that leaves the credential untouched → 401 through, no logout', () async {
+      // What _runRefresh does on a network error: it keeps the session so
+      // local data stays accessible. A retry with the very same token can
+      // only 401 again, which must not count as a revoked session
+      auth = AuthState(
+        credential: JwtCredential(
+          accessToken: 'old-access',
+          expiresAt: DateTime.now().toUtc().add(const Duration(hours: 1)),
+        ),
+      );
+      // The default onRefresh is a no-op, like a refresh that failed on the
+      // network and returned without touching the credential
+      when(inner.send(any)).thenAnswer(
+        (_) async => http.StreamedResponse(Stream.value(<int>[]), 401),
+      );
+
+      final response = await buildClient().send(
+        http.Request('GET', Uri.parse('https://wger.example/api/v2/routine/')),
+      );
+
+      expect(response.statusCode, 401);
+      expect(refreshCalls, 1);
+      expect(sessionExpiredCalls, 0);
+      verify(inner.send(any)).called(1); // No retry with the same token.
+    });
+
+    test('401 without a credential → no retry, original 401 surfaces', () async {
+      auth = const AuthState();
       when(inner.send(any)).thenAnswer(
         (_) async => http.StreamedResponse(Stream.value(<int>[]), 401),
       );
@@ -468,5 +474,24 @@ void main() {
       expect(response.statusCode, 401);
       expect(notifier.clearSessionCalls, 1);
     });
+
+    test('a 401 whose refresh does not deliver keeps the session', () async {
+      final client = buildFromProvider(AuthState(credential: jwt('stale')));
+      await pumpEventQueue();
+      // refreshResult stays null: the notifier hit a network error on the
+      // refresh endpoint and kept the session for offline use
+      when(inner.send(any)).thenAnswer(
+        (_) async => http.StreamedResponse(Stream.value(<int>[]), 401),
+      );
+
+      final response = await client.send(
+        http.Request('GET', Uri.parse('https://wger.example/api/v2/routine/')),
+      );
+
+      expect(response.statusCode, 401);
+      expect(notifier.refreshCalls, 1);
+      expect(notifier.clearSessionCalls, 0);
+      verify(inner.send(any)).called(1);
+    });
   });
 }
diff --git a/test/core/network/auth_notifier_login_test.dart b/test/core/network/auth_notifier_login_test.dart
index 52f75f92f..177d264d6 100644
--- a/test/core/network/auth_notifier_login_test.dart
+++ b/test/core/network/auth_notifier_login_test.dart
@@ -32,11 +32,13 @@ import 'package:wger/core/exceptions/mfa_required_exception.dart';
 import 'package:wger/core/network/auth_credentials_storage.dart';
 import 'package:wger/core/network/auth_notifier.dart';
 import 'package:wger/core/network/auth_state.dart';
+import 'package:wger/core/network/network_provider.dart';
 import 'package:wger/core/network/secure_token_storage.dart';
 import 'package:wger/core/shared_preferences.dart';
 import 'package:wger/features/account/models/account.dart';
 import 'package:wger/features/account/providers/account_notifier.dart';
 import 'package:wger/features/account/providers/account_repository.dart';
+import 'package:wger/features/account/providers/timezone_sync.dart';
 
 import '../../helpers/fake_auth_environment.dart';
 import 'auth_notifier_login_test.mocks.dart';
@@ -173,7 +175,7 @@ void main() {
   });
 
   group('login: headless happy path', () {
-    test('200 → stores headless JWT bundle, wipes legacy PREFS_USER, state has tokens', () async {
+    test('200 → stores headless JWT bundle, state has tokens', () async {
       final accessJwt = makeJwt({'sub': '7', 'exp': 1900000000});
       when(
         mockClient.post(tHeadlessLogin, headers: anyNamed('headers'), body: anyNamed('body')),
@@ -189,17 +191,9 @@ void main() {
       );
 
       final container = makeContainer();
-      // Let auto-login settle as logged-out (no PREFS_USER yet).
+      // Let auto-login settle as logged-out (nothing stored yet).
       await container.read(authProvider.future);
 
-      // Seed a stale legacy blob *after* auto-login, so we can assert
-      // login() wipes it on success without auto-login itself trying to
-      // probe with it.
-      await PreferenceHelper.asyncPref.setString(
-        PREFS_USER,
-        jsonEncode({'token': 'stale-legacy', 'serverUrl': serverUrl}),
-      );
-
       final result = await container
           .read(authProvider.notifier)
           .login(username, password, serverUrl, null);
@@ -217,13 +211,9 @@ void main() {
       // logged-in user so the next login can detect a user-switch.
       final prefs = PreferenceHelper.asyncPref;
       expect(await prefs.getString(PREFS_ACCESS_TOKEN), accessJwt);
-      expect(await prefs.getString(PREFS_TOKEN_TYPE), AuthTokenType.headlessJwt.name);
       expect(await prefs.getString(PREFS_SERVER_URL), serverUrl);
       expect(await prefs.getString(PREFS_DB_OWNER_USER_ID), '7');
 
-      // Stale legacy blob wiped.
-      expect(await prefs.containsKey(PREFS_USER), false);
-
       // No prior session, so the user-switch wipe path must not have fired.
       expect(container.read(authProvider.notifier).userSwitchWipeCount, 0);
     });
@@ -407,6 +397,23 @@ void main() {
       expect(await PreferenceHelper.asyncPref.getString(PREFS_DB_OWNER_USER_ID), '7');
     });
 
+    test('a user switch drops the previous account-scoped preferences', () async {
+      // Health opt-in, watermarks and the timezone-report marker describe the
+      // previous account: inherited, they would import health data without an
+      // opt-in and let the sync overwrite the new user's chosen zone
+      await PreferenceHelper.asyncPref.setString(PREFS_DB_OWNER_USER_ID, '5');
+      await PreferenceHelper.instance.setHealthSyncEnabled(true);
+      await PreferenceHelper.asyncPref.setString(reportedTimezonePrefKey, 'Pacific/Auckland');
+      stubLoginSuccess(makeJwt({'sub': '7', 'exp': 1900000000}));
+
+      final container = makeContainer();
+      await container.read(authProvider.future);
+      await container.read(authProvider.notifier).login(username, password, serverUrl, null);
+
+      expect(await PreferenceHelper.instance.getHealthSyncEnabled(), isFalse);
+      expect(await PreferenceHelper.asyncPref.getString(reportedTimezonePrefKey), isNull);
+    });
+
     test('same user logging back in keeps the local DB', () async {
       // Same user as the local DB owner.
       await PreferenceHelper.asyncPref.setString(PREFS_DB_OWNER_USER_ID, '7');
diff --git a/test/core/network/auth_notifier_powersync_test.dart b/test/core/network/auth_notifier_powersync_test.dart
index 144e696c4..e2ee8cf22 100644
--- a/test/core/network/auth_notifier_powersync_test.dart
+++ b/test/core/network/auth_notifier_powersync_test.dart
@@ -24,6 +24,7 @@ import 'package:connectivity_plus_platform_interface/connectivity_plus_platform_
 import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart' show AppLifecycleState;
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_riverpod/misc.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:http/http.dart' as http;
 import 'package:http/http.dart';
@@ -33,6 +34,8 @@ import 'package:plugin_platform_interface/plugin_platform_interface.dart';
 import 'package:wger/core/consts.dart';
 import 'package:wger/core/network/auth_notifier.dart';
 import 'package:wger/core/network/auth_state.dart';
+import 'package:wger/core/network/network_provider.dart';
+import 'package:wger/core/network/powersync_session.dart';
 import 'package:wger/core/network/secure_token_storage.dart';
 import 'package:wger/core/shared_preferences.dart';
 
@@ -40,6 +43,19 @@ import '../../helpers/fake_auth_environment.dart';
 import '../../helpers/fake_connectivity.dart';
 import 'auth_notifier_powersync_test.mocks.dart';
 
+/// A PowerSync session whose disconnect never completes, for the deadlock
+/// regression below. The real one cannot be faked: `PowerSyncDatabase` is a
+/// `base` class.
+class _HangingPowerSyncSession extends PowerSyncSession {
+  int disconnectCalls = 0;
+
+  @override
+  Future<void> disconnect() {
+    disconnectCalls++;
+    return Completer<void>().future;
+  }
+}
+
 @GenerateMocks([http.Client, SecureTokenStorage])
 void main() {
   // Required so showSessionExpiredSnackbar can look up the global keys via
@@ -65,28 +81,27 @@ void main() {
   const pathProviderChannel = MethodChannel('plugins.flutter.io/path_provider');
 
   const serverUrl = 'https://wger.example';
-  const token = 'token-12345';
+  const accessToken = 'access-token-12345';
   const powerSyncUrl = 'https://ps.example/';
 
-  // makeUri() defaults to a trailing slash; powersync-token,
-  // issue-refresh-token are the endpoints registered without one on the
-  // Django side.
+  // makeUri() defaults to a trailing slash; powersync-token is registered
+  // without one on the Django side.
   final tProbe = Uri.parse('$serverUrl/api/v2/routine/');
   final tVersion = Uri.parse('$serverUrl/api/v2/version/');
   final tMinAppVersion = Uri.parse('$serverUrl/api/v2/min-app-version/');
   final tPowerSyncToken = Uri.parse('$serverUrl/api/v2/powersync-token');
   final tLiveness = Uri.parse('${powerSyncUrl}probes/liveness');
   final tFallbackLiveness = Uri.parse('$serverUrl/ps/probes/liveness');
-  final tIssueRefresh = Uri.parse('$serverUrl/api/v2/issue-refresh-token');
   final tHeadlessRefresh = Uri.parse('$serverUrl/allauth/app/v1/tokens/refresh');
 
   /// Builds a fresh ProviderContainer with the mock HTTP client wired into
   /// the auth notifier. Auto-disposes after the test.
-  ProviderContainer makeContainer() {
+  ProviderContainer makeContainer({List<Override> overrides = const []}) {
     final c = ProviderContainer(
       overrides: [
         authHttpClientProvider.overrideWithValue(mockClient),
         secureTokenStorageProvider.overrideWithValue(mockSecureStorage),
+        ...overrides,
       ],
     );
     addTearDown(c.dispose);
@@ -122,11 +137,15 @@ void main() {
     // Wipe async prefs between tests (the platform instance is shared).
     final prefs = PreferenceHelper.asyncPref;
 
-    // Persist a logged-in user so auto-login actually runs.
-    await prefs.setString(
-      PREFS_USER,
-      json.encode({'token': token, 'serverUrl': serverUrl}),
+    // Persist a logged-in user so auto-login actually runs. The expiry sits
+    // far enough in the future that no test trips the pre-emptive refresh
+    // unless it re-seeds the bundle itself.
+    await prefs.setString(PREFS_ACCESS_TOKEN, accessToken);
+    await prefs.setInt(
+      PREFS_ACCESS_EXPIRES_AT,
+      DateTime.now().add(const Duration(hours: 1)).millisecondsSinceEpoch,
     );
+    await prefs.setString(PREFS_SERVER_URL, serverUrl);
 
     // Default happy-path mocks. Individual tests override what they need.
     when(
@@ -150,13 +169,6 @@ void main() {
     // <serverUrl>/ps/. A 404 keeps the "unreachable" scenarios unreachable;
     // fallback-specific tests override this.
     when(mockClient.get(tFallbackLiveness)).thenAnswer((_) async => Response('not found', 404));
-
-    // Default: the legacy-DRF → JWT migration POST silently fails as
-    // "offline" so existing tests that seed PREFS_USER fall through to the
-    // legacy code path unchanged. Migration-specific tests override this.
-    when(
-      mockClient.post(tIssueRefresh, headers: anyNamed('headers')),
-    ).thenThrow(http.ClientException('SocketException: stub default'));
   });
 
   group('restored session (ever-synced)', () {
@@ -171,7 +183,7 @@ void main() {
       final state = await container.read(authProvider.future);
 
       expect(state.status, AuthStatus.loggedIn);
-      expect((state.credential as LegacyCredential).token, token);
+      expect(state.credential!.accessToken, accessToken);
       expect(state.serverUrl, serverUrl);
 
       // The startup path must not touch the network at all; every probe
@@ -220,7 +232,7 @@ void main() {
       await container.read(authProvider.notifier).revalidationDone;
 
       expect(container.read(authProvider).value?.status, AuthStatus.loggedIn);
-      expect(await PreferenceHelper.asyncPref.containsKey(PREFS_USER), true);
+      expect(await PreferenceHelper.asyncPref.containsKey(PREFS_ACCESS_TOKEN), true);
     });
 
     test('token rejected (401) → session cleared but local DB kept', () async {
@@ -239,7 +251,7 @@ void main() {
       await container.read(authProvider.notifier).revalidationDone;
 
       expect(container.read(authProvider).value?.status, AuthStatus.loggedOut);
-      expect(await PreferenceHelper.asyncPref.containsKey(PREFS_USER), false);
+      expect(await PreferenceHelper.asyncPref.containsKey(PREFS_ACCESS_TOKEN), false);
       // PREFS_HAS_EVER_SYNCED stays so the next auto-login takes the offline
       // path and the cached DB stays usable.
       expect(await PreferenceHelper.asyncPref.getBool(PREFS_HAS_EVER_SYNCED), true);
@@ -257,7 +269,7 @@ void main() {
 
       // Regression (bug #2): a transient 5xx must not invalidate the session.
       expect(container.read(authProvider).value?.status, AuthStatus.loggedIn);
-      expect(await PreferenceHelper.asyncPref.containsKey(PREFS_USER), true);
+      expect(await PreferenceHelper.asyncPref.containsKey(PREFS_ACCESS_TOKEN), true);
     });
 
     test('probe returns 502 → stays logged in', () async {
@@ -271,7 +283,7 @@ void main() {
       await container.read(authProvider.notifier).revalidationDone;
 
       expect(container.read(authProvider).value?.status, AuthStatus.loggedIn);
-      expect(await PreferenceHelper.asyncPref.containsKey(PREFS_USER), true);
+      expect(await PreferenceHelper.asyncPref.containsKey(PREFS_ACCESS_TOKEN), true);
     });
 
     test('network error → stays logged in', () async {
@@ -285,7 +297,7 @@ void main() {
       await container.read(authProvider.notifier).revalidationDone;
 
       expect(container.read(authProvider).value?.status, AuthStatus.loggedIn);
-      expect(await PreferenceHelper.asyncPref.containsKey(PREFS_USER), true);
+      expect(await PreferenceHelper.asyncPref.containsKey(PREFS_ACCESS_TOKEN), true);
     });
 
     test('server version too old → state moves to serverUpdateRequired', () async {
@@ -363,6 +375,28 @@ void main() {
 
       verifyNever(mockClient.head(tProbe, headers: anyNamed('headers')));
     });
+
+    test('a retried auto-login replaces the listener instead of stacking one', () async {
+      final container = makeContainer();
+      await container.read(authProvider.future);
+      final notifier = container.read(authProvider.notifier);
+      await notifier.revalidationDone;
+
+      // What the recovery screens' retry button runs; it re-arms the listener
+      await notifier.retryAutoLogin();
+      await notifier.revalidationDone;
+      await pumpEventQueue();
+      // Consume the probes the two scheduling runs fired themselves
+      verify(mockClient.head(tProbe, headers: anyNamed('headers')));
+
+      connectivityStream.add(const [ConnectivityResult.wifi]);
+      await pumpEventQueue();
+      await notifier.revalidationDone;
+      await pumpEventQueue();
+
+      // One reconnect, one probe
+      verify(mockClient.head(tProbe, headers: anyNamed('headers'))).called(1);
+    });
   });
 
   group('never-synced session: PowerSync reachability', () {
@@ -398,7 +432,7 @@ void main() {
       expect(state.status, AuthStatus.powerSyncUnreachable);
       // Saved credentials must be preserved so the recovery screen's
       // "Try again" button can re-run the flow without a re-login.
-      expect((state.credential as LegacyCredential).token, token);
+      expect(state.credential!.accessToken, accessToken);
       expect(state.serverUrl, serverUrl);
     });
 
@@ -483,7 +517,7 @@ void main() {
       // A saved session must carry the user straight into the app instead of
       // stalling on a recovery screen.
       expect(state.status, AuthStatus.loggedIn);
-      expect((state.credential as LegacyCredential).token, token);
+      expect(state.credential!.accessToken, accessToken);
       expect(state.serverUrl, serverUrl);
       // No further server calls when Django itself is unreachable.
       verifyNever(mockClient.get(tPowerSyncToken, headers: anyNamed('headers')));
@@ -498,7 +532,7 @@ void main() {
       final state = await container.read(authProvider.future);
 
       expect(state.status, AuthStatus.loggedOut);
-      expect(await PreferenceHelper.asyncPref.containsKey(PREFS_USER), false);
+      expect(await PreferenceHelper.asyncPref.containsKey(PREFS_ACCESS_TOKEN), false);
     });
 
     test('Django HEAD returns 403 → loggedOut and saved user wiped', () async {
@@ -526,8 +560,8 @@ void main() {
 
       // Regression (bug #2): a transient 5xx must not log the user out.
       expect(state.status, AuthStatus.loggedIn);
-      expect((state.credential as LegacyCredential).token, token);
-      expect(await PreferenceHelper.asyncPref.containsKey(PREFS_USER), true);
+      expect(state.credential!.accessToken, accessToken);
+      expect(await PreferenceHelper.asyncPref.containsKey(PREFS_ACCESS_TOKEN), true);
       // A broken server means the rest of the gating chain is skipped.
       verifyNever(mockClient.get(tPowerSyncToken, headers: anyNamed('headers')));
     });
@@ -541,7 +575,7 @@ void main() {
       final state = await container.read(authProvider.future);
 
       expect(state.status, AuthStatus.loggedIn);
-      expect(await PreferenceHelper.asyncPref.containsKey(PREFS_USER), true);
+      expect(await PreferenceHelper.asyncPref.containsKey(PREFS_ACCESS_TOKEN), true);
     });
   });
 
@@ -591,7 +625,7 @@ void main() {
         await container.read(authProvider.notifier).logout();
 
         expect(await PreferenceHelper.asyncPref.containsKey(PREFS_HAS_EVER_SYNCED), false);
-        expect(await PreferenceHelper.asyncPref.containsKey(PREFS_USER), false);
+        expect(await PreferenceHelper.asyncPref.containsKey(PREFS_ACCESS_TOKEN), false);
       },
     );
 
@@ -600,7 +634,6 @@ void main() {
       final prefs = PreferenceHelper.asyncPref;
       await prefs.setString(PREFS_ACCESS_TOKEN, 'jwt-access');
       await prefs.setInt(PREFS_ACCESS_EXPIRES_AT, 1700000000);
-      await prefs.setString(PREFS_TOKEN_TYPE, AuthTokenType.headlessJwt.name);
       await prefs.setString(PREFS_SERVER_URL, serverUrl);
 
       final container = makeContainer();
@@ -610,7 +643,6 @@ void main() {
 
       expect(await prefs.containsKey(PREFS_ACCESS_TOKEN), false);
       expect(await prefs.containsKey(PREFS_ACCESS_EXPIRES_AT), false);
-      expect(await prefs.containsKey(PREFS_TOKEN_TYPE), false);
       expect(await prefs.containsKey(PREFS_SERVER_URL), false);
       verify(mockSecureStorage.deleteRefreshToken()).called(1);
     });
@@ -668,7 +700,7 @@ void main() {
       // Credentials are still cleared (the user logged out), but the marker
       // survives because the data was not actually removed.
       expect(container.read(authProvider).value?.status, AuthStatus.loggedOut);
-      expect(await prefs.containsKey(PREFS_USER), false);
+      expect(await prefs.containsKey(PREFS_ACCESS_TOKEN), false);
       expect(await prefs.getString(PREFS_DB_OWNER_USER_ID), '7');
     });
   });
@@ -688,7 +720,7 @@ void main() {
       // ever-synced flag) survives so the same user resumes incrementally.
       expect(await prefs.getString(PREFS_DB_OWNER_USER_ID), '7');
       expect(await prefs.getBool(PREFS_HAS_EVER_SYNCED), true);
-      expect(await prefs.containsKey(PREFS_USER), false);
+      expect(await prefs.containsKey(PREFS_ACCESS_TOKEN), false);
     });
 
     test('off wipes the DB owner marker and the ever-synced flag', () async {
@@ -707,46 +739,23 @@ void main() {
     });
   });
 
-  group('_tryAutoLogin: headless-JWT migration', () {
-    /// Replaces the legacy seed from setUp with the headless-JWT bundle.
-    Future<void> seedHeadlessBundle({String accessToken = 'jwt-access'}) async {
-      final prefs = PreferenceHelper.asyncPref;
-      await prefs.remove(PREFS_USER);
-      await prefs.setString(PREFS_ACCESS_TOKEN, accessToken);
-      // Far in the future so we don't trip on expiry, refresh isn't wired yet.
-      await prefs.setInt(
-        PREFS_ACCESS_EXPIRES_AT,
-        DateTime.now().add(const Duration(hours: 1)).millisecondsSinceEpoch,
-      );
-      await prefs.setString(PREFS_TOKEN_TYPE, AuthTokenType.headlessJwt.name);
-      await prefs.setString(PREFS_SERVER_URL, serverUrl);
-    }
-
-    test('prefers the headless bundle over PREFS_USER and probes with Bearer', () async {
-      // Both formats present, headless must win.
-      await seedHeadlessBundle(accessToken: 'jwt-access');
-      await PreferenceHelper.asyncPref.setString(
-        PREFS_USER,
-        json.encode({'token': 'legacy-token', 'serverUrl': serverUrl}),
-      );
-
+  group('_tryAutoLogin: stored credentials', () {
+    test('probes with the stored access token as a Bearer header', () async {
       final container = makeContainer();
       final state = await container.read(authProvider.future);
 
       expect(state.status, AuthStatus.loggedIn);
-      expect(state.credential, isA<JwtCredential>());
-      expect((state.credential as JwtCredential).accessToken, 'jwt-access');
+      expect(state.credential!.accessToken, accessToken);
 
       final captured =
           verify(
                 mockClient.head(tProbe, headers: captureAnyNamed('headers')),
               ).captured.single
               as Map<String, String>;
-      expect(captured[HttpHeaders.authorizationHeader], 'Bearer jwt-access');
+      expect(captured[HttpHeaders.authorizationHeader], 'Bearer $accessToken');
     });
 
-    test('headless 401 wipes the new prefs keys and the secure-storage refresh token', () async {
-      await seedHeadlessBundle();
+    test('401 wipes the prefs bundle and the secure-storage refresh token', () async {
       when(
         mockClient.head(tProbe, headers: anyNamed('headers')),
       ).thenAnswer((_) async => Response('Unauthorized', 401));
@@ -758,221 +767,32 @@ void main() {
       final prefs = PreferenceHelper.asyncPref;
       expect(await prefs.containsKey(PREFS_ACCESS_TOKEN), false);
       expect(await prefs.containsKey(PREFS_ACCESS_EXPIRES_AT), false);
-      expect(await prefs.containsKey(PREFS_TOKEN_TYPE), false);
       expect(await prefs.containsKey(PREFS_SERVER_URL), false);
       verify(mockSecureStorage.deleteRefreshToken()).called(1);
     });
 
-    test('missing required headless keys fall through to the legacy PREFS_USER path', () async {
-      // PREFS_TOKEN_TYPE set, but PREFS_ACCESS_TOKEN missing → fall through.
-      final prefs = PreferenceHelper.asyncPref;
-      await prefs.setString(PREFS_TOKEN_TYPE, AuthTokenType.headlessJwt.name);
-      // PREFS_USER seeded by setUp.
-
-      final container = makeContainer();
-      final state = await container.read(authProvider.future);
-
-      expect(state.status, AuthStatus.loggedIn);
-      expect(state.credential, isA<LegacyCredential>());
-      expect((state.credential as LegacyCredential).token, token);
-
-      final captured =
-          verify(
-                mockClient.head(tProbe, headers: captureAnyNamed('headers')),
-              ).captured.single
-              as Map<String, String>;
-      expect(captured[HttpHeaders.authorizationHeader], 'Token $token');
-    });
-  });
-
-  group('_tryAutoLogin: legacy-to-JWT migration', () {
-    String makeJwt(Map<String, dynamic> payload) {
-      String enc(Map<String, dynamic> m) =>
-          base64Url.encode(utf8.encode(jsonEncode(m))).replaceAll('=', '');
-      return '${enc({'alg': 'HS256', 'typ': 'JWT'})}.${enc(payload)}.signature';
-    }
-
-    /// Stubs the two-step migration: issue-refresh-token returns
-    /// [mintedRefresh], tokens/refresh returns [accessJwt] / [rotatedRefresh].
-    void stubMigrationSuccess({
-      required String mintedRefresh,
-      required String accessJwt,
-      String rotatedRefresh = 'rotated-refresh',
-    }) {
-      when(
-        mockClient.post(tIssueRefresh, headers: anyNamed('headers')),
-      ).thenAnswer(
-        (_) async => Response(jsonEncode({'refresh_token': mintedRefresh}), 200),
-      );
-      when(
-        mockClient.post(
-          tHeadlessRefresh,
-          headers: anyNamed('headers'),
-          body: anyNamed('body'),
-        ),
-      ).thenAnswer(
-        (_) async => Response(
-          jsonEncode({
-            'status': 200,
-            'data': {'access_token': accessJwt, 'refresh_token': rotatedRefresh},
-            'meta': {'is_authenticated': true},
-          }),
-          200,
-        ),
-      );
-    }
-
-    test('happy path: DRF token swapped for JWT bundle, PREFS_USER wiped', () async {
-      // Legacy blob is already seeded in the outer setUp. The migration
-      // round-trip must replace it with the headless-JWT bundle and the
-      // refresh token must land in secure storage.
-      final accessJwt = makeJwt({'sub': '42', 'exp': 1900000000});
-      stubMigrationSuccess(
-        mintedRefresh: 'minted-refresh',
-        accessJwt: accessJwt,
-        rotatedRefresh: 'rotated-refresh',
-      );
-
-      final container = makeContainer();
-      await container.read(authProvider.future);
-
-      final state = container.read(authProvider).value!;
-      expect(state.status, AuthStatus.loggedIn);
-      expect(state.credential, isA<JwtCredential>());
-      expect((state.credential as JwtCredential).accessToken, accessJwt);
-
-      final prefs = PreferenceHelper.asyncPref;
-      expect(await prefs.containsKey(PREFS_USER), false);
-      expect(await prefs.getString(PREFS_ACCESS_TOKEN), accessJwt);
-      // The migrated user claims DB ownership so a later different-user login
-      // still triggers a wipe.
-      expect(await prefs.getString(PREFS_DB_OWNER_USER_ID), '42');
-      verify(mockSecureStorage.writeRefreshToken('rotated-refresh')).called(1);
-
-      // The migration POST must have been authenticated with the legacy
-      // header — otherwise the backend can't identify the user.
-      final captured =
-          verify(
-                mockClient.post(tIssueRefresh, headers: captureAnyNamed('headers')),
-              ).captured.single
-              as Map<String, String>;
-      expect(captured[HttpHeaders.authorizationHeader], 'Token $token');
-    });
-
-    test('network error keeps the legacy DRF token in place for the next start', () async {
-      // The outer setUp's default stub already throws ClientException.
-      // The user must end up logged in via the legacy code path so the
-      // app stays usable offline; PREFS_USER stays so the next start
-      // retries the migration.
-      final container = makeContainer();
-      await container.read(authProvider.future);
-
-      final state = container.read(authProvider).value!;
-      expect(state.status, AuthStatus.loggedIn);
-      expect(state.credential, isA<LegacyCredential>());
-      expect(await PreferenceHelper.asyncPref.containsKey(PREFS_USER), true);
-      // No headless prefs must have been written.
-      verifyNever(mockSecureStorage.writeRefreshToken(any));
-    });
-
-    test('401 on the exchange endpoint wipes the legacy blob (token revoked)', () async {
-      // A 401 here is the unambiguous "this DRF token is no longer valid"
-      // signal: server-side revoked or user deleted. We wipe the blob so
-      // the next start drops to the login screen instead of looping.
-      when(
-        mockClient.post(tIssueRefresh, headers: anyNamed('headers')),
-      ).thenAnswer((_) async => Response('Unauthorized', 401));
+    test('a half-written bundle (no access token) resolves to logged out', () async {
+      await PreferenceHelper.asyncPref.remove(PREFS_ACCESS_TOKEN);
 
       final container = makeContainer();
       final state = await container.read(authProvider.future);
 
       expect(state.status, AuthStatus.loggedOut);
-      expect(await PreferenceHelper.asyncPref.containsKey(PREFS_USER), false);
-      // tokens/refresh must not have been called: we never got a refresh
-      // token to exchange.
-      verifyNever(
-        mockClient.post(
-          tHeadlessRefresh,
-          headers: anyNamed('headers'),
-          body: anyNamed('body'),
-        ),
-      );
-    });
-
-    test('5xx on the exchange endpoint keeps the legacy blob for retry', () async {
-      // Transient server issue: must not invalidate the local session.
-      // The user keeps working with the DRF token; the next start retries.
-      when(
-        mockClient.post(tIssueRefresh, headers: anyNamed('headers')),
-      ).thenAnswer((_) async => Response('Service Unavailable', 503));
-
-      final container = makeContainer();
-      final state = await container.read(authProvider.future);
-
-      expect(state.status, AuthStatus.loggedIn);
-      expect(state.credential, isA<LegacyCredential>());
-      expect(await PreferenceHelper.asyncPref.containsKey(PREFS_USER), true);
-    });
-
-    test('malformed exchange response keeps the legacy blob for retry', () async {
-      // 200 but no refresh_token in the body. Treated like a transient
-      // failure: keep using the DRF token, retry next start.
-      when(
-        mockClient.post(tIssueRefresh, headers: anyNamed('headers')),
-      ).thenAnswer((_) async => Response('{}', 200));
-
-      final container = makeContainer();
-      final state = await container.read(authProvider.future);
-
-      expect(state.status, AuthStatus.loggedIn);
-      expect(state.credential, isA<LegacyCredential>());
-      expect(await PreferenceHelper.asyncPref.containsKey(PREFS_USER), true);
-    });
-
-    test('refresh-exchange failure leaves the legacy blob intact', () async {
-      // issue-refresh-token succeeds, but the follow-up call to the
-      // headless tokens/refresh endpoint returns 5xx. We don't commit a
-      // half-migrated state: PREFS_USER stays, the user continues with
-      // DRF, the next start retries from step 1.
-      when(
-        mockClient.post(tIssueRefresh, headers: anyNamed('headers')),
-      ).thenAnswer(
-        (_) async => Response(jsonEncode({'refresh_token': 'minted'}), 200),
-      );
-      when(
-        mockClient.post(
-          tHeadlessRefresh,
-          headers: anyNamed('headers'),
-          body: anyNamed('body'),
-        ),
-      ).thenAnswer((_) async => Response('upstream error', 502));
-
-      final container = makeContainer();
-      final state = await container.read(authProvider.future);
-
-      expect(state.credential, isA<LegacyCredential>());
-      expect(await PreferenceHelper.asyncPref.containsKey(PREFS_USER), true);
-      verifyNever(mockSecureStorage.writeRefreshToken(any));
+      expect(state.credential, isNull);
+      verifyNever(mockClient.head(tProbe, headers: anyNamed('headers')));
     });
 
-    test('no legacy blob → migration is a no-op', () async {
-      // Existing headless-JWT user (or fresh install): the helper must
-      // not touch the network at all.
+    test('a leftover pre-JWT credential blob is deleted on startup', () async {
       final prefs = PreferenceHelper.asyncPref;
-      await prefs.remove(PREFS_USER);
-      await prefs.setString(PREFS_ACCESS_TOKEN, 'existing-jwt');
-      await prefs.setInt(
-        PREFS_ACCESS_EXPIRES_AT,
-        DateTime.now().add(const Duration(hours: 1)).millisecondsSinceEpoch,
+      await prefs.setString(
+        PREFS_USER,
+        json.encode({'token': 'stale-drf-token', 'serverUrl': serverUrl}),
       );
-      await prefs.setString(PREFS_TOKEN_TYPE, AuthTokenType.headlessJwt.name);
-      await prefs.setString(PREFS_SERVER_URL, serverUrl);
-      await prefs.setBool(PREFS_HAS_EVER_SYNCED, true);
 
       final container = makeContainer();
       await container.read(authProvider.future);
 
-      verifyNever(mockClient.post(tIssueRefresh, headers: anyNamed('headers')));
+      expect(await prefs.containsKey(PREFS_USER), false);
     });
   });
 
@@ -995,13 +815,11 @@ void main() {
         // online, and the connectivity-triggered revalidation must refresh
         // first instead of wasting the still-valid refresh token on a 401.
         final prefs = PreferenceHelper.asyncPref;
-        await prefs.remove(PREFS_USER);
         await prefs.setString(PREFS_ACCESS_TOKEN, 'expired-access');
         await prefs.setInt(
           PREFS_ACCESS_EXPIRES_AT,
           DateTime.now().subtract(const Duration(hours: 1)).millisecondsSinceEpoch,
         );
-        await prefs.setString(PREFS_TOKEN_TYPE, AuthTokenType.headlessJwt.name);
         await prefs.setString(PREFS_SERVER_URL, serverUrl);
         await prefs.setBool(PREFS_HAS_EVER_SYNCED, true);
 
@@ -1055,13 +873,11 @@ void main() {
 
     Future<void> seedHeadlessBundle() async {
       final prefs = PreferenceHelper.asyncPref;
-      await prefs.remove(PREFS_USER);
       await prefs.setString(PREFS_ACCESS_TOKEN, 'old-access');
       await prefs.setInt(
         PREFS_ACCESS_EXPIRES_AT,
         DateTime.now().add(const Duration(hours: 1)).millisecondsSinceEpoch,
       );
-      await prefs.setString(PREFS_TOKEN_TYPE, AuthTokenType.headlessJwt.name);
       await prefs.setString(PREFS_SERVER_URL, serverUrl);
     }
 
@@ -1114,6 +930,43 @@ void main() {
       expect(headers['accept'], 'application/json');
     });
 
+    test('a refresh completing after the session ended is discarded', () async {
+      // The result belongs to the session that started the request: writing
+      // it would replant the tokens into the cleared storage and republish
+      // the logged-in state
+      await seedHeadlessBundle();
+      when(mockSecureStorage.readRefreshToken()).thenAnswer((_) async => 'old-refresh');
+
+      final gate = Completer<Response>();
+      when(
+        mockClient.post(tRefresh, headers: anyNamed('headers'), body: anyNamed('body')),
+      ).thenAnswer((_) => gate.future);
+
+      final container = makeContainer();
+      await container.read(authProvider.future);
+      final notifier = container.read(authProvider.notifier);
+
+      final refresh = notifier.refreshAccessToken();
+      await pumpEventQueue();
+      await notifier.clearSessionOnly();
+
+      final newAccess = makeJwt({'exp': 1900000000});
+      gate.complete(
+        Response(
+          jsonEncode({
+            'status': 200,
+            'data': {'access_token': newAccess, 'refresh_token': 'new-refresh'},
+            'meta': {'is_authenticated': true},
+          }),
+          200,
+        ),
+      );
+      await refresh;
+
+      expect(container.read(authProvider).value!.isAuth, isFalse);
+      verifyNever(mockSecureStorage.writeRefreshToken(any));
+    });
+
     test('clearSessionOnly keeps the DB-owner marker (the local DB is preserved)', () async {
       // An involuntary clear keeps the local DB on disk, so its owner marker
       // must survive too: it is what lets a *different* user signing in later
@@ -1255,21 +1108,18 @@ void main() {
         mockClient.post(tRefresh, headers: anyNamed('headers'), body: anyNamed('body')),
       ).thenAnswer((_) async => Response('Bad Request', 400));
 
-      final container = makeContainer();
+      final session = _HangingPowerSyncSession();
+      final container = makeContainer(
+        overrides: [powerSyncSessionProvider.overrideWithValue(session)],
+      );
       await container.read(authProvider.future);
-
-      var disconnectCalls = 0;
       final notifier = container.read(authProvider.notifier);
-      notifier.disconnectPowerSync = () {
-        disconnectCalls++;
-        return Completer<void>().future; // never completes
-      };
 
       // Before the fix this future never completed.
       await notifier.refreshAccessToken().timeout(const Duration(seconds: 5));
 
       expect(container.read(authProvider).value!.status, AuthStatus.loggedOut);
-      expect(disconnectCalls, 1);
+      expect(session.disconnectCalls, 1);
     });
 
     test('network error → stays logged in', () async {
@@ -1350,13 +1200,11 @@ void main() {
     /// session whose access token expires at [expiresAt].
     Future<void> seedJwtSession({required DateTime expiresAt}) async {
       final prefs = PreferenceHelper.asyncPref;
-      await prefs.remove(PREFS_USER);
       await prefs.setString(
         PREFS_ACCESS_TOKEN,
         makeJwt({'sub': '42', 'exp': expiresAt.millisecondsSinceEpoch ~/ 1000}),
       );
       await prefs.setInt(PREFS_ACCESS_EXPIRES_AT, expiresAt.millisecondsSinceEpoch);
-      await prefs.setString(PREFS_TOKEN_TYPE, AuthTokenType.headlessJwt.name);
       await prefs.setString(PREFS_SERVER_URL, serverUrl);
     }
 
diff --git a/test/core/network/server_gating_test.dart b/test/core/network/server_gating_test.dart
index 07747eec3..8e2bf1ce0 100644
--- a/test/core/network/server_gating_test.dart
+++ b/test/core/network/server_gating_test.dart
@@ -140,7 +140,7 @@ void main() {
 
   group('isPowerSyncReachable', () {
     const serverUrl = 'https://wger.example.com';
-    const credential = AuthCredential.legacy('abc123');
+    const credential = JwtCredential(accessToken: 'abc123');
 
     /// Gating whose token endpoint answers [tokenBody] and whose liveness
     /// probes answer 200 only for [liveUrl]. Every requested URL is
diff --git a/test/core/recovery_screens_test.dart b/test/core/recovery_screens_test.dart
index ef3713aca..462960d56 100644
--- a/test/core/recovery_screens_test.dart
+++ b/test/core/recovery_screens_test.dart
@@ -28,6 +28,7 @@ import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
 import 'package:wger/core/consts.dart';
 import 'package:wger/core/network/auth_notifier.dart';
+import 'package:wger/core/network/network_provider.dart';
 import 'package:wger/core/network/secure_token_storage.dart';
 import 'package:wger/core/powersync_unreachable_screen.dart';
 import 'package:wger/core/shared_preferences.dart';
@@ -47,7 +48,7 @@ void main() {
   late MockSecureTokenStorage mockSecureStorage;
 
   const serverUrl = 'https://wger.example';
-  const token = 'token-12345';
+  const accessToken = 'access-token-12345';
   const powerSyncUrl = 'https://ps.example/';
 
   final tProbe = Uri.parse('$serverUrl/api/v2/routine/');
@@ -55,7 +56,6 @@ void main() {
   final tMinAppVersion = Uri.parse('$serverUrl/api/v2/min-app-version/');
   final tPowerSyncToken = Uri.parse('$serverUrl/api/v2/powersync-token');
   final tLiveness = Uri.parse('${powerSyncUrl}probes/liveness');
-  final tIssueRefresh = Uri.parse('$serverUrl/api/v2/issue-refresh-token');
 
   Widget wrap(Widget child) {
     return ProviderScope(
@@ -100,10 +100,12 @@ void main() {
     final prefs = PreferenceHelper.asyncPref;
 
     // Saved login → autoLogin runs the full probe path.
-    await prefs.setString(
-      PREFS_USER,
-      json.encode({'token': token, 'serverUrl': serverUrl}),
+    await prefs.setString(PREFS_ACCESS_TOKEN, accessToken);
+    await prefs.setInt(
+      PREFS_ACCESS_EXPIRES_AT,
+      DateTime.now().add(const Duration(hours: 1)).millisecondsSinceEpoch,
     );
+    await prefs.setString(PREFS_SERVER_URL, serverUrl);
 
     // Default happy-path mocks. Test groups override one of these to
     // steer the auth notifier into the targeted recovery state.
@@ -121,14 +123,6 @@ void main() {
       ),
     );
     when(mockClient.get(tLiveness)).thenAnswer((_) async => Response('OK', 200));
-
-    // Legacy → JWT auto-migration runs on every auto-login. These tests
-    // intentionally drive the *legacy* recovery flow, so stub the
-    // migration to a clean "offline" failure: the helper short-circuits
-    // and the rest of the auto-login proceeds against the DRF token.
-    when(
-      mockClient.post(tIssueRefresh, headers: anyNamed('headers')),
-    ).thenThrow(http.ClientException('SocketException: stub default'));
   });
 
   group('PowerSyncUnreachableScreen', () {
@@ -165,14 +159,14 @@ void main() {
       verify(mockClient.get(tLiveness)).called(1);
     });
 
-    testWidgets('"Log out" wipes saved user and navigates to "/"', (tester) async {
+    testWidgets('"Log out" wipes saved credentials and navigates to "/"', (tester) async {
       await tester.pumpWidget(wrap(const PowerSyncUnreachableScreen()));
       await tester.pumpAndSettle();
 
       await tester.tap(find.text('Log out'));
       await tester.pumpAndSettle();
 
-      expect(await PreferenceHelper.asyncPref.containsKey(PREFS_USER), false);
+      expect(await PreferenceHelper.asyncPref.containsKey(PREFS_ACCESS_TOKEN), false);
       expect(find.text('AUTH_SCREEN_STUB'), findsOneWidget);
     });
   });
diff --git a/test/core/validators_test.mocks.dart b/test/core/validators_test.mocks.dart
index 9be674b15..e5d022259 100644
--- a/test/core/validators_test.mocks.dart
+++ b/test/core/validators_test.mocks.dart
@@ -2335,17 +2335,6 @@ class MockAppLocalizations extends _i1.Mock implements _i2.AppLocalizations {
           )
           as String);
 
-  @override
-  String get metricType =>
-      (super.noSuchMethod(
-            Invocation.getter(#metricType),
-            returnValue: _i3.dummyValue<String>(
-              this,
-              Invocation.getter(#metricType),
-            ),
-          )
-          as String);
-
   @override
   String get reorderCategories =>
       (super.noSuchMethod(
@@ -2368,17 +2357,6 @@ class MockAppLocalizations extends _i1.Mock implements _i2.AppLocalizations {
           )
           as String);
 
-  @override
-  String get metricBodyWeight =>
-      (super.noSuchMethod(
-            Invocation.getter(#metricBodyWeight),
-            returnValue: _i3.dummyValue<String>(
-              this,
-              Invocation.getter(#metricBodyWeight),
-            ),
-          )
-          as String);
-
   @override
   String get metricLeanBodyMass =>
       (super.noSuchMethod(
@@ -2500,17 +2478,6 @@ class MockAppLocalizations extends _i1.Mock implements _i2.AppLocalizations {
           )
           as String);
 
-  @override
-  String get metricEnergy =>
-      (super.noSuchMethod(
-            Invocation.getter(#metricEnergy),
-            returnValue: _i3.dummyValue<String>(
-              this,
-              Invocation.getter(#metricEnergy),
-            ),
-          )
-          as String);
-
   @override
   String get metricSleep =>
       (super.noSuchMethod(
@@ -3334,6 +3301,17 @@ class MockAppLocalizations extends _i1.Mock implements _i2.AppLocalizations {
           )
           as String);
 
+  @override
+  String get aboutPrivacyPolicyTitle =>
+      (super.noSuchMethod(
+            Invocation.getter(#aboutPrivacyPolicyTitle),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#aboutPrivacyPolicyTitle),
+            ),
+          )
+          as String);
+
   @override
   String get others =>
       (super.noSuchMethod(
@@ -5344,17 +5322,6 @@ class MockAppLocalizations extends _i1.Mock implements _i2.AppLocalizations {
           )
           as String);
 
-  @override
-  String get calculationValuesCalculated =>
-      (super.noSuchMethod(
-            Invocation.getter(#calculationValuesCalculated),
-            returnValue: _i3.dummyValue<String>(
-              this,
-              Invocation.getter(#calculationValuesCalculated),
-            ),
-          )
-          as String);
-
   @override
   String get calculationType =>
       (super.noSuchMethod(
diff --git a/test/core/widgets/dashboard/calendar_test.dart b/test/core/widgets/dashboard/calendar_test.dart
new file mode 100644
index 000000000..602182e75
--- /dev/null
+++ b/test/core/widgets/dashboard/calendar_test.dart
@@ -0,0 +1,209 @@
+/*
+ * 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:timezone/data/latest_all.dart' as tzdata;
+import 'package:wger/core/widgets/dashboard/calendar.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/models/measurement_bucket.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:wger/features/measurements/providers/measurement_notifier.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/l10n/generated/app_localizations.dart';
+
+import '../../../../test_data/body_weight.dart';
+import '../../../../test_data/routines.dart';
+
+/// Feeds a fixed profile into the widget without the repository underneath.
+class _StubUserProfileNotifier extends UserProfileNotifier {
+  _StubUserProfileNotifier(this._profile);
+
+  final UserProfile _profile;
+
+  @override
+  Stream<UserProfile?> build() => Stream.value(_profile);
+}
+
+/// Feeds fixed sessions in, which the state derives from its routines.
+class _StubRoutinesRiverpod extends RoutinesRiverpod {
+  _StubRoutinesRiverpod(this._sessions);
+
+  final List<WorkoutSession> _sessions;
+
+  @override
+  Stream<RoutinesState> build() =>
+      Stream.value(RoutinesState(routines: [getTestRoutine()..sessions = _sessions]));
+}
+
+class _StubNutritionNotifier extends NutritionNotifier {
+  @override
+  Stream<NutritionState> build() => Stream.value(const NutritionState());
+}
+
+void main() {
+  setUpAll(tzdata.initializeTimeZones);
+
+  final bodyWeight = getBodyWeightCategory();
+
+  /// One daily bucket, i.e. what the calendar reads for a day that was measured
+  MeasurementBucket bucket(
+    DateTime day,
+    num sum, {
+    int count = 1,
+    String? unit,
+  }) => MeasurementBucket(
+    start: day,
+    unit: unit,
+    count: count,
+    sum: sum,
+    min: sum / count,
+    max: sum / count,
+  );
+
+  Widget renderWidget({
+    required Map<String, List<MeasurementBucket>> dailyBuckets,
+    List<MeasurementCategory> categories = const [],
+    List<WorkoutSession> sessions = const [],
+    bool isMetric = true,
+    String? timeZone,
+  }) {
+    return ProviderScope(
+      overrides: [
+        userProfileProvider.overrideWith(
+          () => _StubUserProfileNotifier(
+            UserProfile(id: 1, weightUnitStr: isMetric ? 'kg' : 'lb', timeZone: timeZone),
+          ),
+        ),
+        measurementCategoriesProvider.overrideWith((ref) => Stream.value(categories)),
+        measurementDailyBucketsProvider.overrideWith((ref) => Stream.value(dailyBuckets)),
+        routinesRiverpodProvider.overrideWith(() => _StubRoutinesRiverpod(sessions)),
+        nutritionProvider.overrideWith(_StubNutritionNotifier.new),
+      ],
+      child: const MaterialApp(
+        locale: Locale('en'),
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        home: Scaffold(
+          body: SingleChildScrollView(child: DashboardCalendarWidget()),
+        ),
+      ),
+    );
+  }
+
+  /// The day the calendar starts on, which is the one it lists events for
+  final today = DateTime(DateTime.now().year, DateTime.now().month, DateTime.now().day);
+
+  testWidgets('a day of readings is one event, not one per reading', (tester) async {
+    await tester.pumpWidget(
+      renderWidget(
+        categories: [bodyWeight],
+        dailyBuckets: {
+          bodyWeight.id!: [bucket(today, 240, count: 3)],
+        },
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    // Three weigh-ins averaging 80 kg, shown as the day's one value
+    expect(find.text('80 kg'), findsOneWidget);
+  });
+
+  testWidgets('body weight is shown in the unit of the profile', (tester) async {
+    await tester.pumpWidget(
+      renderWidget(
+        categories: [bodyWeight],
+        dailyBuckets: {
+          bodyWeight.id!: [bucket(today, 80)],
+        },
+        isMetric: false,
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    // 80 kg are 176.37 lb; the value is stored in kg and converted for the card
+    expect(find.text('176.37 lb'), findsOneWidget);
+  });
+
+  testWidgets('another measurement is named and shown in its category unit', (tester) async {
+    final biceps = MeasurementCategory(id: 'biceps', name: 'Biceps', unit: 'cm');
+
+    await tester.pumpWidget(
+      renderWidget(
+        categories: [biceps],
+        dailyBuckets: {
+          biceps.id!: [bucket(today, 38.5)],
+        },
+        // The profile unit governs body weight only
+        isMetric: false,
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    expect(find.text('Biceps: 38.5 cm'), findsOneWidget);
+  });
+
+  // The instant is midnight of the day the calendar opens on. Far enough east
+  // it is that day, far enough west it is still the one before, and neither
+  // depends on the zone the test machine runs in
+  WorkoutSession sessionAtMidnight() => WorkoutSession(routineId: 1, datetimeStart: today.toUtc());
+
+  testWidgets('a session counts towards the day it is on in the owner zone', (tester) async {
+    await tester.pumpWidget(
+      renderWidget(
+        dailyBuckets: const {},
+        sessions: [sessionAtMidnight()],
+        timeZone: 'Pacific/Kiritimati',
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    expect(find.textContaining('Impression'), findsOneWidget);
+  });
+
+  testWidgets('the same session is the day before in a zone far enough west', (tester) async {
+    await tester.pumpWidget(
+      renderWidget(
+        dailyBuckets: const {},
+        sessions: [sessionAtMidnight()],
+        timeZone: 'Pacific/Midway',
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    expect(find.textContaining('Impression'), findsNothing);
+  });
+
+  testWidgets('a profile without a zone falls back to the device day', (tester) async {
+    final session = WorkoutSession(
+      routineId: 1,
+      datetimeStart: today.add(const Duration(hours: 12)),
+    );
+
+    await tester.pumpWidget(
+      renderWidget(dailyBuckets: const {}, sessions: [session]),
+    );
+    await tester.pumpAndSettle();
+
+    expect(find.textContaining('Impression'), findsOneWidget);
+  });
+}
diff --git a/test/core/widgets/dashboard/widgets/weight_test.dart b/test/core/widgets/dashboard/widgets/weight_test.dart
new file mode 100644
index 000000000..8410e3e7f
--- /dev/null
+++ b/test/core/widgets/dashboard/widgets/weight_test.dart
@@ -0,0 +1,105 @@
+/*
+ * 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/core/widgets/dashboard/widgets/nothing_found.dart';
+import 'package:wger/core/widgets/dashboard/widgets/weight.dart';
+import 'package:wger/core/widgets/error.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/models/measurement_bucket.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/categories_card.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+import '../../../../../test_data/body_weight.dart';
+import '../../../../helpers/measurement_chart_buckets.dart';
+
+/// Feeds a fixed profile into the widget without the repository underneath.
+class _StubUserProfileNotifier extends UserProfileNotifier {
+  @override
+  Stream<UserProfile?> build() => Stream.value(UserProfile(id: 1, weightUnitStr: 'kg'));
+}
+
+void main() {
+  final category = getBodyWeightCategory();
+  final level = chartBucketLevel(category.metricType, category.chartType);
+
+  Widget renderWidget(Stream<List<MeasurementBucket>> buckets) {
+    return ProviderScope(
+      overrides: [
+        userProfileProvider.overrideWith(_StubUserProfileNotifier.new),
+        bodyWeightCategoryOnlyProvider.overrideWith((ref) => Stream.value(category)),
+        // The dashboard card reads the full history, so the range has no cutoff
+        measurementChartBucketsProvider(
+          category.id!,
+          null,
+          null,
+          level,
+        ).overrideWith((ref) => buckets),
+      ],
+      child: const MaterialApp(
+        locale: Locale('en'),
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        home: Scaffold(
+          body: SingleChildScrollView(child: DashboardWeightWidget()),
+        ),
+      ),
+    );
+  }
+
+  testWidgets('shows the error instead of spinning forever', (tester) async {
+    await tester.pumpWidget(renderWidget(Stream.error(Exception('no chart for you'))));
+    await tester.pumpAndSettle();
+
+    expect(find.byType(StreamErrorIndicator), findsOneWidget);
+    expect(find.byType(CircularProgressIndicator), findsNothing);
+  });
+
+  testWidgets('shows a spinner while the points load', (tester) async {
+    await tester.pumpWidget(renderWidget(const Stream.empty()));
+    // No pumpAndSettle, the spinner animates forever
+    await tester.pump();
+
+    expect(find.byType(CircularProgressIndicator), findsOneWidget);
+    expect(find.byType(StreamErrorIndicator), findsNothing);
+  });
+
+  testWidgets('renders the shared category card, titled by the header alone', (tester) async {
+    await tester.pumpWidget(
+      renderWidget(Stream.value(entryBuckets([testWeightEntry1, testWeightEntry2]))),
+    );
+    await tester.pumpAndSettle();
+
+    expect(find.byType(CategoriesCard), findsOneWidget);
+    expect(find.text('Weight'), findsOneWidget);
+  });
+
+  testWidgets('offers the first entry while there are no points', (tester) async {
+    await tester.pumpWidget(renderWidget(Stream.value(const [])));
+    await tester.pumpAndSettle();
+
+    expect(find.byType(NothingFound), findsOneWidget);
+    expect(find.byType(CategoriesCard), findsNothing);
+  });
+}
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/providers/timezone_sync_test.dart b/test/features/account/providers/timezone_sync_test.dart
new file mode 100644
index 000000000..cddba757e
--- /dev/null
+++ b/test/features/account/providers/timezone_sync_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_test/flutter_test.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/shared_preferences.dart';
+import 'package:wger/features/account/models/user_profile.dart';
+import 'package:wger/features/account/providers/timezone_sync.dart';
+
+import 'user_profile_notifier_test.mocks.dart';
+
+const detected = 'Pacific/Auckland';
+
+void main() {
+  late MockUserProfileRepository mockRepo;
+
+  TimezoneSync makeSync() => TimezoneSync(mockRepo, detect: () async => detected);
+
+  void repoHasProfile(String? timeZone) {
+    when(mockRepo.watchDrift()).thenAnswer(
+      (_) => Stream.value(UserProfile(id: 1, weightUnitStr: 'kg', timeZone: timeZone)),
+    );
+  }
+
+  setUp(() async {
+    // PreferenceHelper.asyncPref is a singleton bound to the first platform
+    // instance, so swapping the store is not enough: clear the key explicitly
+    SharedPreferencesAsyncPlatform.instance = InMemorySharedPreferencesAsync.empty();
+    await PreferenceHelper.asyncPref.remove(reportedTimezonePrefKey);
+    mockRepo = MockUserProfileRepository();
+    when(mockRepo.updateTimeZoneDrift(any, any)).thenAnswer((_) async {});
+  });
+
+  test('fills an empty profile field and remembers the report', () async {
+    repoHasProfile('');
+
+    await makeSync().reportIfNeeded();
+
+    verify(mockRepo.updateTimeZoneDrift(1, detected)).called(1);
+    expect(await PreferenceHelper.asyncPref.getString(reportedTimezonePrefKey), detected);
+  });
+
+  test('a row synced before the column existed counts as empty', () async {
+    repoHasProfile(null);
+
+    await makeSync().reportIfNeeded();
+
+    verify(mockRepo.updateTimeZoneDrift(1, detected)).called(1);
+  });
+
+  test('an unchanged zone does not even read the profile', () async {
+    await PreferenceHelper.asyncPref.setString(reportedTimezonePrefKey, detected);
+
+    await makeSync().reportIfNeeded();
+
+    verifyNever(mockRepo.watchDrift());
+    verifyNever(mockRepo.updateTimeZoneDrift(any, any));
+  });
+
+  test('follows a device move when the profile still holds our old report', () async {
+    await PreferenceHelper.asyncPref.setString(reportedTimezonePrefKey, 'America/Denver');
+    repoHasProfile('America/Denver');
+
+    await makeSync().reportIfNeeded();
+
+    verify(mockRepo.updateTimeZoneDrift(1, detected)).called(1);
+  });
+
+  test('leaves a zone alone that someone else set', () async {
+    repoHasProfile('Europe/Berlin');
+
+    await makeSync().reportIfNeeded();
+
+    verifyNever(mockRepo.updateTimeZoneDrift(any, any));
+    expect(await PreferenceHelper.asyncPref.getString(reportedTimezonePrefKey), null);
+  });
+
+  test('only remembers a zone the profile already matches', () async {
+    repoHasProfile(detected);
+
+    await makeSync().reportIfNeeded();
+
+    verifyNever(mockRepo.updateTimeZoneDrift(any, any));
+    expect(await PreferenceHelper.asyncPref.getString(reportedTimezonePrefKey), detected);
+  });
+}
diff --git a/test/features/account/providers/user_profile_notifier_test.mocks.dart b/test/features/account/providers/user_profile_notifier_test.mocks.dart
index 89adbd634..fc7f21125 100644
--- a/test/features/account/providers/user_profile_notifier_test.mocks.dart
+++ b/test/features/account/providers/user_profile_notifier_test.mocks.dart
@@ -40,6 +40,15 @@ class MockUserProfileRepository extends _i1.Mock implements _i2.UserProfileRepos
           )
           as _i3.Stream<_i4.UserProfile?>);
 
+  @override
+  _i3.Future<void> updateTimeZoneDrift(int? id, String? timeZone) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateTimeZoneDrift, [id, timeZone]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
   @override
   _i3.Future<void> editLocalDrift(_i4.UserProfile? profile) =>
       (super.noSuchMethod(
diff --git a/test/features/account/providers/user_profile_repository_test.dart b/test/features/account/providers/user_profile_repository_test.dart
index cc7f9028e..686316bab 100644
--- a/test/features/account/providers/user_profile_repository_test.dart
+++ b/test/features/account/providers/user_profile_repository_test.dart
@@ -18,6 +18,7 @@
 
 import 'dart:async';
 
+import 'package:drift/drift.dart' show Value;
 import 'package:flutter_test/flutter_test.dart';
 import 'package:wger/database/powersync/database.dart';
 import 'package:wger/features/account/models/user_profile.dart';
@@ -38,10 +39,16 @@ void main() {
     await db.close();
   });
 
-  Future<void> seed({int id = 1, String weightUnit = 'kg'}) async {
+  Future<void> seed({int id = 1, String weightUnit = 'kg', int? height}) async {
     await db
         .into(db.userProfileTable)
-        .insert(UserProfileTableCompanion.insert(id: id, weightUnitStr: weightUnit));
+        .insert(
+          UserProfileTableCompanion.insert(
+            id: id,
+            weightUnitStr: weightUnit,
+            height: Value(height),
+          ),
+        );
   }
 
   group('watchDrift', () {
@@ -59,6 +66,19 @@ void main() {
       expect(profile.weightUnitStr, 'lb');
     });
 
+    test('reads the height the calculated categories divide by', () async {
+      await seed(height: 182);
+
+      expect((await repo.watchDrift().first)!.height, 182);
+    });
+
+    test('reads null for a profile that has no height', () async {
+      // Also what a row synced before the column existed reads
+      await seed();
+
+      expect((await repo.watchDrift().first)!.height, isNull);
+    });
+
     test('re-emits after the row changes', () async {
       await seed();
       final iter = StreamIterator(repo.watchDrift());
@@ -84,5 +104,37 @@ void main() {
       final row = await db.select(db.userProfileTable).getSingle();
       expect(row.weightUnitStr, 'lb');
     });
+
+    test('writes the height the profile form edited', () async {
+      await seed(height: 182);
+
+      await repo.editLocalDrift(UserProfile(id: 1, weightUnitStr: 'kg', height: 178));
+
+      final row = await db.select(db.userProfileTable).getSingle();
+      expect(row.height, 178);
+    });
+
+    test('leaves the reported timezone alone', () async {
+      // The column belongs to TimezoneSync; the server rejects it as null,
+      // taking the rest of the profile write down with it
+      await seed();
+      await repo.updateTimeZoneDrift(1, 'Pacific/Auckland');
+
+      await repo.editLocalDrift(UserProfile(id: 1, weightUnitStr: 'lb'));
+
+      final row = await db.select(db.userProfileTable).getSingle();
+      expect(row.timeZone, 'Pacific/Auckland');
+    });
+
+    test('clears the height when the profile has none', () async {
+      // The server allows a profile without one, so an emptied field has to
+      // reach the column as NULL rather than leaving the old value standing
+      await seed(height: 182);
+
+      await repo.editLocalDrift(UserProfile(id: 1, weightUnitStr: 'kg'));
+
+      final row = await db.select(db.userProfileTable).getSingle();
+      expect(row.height, isNull);
+    });
   });
 }
diff --git a/test/features/account/widgets/forms_test.dart b/test/features/account/widgets/forms_test.dart
new file mode 100644
index 000000000..f3ba69a1a
--- /dev/null
+++ b/test/features/account/widgets/forms_test.dart
@@ -0,0 +1,142 @@
+/*
+ * 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/network/network_provider.dart';
+import 'package:wger/features/account/models/account.dart';
+import 'package:wger/features/account/models/user_profile.dart';
+import 'package:wger/features/account/providers/account_repository.dart';
+import 'package:wger/features/account/providers/user_profile_repository.dart';
+import 'package:wger/features/account/widgets/forms.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+import 'forms_test.mocks.dart';
+
+@GenerateMocks([UserProfileRepository, AccountRepository])
+void main() {
+  const account = Account(
+    username: 'roland',
+    email: 'roland@example.com',
+    emailVerified: true,
+    isTrustworthy: true,
+  );
+
+  late MockUserProfileRepository profileRepo;
+
+  /// Renders the profile form over a profile of [height] cm.
+  Future<void> pump(WidgetTester tester, {int? height}) async {
+    profileRepo = MockUserProfileRepository();
+    when(profileRepo.watchDrift()).thenAnswer(
+      (_) => Stream.value(UserProfile(id: 1, weightUnitStr: 'kg', height: height)),
+    );
+    when(profileRepo.editLocalDrift(any)).thenAnswer((_) async {});
+    final accountRepo = MockAccountRepository();
+    when(accountRepo.fetchAccount()).thenAnswer((_) async => account);
+
+    await tester.pumpWidget(
+      ProviderScope(
+        overrides: [
+          userProfileRepositoryProvider.overrideWithValue(profileRepo),
+          accountRepositoryProvider.overrideWithValue(accountRepo),
+          networkStatusProvider.overrideWithValue(true),
+        ],
+        child: const MaterialApp(
+          localizationsDelegates: AppLocalizations.localizationsDelegates,
+          supportedLocales: AppLocalizations.supportedLocales,
+          home: Scaffold(
+            body: SingleChildScrollView(child: UserProfileForm()),
+          ),
+        ),
+      ),
+    );
+    await tester.pumpAndSettle();
+  }
+
+  /// The profile the form last wrote. Reads the recorded calls once: a second
+  /// verify finds nothing, mockito consumes them.
+  UserProfile saved() =>
+      verify(profileRepo.editLocalDrift(captureAny)).captured.last as UserProfile;
+
+  Future<void> save(WidgetTester tester) async {
+    await tester.ensureVisible(find.byType(ElevatedButton));
+    await tester.tap(find.byType(ElevatedButton));
+    await tester.pumpAndSettle();
+  }
+
+  testWidgets('the height is prefilled from the synced profile', (tester) async {
+    await pump(tester, height: 182);
+
+    expect(find.widgetWithText(TextFormField, '182'), findsOneWidget);
+  });
+
+  testWidgets('an edited height is saved', (tester) async {
+    await pump(tester, height: 182);
+
+    await tester.enterText(find.byKey(const Key('heightField')), '178');
+    await save(tester);
+
+    expect(saved().height, 178);
+  });
+
+  testWidgets('a height is saved for a profile that had none', (tester) async {
+    await pump(tester);
+
+    await tester.enterText(find.byKey(const Key('heightField')), '182');
+    await save(tester);
+
+    expect(saved().height, 182);
+  });
+
+  testWidgets('clearing the field clears the height', (tester) async {
+    // The server allows a profile without one, and nothing else does the
+    // clearing: an emptied field has to reach the column as NULL
+    await pump(tester, height: 182);
+
+    await tester.enterText(find.byKey(const Key('heightField')), '');
+    await save(tester);
+
+    expect(saved().height, isNull);
+  });
+
+  testWidgets('an untouched height survives a change to the weight unit', (tester) async {
+    await pump(tester, height: 182);
+
+    await tester.ensureVisible(find.byType(SwitchListTile));
+    await tester.tap(find.byType(SwitchListTile));
+    await tester.pumpAndSettle();
+    await save(tester);
+
+    final profile = saved();
+    expect(profile.weightUnitStr, 'lb');
+    expect(profile.height, 182);
+  });
+
+  testWidgets('a height outside what the server takes is refused', (tester) async {
+    await pump(tester, height: 182);
+
+    await tester.enterText(find.byKey(const Key('heightField')), '250');
+    await save(tester);
+
+    expect(find.text('Please enter a value between 140 and 230'), findsOneWidget);
+    verifyNever(profileRepo.editLocalDrift(any));
+  });
+}
diff --git a/test/features/account/widgets/forms_test.mocks.dart b/test/features/account/widgets/forms_test.mocks.dart
new file mode 100644
index 000000000..1619e3acb
--- /dev/null
+++ b/test/features/account/widgets/forms_test.mocks.dart
@@ -0,0 +1,103 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in wger/test/features/account/widgets/forms_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i4;
+
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:wger/features/account/models/account.dart' as _i2;
+import 'package:wger/features/account/models/user_profile.dart' as _i5;
+import 'package:wger/features/account/providers/account_repository.dart' as _i6;
+import 'package:wger/features/account/providers/user_profile_repository.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
+
+class _FakeAccount_0 extends _i1.SmartFake implements _i2.Account {
+  _FakeAccount_0(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+/// A class which mocks [UserProfileRepository].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockUserProfileRepository extends _i1.Mock implements _i3.UserProfileRepository {
+  MockUserProfileRepository() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i4.Stream<_i5.UserProfile?> watchDrift() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchDrift, []),
+            returnValue: _i4.Stream<_i5.UserProfile?>.empty(),
+          )
+          as _i4.Stream<_i5.UserProfile?>);
+
+  @override
+  _i4.Future<void> updateTimeZoneDrift(int? id, String? timeZone) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateTimeZoneDrift, [id, timeZone]),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> editLocalDrift(_i5.UserProfile? profile) =>
+      (super.noSuchMethod(
+            Invocation.method(#editLocalDrift, [profile]),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+}
+
+/// A class which mocks [AccountRepository].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockAccountRepository extends _i1.Mock implements _i6.AccountRepository {
+  MockAccountRepository() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i4.Future<_i2.Account> fetchAccount() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAccount, []),
+            returnValue: _i4.Future<_i2.Account>.value(
+              _FakeAccount_0(this, Invocation.method(#fetchAccount, [])),
+            ),
+          )
+          as _i4.Future<_i2.Account>);
+
+  @override
+  _i4.Future<void> requestEmailChange(String? newEmail) =>
+      (super.noSuchMethod(
+            Invocation.method(#requestEmailChange, [newEmail]),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> resendVerification(String? email) =>
+      (super.noSuchMethod(
+            Invocation.method(#resendVerification, [email]),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+}
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..0ab813d11
--- /dev/null
+++ b/test/features/account/widgets/settings/health_sync_test.dart
@@ -0,0 +1,290 @@
+/*
+ * 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<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');
+}
+
+/// Throws from [retryWithPermissions], which asks the platform the same way
+/// [enableSync] does.
+class _ThrowingRetryHealthSyncNotifier extends _FakeHealthSyncNotifier {
+  _ThrowingRetryHealthSyncNotifier()
+    : super(
+        null,
+        initialState: const HealthSyncState(
+          isEnabled: true,
+          issue: HealthSyncIssue.permissionsMissing,
+        ),
+      );
+
+  @override
+  Future<int?> retryWithPermissions() 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('a throwing retry stays in the tile', (tester) async {
+    await tester.pumpWidget(createTile(_ThrowingRetryHealthSyncNotifier()));
+    await tester.pumpAndSettle();
+
+    await tester.tap(find.byIcon(Icons.warning_amber));
+    await tester.pumpAndSettle();
+
+    // Same treatment as the toggle: a refused request is a denial, not a crash
+    expect(tester.takeException(), isNull);
+    expect(find.textContaining('is not sharing your data'), 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..a76f2c36a 100644
--- a/test/features/account/widgets/settings_test.dart
+++ b/test/features/account/widgets/settings_test.dart
@@ -25,11 +25,23 @@ 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<HealthPlatformAvailability> availability() async => HealthPlatformAvailability.unsupported;
+}
+
 @GenerateMocks([
   SharedPreferencesAsync,
 ])
@@ -54,6 +66,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/auth/screens/auth_screen_test.dart b/test/features/auth/screens/auth_screen_test.dart
index 375a35b43..ec40ec784 100644
--- a/test/features/auth/screens/auth_screen_test.dart
+++ b/test/features/auth/screens/auth_screen_test.dart
@@ -30,7 +30,6 @@ import 'package:plugin_platform_interface/plugin_platform_interface.dart';
 import 'package:url_launcher_platform_interface/url_launcher_platform_interface.dart';
 import 'package:wger/core/consts.dart';
 import 'package:wger/core/http_overrides.dart';
-import 'package:wger/core/network/auth_notifier.dart';
 import 'package:wger/core/network/network_provider.dart';
 import 'package:wger/core/network/secure_token_storage.dart';
 import 'package:wger/core/shared_preferences.dart';
diff --git a/test/features/auth/screens/mfa_challenge_screen_test.dart b/test/features/auth/screens/mfa_challenge_screen_test.dart
index 71c8a3a59..7c830bd3c 100644
--- a/test/features/auth/screens/mfa_challenge_screen_test.dart
+++ b/test/features/auth/screens/mfa_challenge_screen_test.dart
@@ -25,7 +25,7 @@ import 'package:http/http.dart' as http;
 import 'package:http/http.dart';
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
-import 'package:wger/core/network/auth_notifier.dart';
+import 'package:wger/core/network/network_provider.dart';
 import 'package:wger/core/network/secure_token_storage.dart';
 import 'package:wger/core/update_app_screen.dart';
 import 'package:wger/core/update_server_screen.dart';
diff --git a/test/features/health/health_ios_release_prep_test.dart b/test/features/health/health_ios_release_prep_test.dart
new file mode 100644
index 000000000..978d223fc
--- /dev/null
+++ b/test/features/health/health_ios_release_prep_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 'dart:io';
+
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  group('iOS health release prep', () {
+    test('Info.plist describes the imported Health data scope', () {
+      final plist = File('ios/Runner/Info.plist').readAsStringSync();
+
+      expect(plist, contains('<key>NSHealthShareUsageDescription</key>'));
+      expect(plist, contains('Apple Health'));
+      expect(plist, contains('sleep, steps, distance, and active energy'));
+      expect(plist, contains('wger account'));
+    });
+
+    test('PowerSync DB setup excludes the iOS database directory from backups', () {
+      final databaseSetup = File('lib/database/powersync/powersync.dart').readAsStringSync();
+
+      expect(databaseSetup, contains("const _iosDbDirectoryName = 'de.wger.flutter.community';"));
+      expect(databaseSetup, contains("MethodChannel('de.wger.flutter/storage')"));
+      expect(databaseSetup, contains("await _excludeFromBackup(dbDir.path);"));
+      expect(
+        databaseSetup,
+        contains("await _migrateLegacyIosDatabaseFiles(fromDirectory: dir, toDirectory: dbDir);"),
+      );
+    });
+
+    test('AppDelegate exposes the backup-exclusion channel', () {
+      final appDelegate = File('ios/Runner/AppDelegate.swift').readAsStringSync();
+
+      expect(appDelegate, contains('de.wger.flutter/storage'));
+      expect(appDelegate, contains('excludeFromBackup'));
+      expect(appDelegate, contains('values.isExcludedFromBackup = true'));
+    });
+  });
+}
diff --git a/test/features/health/health_manifest_test.dart b/test/features/health/health_manifest_test.dart
new file mode 100644
index 000000000..5603b1154
--- /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 healthMetrics) {
+        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/daily_windows_test.dart b/test/features/health/models/daily_windows_test.dart
new file mode 100644
index 000000000..ae28571a3
--- /dev/null
+++ b/test/features/health/models/daily_windows_test.dart
@@ -0,0 +1,162 @@
+/*
+ * 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/daily_windows.dart';
+import 'package:wger/features/health/models/health_metric.dart';
+import 'package:wger/features/health/models/health_reading.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
+
+HealthMetric _metric(MetricType type) => healthMetrics.firstWhere((m) => m.metricType == type);
+
+/// A slept stretch, the shape the platforms deliver it in
+HealthReading _asleep(DateTime from, DateTime to) => HealthReading(
+  type: HealthDataType.SLEEP_ASLEEP,
+  value: to.difference(from).inMinutes.toDouble(),
+  date: from,
+  dateTo: to,
+);
+
+void main() {
+  // Sleep rolls over at 18:00 and merges its stretches, steps are a plain
+  // calendar day, and a weigh-in is imported as the sample it is
+  final sleep = _metric(MetricType.sleep);
+  final steps = _metric(MetricType.steps);
+  final bodyWeight = _metric(MetricType.bodyWeight);
+
+  group('mergedDurationMinutes', () {
+    test('nothing recorded is no time at all', () {
+      expect(mergedDurationMinutes(const []), 0);
+    });
+
+    test('separate stretches add up', () {
+      final minutes = mergedDurationMinutes([
+        _asleep(DateTime(2026, 5, 4, 23), DateTime(2026, 5, 5, 1)),
+        _asleep(DateTime(2026, 5, 5, 2), DateTime(2026, 5, 5, 4)),
+      ]);
+
+      expect(minutes, 240);
+    });
+
+    test('a night two sources recorded is counted once', () {
+      // The phone writes the night as one stretch, the watch as its stages:
+      // adding them up would report the night twice
+      final minutes = mergedDurationMinutes([
+        _asleep(DateTime(2026, 5, 4, 23), DateTime(2026, 5, 5, 7)),
+        _asleep(DateTime(2026, 5, 4, 23), DateTime(2026, 5, 5, 1)),
+        _asleep(DateTime(2026, 5, 5, 1), DateTime(2026, 5, 5, 7)),
+      ]);
+
+      expect(minutes, 8 * 60);
+    });
+
+    test('overlapping stretches count the union', () {
+      final minutes = mergedDurationMinutes([
+        _asleep(DateTime(2026, 5, 4, 23), DateTime(2026, 5, 5, 2)),
+        _asleep(DateTime(2026, 5, 5, 1), DateTime(2026, 5, 5, 4)),
+      ]);
+
+      expect(minutes, 5 * 60);
+    });
+
+    test('the order they arrive in does not matter', () {
+      final late = _asleep(DateTime(2026, 5, 5, 2), DateTime(2026, 5, 5, 4));
+      final early = _asleep(DateTime(2026, 5, 4, 23), DateTime(2026, 5, 5, 1));
+
+      expect(mergedDurationMinutes([late, early]), mergedDurationMinutes([early, late]));
+    });
+
+    test('a sample without an end lasts as long as its value says', () {
+      final minutes = mergedDurationMinutes([
+        HealthReading(
+          type: HealthDataType.SLEEP_ASLEEP,
+          value: 90,
+          date: DateTime(2026, 5, 4, 23),
+        ),
+      ]);
+
+      expect(minutes, 90);
+    });
+  });
+
+  group('dayOf', () {
+    test('a metric without a rollover counts the plain calendar day', () {
+      expect(dayOf(DateTime(2026, 5, 4, 23, 30), steps), DateTime(2026, 5, 4));
+      expect(dayOf(DateTime(2026, 5, 4, 0, 30), steps), DateTime(2026, 5, 4));
+    });
+
+    test('sleep counts towards the day the user wakes up', () {
+      // A night starting at 23:30 belongs to the next day, one ending at 07:00
+      // to the day it ends on: both are the same night
+      expect(dayOf(DateTime(2026, 5, 4, 23, 30), sleep), DateTime(2026, 5, 5));
+      expect(dayOf(DateTime(2026, 5, 5, 7), sleep), DateTime(2026, 5, 5));
+    });
+
+    test('the rollover hour itself already belongs to the next day', () {
+      expect(dayOf(DateTime(2026, 5, 4, 18), sleep), DateTime(2026, 5, 5));
+      expect(dayOf(DateTime(2026, 5, 4, 17, 59), sleep), DateTime(2026, 5, 4));
+    });
+
+    test('a rollover at the end of a month lands in the next one', () {
+      expect(dayOf(DateTime(2026, 5, 31, 23), sleep), DateTime(2026, 6, 1));
+    });
+  });
+
+  group('dayEnd', () {
+    test('a plain day ends at the next midnight', () {
+      expect(dayEnd(DateTime(2026, 5, 4), steps), DateTime(2026, 5, 5));
+    });
+
+    test('a rolled-over day ends at the rollover hour', () {
+      // From 18:00 on, samples count towards the day after
+      expect(dayEnd(DateTime(2026, 5, 4), sleep), DateTime(2026, 5, 4, 18));
+    });
+  });
+
+  group('windowStartFor', () {
+    test('a metric read sample by sample starts where it is asked to', () {
+      final start = DateTime(2026, 5, 4, 13, 45);
+
+      expect(windowStartFor(start, bodyWeight), start);
+    });
+
+    test('a daily aggregate starts at the beginning of its day', () {
+      // The day is recomputed from what the window returns, so a start inside
+      // it would overwrite the day with a fraction of itself
+      expect(windowStartFor(DateTime(2026, 5, 4, 13, 45), steps), DateTime(2026, 5, 4));
+    });
+
+    test('a rolled-over day starts at the rollover of the day it began on', () {
+      expect(windowStartFor(DateTime(2026, 5, 5, 3), sleep), DateTime(2026, 5, 4, 18));
+      expect(windowStartFor(DateTime(2026, 5, 4, 23), sleep), DateTime(2026, 5, 4, 18));
+    });
+  });
+
+  group('earlier and later', () {
+    test('pick the one they say', () {
+      final first = DateTime(2026, 5, 4);
+      final second = DateTime(2026, 5, 5);
+
+      expect(earlier(first, second), first);
+      expect(earlier(second, first), first);
+      expect(later(first, second), second);
+      expect(later(second, first), second);
+    });
+  });
+}
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..d4f6ecbb8
--- /dev/null
+++ b/test/features/health/models/health_metric_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_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(
+        healthMetrics.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(healthMetrics.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('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));
+    });
+  });
+}
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..d89d2a9ce
--- /dev/null
+++ b/test/features/health/providers/health_importer_test.dart
@@ -0,0 +1,1725 @@
+/*
+ * 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/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:powersync/powersync.dart' as ps;
+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.addLocalDriftCategoryGroup(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 healthMetrics) 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 healthMetrics) {
+      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'),
+        onBatch: anyNamed('onBatch'),
+      ),
+    ).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'),
+      onBatch: anyNamed('onBatch'),
+    ),
+  ).captured.cast<List<HealthDataType>>().expand((types) => types).toList();
+
+  /// Stubs the platform read to hand [readings] over as one batch whose
+  /// window ends at the end of the read.
+  void stubReadings(List<HealthReading> readings) {
+    when(
+      health.read(
+        types: anyNamed('types'),
+        start: anyNamed('start'),
+        end: anyNamed('end'),
+        window: anyNamed('window'),
+        onBatch: anyNamed('onBatch'),
+      ),
+    ).thenAnswer((invocation) async {
+      if (readings.isEmpty) {
+        return;
+      }
+      final onBatch =
+          invocation.namedArguments[#onBatch]
+              as Future<void> Function(List<HealthReading>, DateTime);
+      await onBatch(readings, invocation.namedArguments[#end] as DateTime);
+    });
+  }
+
+  /// Stubs the platform read to hand the metric reading [type] its
+  /// [batches] in order, each with its window end; a null window end means
+  /// the end of the read. Every other metric reads empty.
+  void stubBatchesFor(HealthDataType type, List<(List<HealthReading>, DateTime?)> batches) {
+    when(
+      health.read(
+        types: anyNamed('types'),
+        start: anyNamed('start'),
+        end: anyNamed('end'),
+        window: anyNamed('window'),
+        onBatch: anyNamed('onBatch'),
+      ),
+    ).thenAnswer((invocation) async {
+      if (!(invocation.namedArguments[#types] as List<HealthDataType>).contains(type)) {
+        return;
+      }
+      final onBatch =
+          invocation.namedArguments[#onBatch]
+              as Future<void> Function(List<HealthReading>, DateTime);
+      for (final (readings, windowEnd) in batches) {
+        await onBatch(readings, windowEnd ?? invocation.namedArguments[#end] as DateTime);
+      }
+    });
+  }
+
+  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'),
+          onBatch: anyNamed('onBatch'),
+        ),
+      );
+    });
+
+    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 = healthMetrics.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('only the metrics of a newly readable type read their full history', () async {
+      // One granted permission used to send every metric back to 2020, which
+      // is years of platform records read to import nothing
+      await seedWatermarks('2026-06-01T12:00:00.000');
+      await PreferenceHelper.instance.setHealthSyncReadableTypes([
+        for (final metric in healthMetrics)
+          for (final type in metric.dataTypes)
+            if (type != HealthDataType.BODY_FAT_PERCENTAGE) type.name,
+      ]);
+      when(measurements.getCategoriesOnce()).thenAnswer((_) async => categoriesForEveryMetric());
+      stubReadings([]);
+
+      await runImport();
+
+      // Read once: every verify() consumes the calls it matched
+      final starts = capturedReadStarts();
+      expect(starts[HealthDataType.BODY_FAT_PERCENTAGE], DateTime(2020));
+      expect(starts[HealthDataType.WEIGHT], DateTime(2026, 5, 2, 12));
+    });
+
+    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 healthMetrics)
+          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'),
+          onBatch: anyNamed('onBatch'),
+        ),
+      ).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'),
+          onBatch: anyNamed('onBatch'),
+        ),
+      ).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);
+
+      // Leaf categories are single inserts, a group arrives as one
+      // transactional write of the parent with its children
+      final createdCategories = [
+        ...verify(
+          measurements.addLocalDriftCategory(captureAny),
+        ).captured.cast<MeasurementCategory>(),
+        ...verify(
+          measurements.addLocalDriftCategoryGroup(captureAny),
+        ).captured.cast<List<MeasurementCategory>>().flattened,
+      ];
+      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('aggregates a day split across two read windows once', () async {
+      // The batches arrive per window, but a day whose samples straddle a
+      // window boundary must still become a single aggregate of all of them
+      when(measurements.getCategoriesOnce()).thenAnswer((_) async => <MeasurementCategory>[]);
+      stubBatchesFor(HealthDataType.HEART_RATE, [
+        (
+          [
+            HealthReading(
+              type: HealthDataType.HEART_RATE,
+              value: 60,
+              date: DateTime(2026, 1, 1, 8),
+              externalId: _idHr1,
+            ),
+          ],
+          DateTime(2026, 1, 1, 12),
+        ),
+        (
+          [
+            HealthReading(
+              type: HealthDataType.HEART_RATE,
+              value: 70,
+              date: DateTime(2026, 1, 1, 20),
+              externalId: _idHr2,
+            ),
+            HealthReading(
+              type: HealthDataType.HEART_RATE,
+              value: 64,
+              date: DateTime(2026, 1, 2, 9),
+              externalId: _idHr3,
+            ),
+          ],
+          null,
+        ),
+      ]);
+
+      final count = await runImport();
+
+      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.value, 65); // (60 + 70) / 2, across the boundary
+      expect(day1.extraData?['sample_count'], 2);
+    });
+
+    test('a raw metric imports every window into one category', () async {
+      when(measurements.getCategoriesOnce()).thenAnswer((_) async => <MeasurementCategory>[]);
+      stubBatchesFor(HealthDataType.BODY_FAT_PERCENTAGE, [
+        (
+          [
+            HealthReading(
+              type: HealthDataType.BODY_FAT_PERCENTAGE,
+              value: 0.2,
+              date: DateTime(2026, 1, 1),
+              externalId: _idBf1,
+            ),
+          ],
+          DateTime(2026, 2, 1),
+        ),
+        (
+          [
+            HealthReading(
+              type: HealthDataType.BODY_FAT_PERCENTAGE,
+              value: 0.22,
+              date: DateTime(2026, 2, 10),
+              externalId: _idBf2,
+            ),
+          ],
+          null,
+        ),
+      ]);
+
+      final count = await runImport();
+
+      expect(count, 2);
+      // The category is resolved on the first delivering batch and reused
+      final created = verify(
+        measurements.addLocalDriftCategory(captureAny),
+      ).captured.cast<MeasurementCategory>();
+      expect(created.single.metricType, MetricType.bodyFat);
+      expect(
+        await watermarkOf(MetricType.bodyFat),
+        DateTime(2026, 2, 10).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.addLocalDriftCategoryGroup(captureAny),
+      ).captured.cast<List<MeasurementCategory>>().flattened;
+      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));
+      verifyNever(measurements.addLocalDriftCategoryGroup(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('creates a group with its children in one transactional write', () async {
+      // A throw between single inserts would leave the group without the
+      // children its readings live in
+      when(measurements.getCategoriesOnce()).thenAnswer((_) async => <MeasurementCategory>[]);
+      stubReadings([
+        HealthReading(
+          type: HealthDataType.BLOOD_PRESSURE_SYSTOLIC,
+          value: 120,
+          date: DateTime(2026, 1, 3),
+          externalId: _idBp1,
+        ),
+      ]);
+
+      await runImport();
+
+      final written =
+          verify(
+                measurements.addLocalDriftCategoryGroup(captureAny),
+              ).captured.single
+              as List<MeasurementCategory>;
+      verifyNever(measurements.addLocalDriftCategory(any));
+      final parent = written.firstWhere((c) => c.metricType == MetricType.bloodPressure);
+      expect(parent.parentId, isNull);
+      expect(written.where((c) => c.parentId == parent.id), hasLength(2));
+    });
+
+    test('creates the missing children of an existing group in one write', () async {
+      // The state a crash between the old single inserts could leave behind
+      final parent = MeasurementCategory(
+        id: 'bp',
+        name: 'Blood pressure',
+        unit: 'mmHg',
+        metricType: MetricType.bloodPressure,
+      );
+      when(measurements.getCategoriesOnce()).thenAnswer((_) async => [parent]);
+      stubReadings([
+        HealthReading(
+          type: HealthDataType.BLOOD_PRESSURE_SYSTOLIC,
+          value: 120,
+          date: DateTime(2026, 1, 3),
+          externalId: _idBp1,
+        ),
+      ]);
+
+      await runImport();
+
+      final written =
+          verify(
+                measurements.addLocalDriftCategoryGroup(captureAny),
+              ).captured.single
+              as List<MeasurementCategory>;
+      verifyNever(measurements.addLocalDriftCategory(any));
+      // Only the children; the parent already exists
+      expect(written.map((c) => c.parentId), everyElement('bp'));
+      expect(written, hasLength(2));
+    });
+
+    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.addLocalDriftCategoryGroup(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'),
+          onBatch: anyNamed('onBatch'),
+        ),
+      ).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('derives the id from the plain calendar day', () {
+      // Pinned rather than recomputed: the ids of everything already imported
+      // depend on this exact input, so a reformatted day (localized digits,
+      // a time component) would re-import every aggregate as a new entry
+      expect(
+        dailyAggregateExternalId(_catHrId, DateTime(2026, 1, 1)),
+        ps.uuid.v5(_catHrId, '2026-01-01'),
+      );
+    });
+
+    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 in one write; consumes the recorded calls, so call it once per test.
+String _sleepCategoryId(MockMeasurementRepository measurements, MetricType metricType) =>
+    verify(
+          measurements.addLocalDriftCategoryGroup(captureAny),
+        ).captured
+        .cast<List<MeasurementCategory>>()
+        .flattened
+        .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..c4548cc75
--- /dev/null
+++ b/test/features/health/providers/health_importer_test.mocks.dart
@@ -0,0 +1,501 @@
+// 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<_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<void> read({
+    required List<_i5.HealthDataType>? types,
+    required DateTime? start,
+    required DateTime? end,
+    required Duration? window,
+    required _i4.Future<void> Function(List<_i6.HealthReading>, DateTime)? onBatch,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#read, [], {
+              #types: types,
+              #start: start,
+              #end: end,
+              #window: window,
+              #onBatch: onBatch,
+            }),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+}
+
+/// 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> clearCredentials() =>
+      (super.noSuchMethod(
+            Invocation.method(#clearCredentials, []),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> clearLegacyDrfToken() =>
+      (super.noSuchMethod(
+            Invocation.method(#clearLegacyDrfToken, []),
+            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..557179823
--- /dev/null
+++ b/test/features/health/providers/health_repository_test.dart
@@ -0,0 +1,348 @@
+/*
+ * 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/models/health_reading.dart';
+import 'package:wger/features/health/providers/health_repository.dart';
+
+import 'health_repository_test.mocks.dart';
+
+HealthDataPoint dataPoint(
+  HealthDataType type, {
+  String? uuid,
+  DateTime? dateFrom,
+  DateTime? dateTo,
+}) => HealthDataPoint(
+  uuid: uuid ?? '${type.name}-1',
+  value: NumericHealthValue(numericValue: 60),
+  type: type,
+  unit: HealthDataUnit.MINUTE,
+  dateFrom: dateFrom ?? DateTime(2026, 1, 2),
+  dateTo: dateTo ?? dateFrom ?? 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),
+    ];
+  }
+
+  /// Runs a read and collects everything the batches delivered.
+  Future<List<HealthReading>> readAll({
+    required List<HealthDataType> types,
+    required DateTime start,
+    required DateTime end,
+    required Duration window,
+  }) async {
+    final readings = <HealthReading>[];
+    await repository.read(
+      types: types,
+      start: start,
+      end: end,
+      window: window,
+      onBatch: (batch, _) async => readings.addAll(batch),
+    );
+    return readings;
+  }
+
+  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 readAll(
+        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 readAll(
+        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 readAll(
+        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('hands each window over before the next one is read', () async {
+      // Holding the whole history until the end would fill the same Android
+      // heap the windowing exists to protect
+      final events = <String>[];
+      var window = 0;
+      when(
+        health.getHealthDataFromTypes(
+          types: anyNamed('types'),
+          startTime: anyNamed('startTime'),
+          endTime: anyNamed('endTime'),
+        ),
+      ).thenAnswer((_) async {
+        window++;
+        events.add('read window $window');
+        return [dataPoint(HealthDataType.WEIGHT, uuid: 'w-$window')];
+      });
+
+      await repository.read(
+        types: [HealthDataType.WEIGHT],
+        start: DateTime(2026, 1, 1),
+        end: DateTime(2026, 3, 1),
+        window: defaultReadWindow,
+        onBatch: (batch, _) async => events.add('batch of ${batch.length}'),
+      );
+
+      expect(events, ['read window 1', 'batch of 1', 'read window 2', 'batch of 1']);
+    });
+
+    test('a record on the window boundary is delivered once', () async {
+      // Both windows of a contiguous pair contain their shared boundary, so a
+      // record sitting exactly on it comes back from both queries
+      final boundary = DateTime(2026, 1, 1).add(defaultReadWindow);
+      when(
+        health.getHealthDataFromTypes(
+          types: anyNamed('types'),
+          startTime: anyNamed('startTime'),
+          endTime: anyNamed('endTime'),
+        ),
+      ).thenAnswer(
+        (_) async => [dataPoint(HealthDataType.WEIGHT, uuid: 'w-1', dateFrom: boundary)],
+      );
+
+      final readings = await readAll(
+        types: [HealthDataType.WEIGHT],
+        start: DateTime(2026, 1, 1),
+        end: DateTime(2026, 2, 15),
+        window: defaultReadWindow,
+      );
+
+      expect(readings, hasLength(1));
+    });
+
+    test('an interval spanning several windows is delivered once', () async {
+      // A duration record overlaps every window it reaches into and comes
+      // back from each of their queries
+      when(
+        health.getHealthDataFromTypes(
+          types: anyNamed('types'),
+          startTime: anyNamed('startTime'),
+          endTime: anyNamed('endTime'),
+        ),
+      ).thenAnswer(
+        (_) async => [
+          dataPoint(
+            HealthDataType.SLEEP_ASLEEP,
+            uuid: 's-1',
+            dateFrom: DateTime(2026, 1, 2),
+            dateTo: DateTime(2026, 1, 8),
+          ),
+        ],
+      );
+
+      final readings = await readAll(
+        types: [HealthDataType.SLEEP_ASLEEP],
+        start: DateTime(2026, 1, 1),
+        end: DateTime(2026, 1, 10),
+        window: highVolumeReadWindow,
+      );
+
+      expect(readings, hasLength(1));
+    });
+
+    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 readAll(
+        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 keeps its delivered windows and stops', () async {
+      // What a batch delivered is already written; the failing type is only
+      // dropped from the remaining windows, and the caller's unchanged
+      // watermark makes the re-read harmless
+      var call = 0;
+      when(
+        health.getHealthDataFromTypes(
+          types: [HealthDataType.SLEEP_DEEP],
+          startTime: anyNamed('startTime'),
+          endTime: anyNamed('endTime'),
+        ),
+      ).thenAnswer((invocation) async {
+        if (call++ > 0) {
+          throw Exception('boom');
+        }
+        return [
+          dataPoint(
+            HealthDataType.SLEEP_DEEP,
+            dateFrom: invocation.namedArguments[#startTime] as DateTime,
+          ),
+        ];
+      });
+      when(
+        health.getHealthDataFromTypes(
+          types: [HealthDataType.SLEEP_REM],
+          startTime: anyNamed('startTime'),
+          endTime: anyNamed('endTime'),
+        ),
+      ).thenAnswer(
+        (invocation) async => [
+          dataPoint(
+            HealthDataType.SLEEP_REM,
+            uuid: 'rem-${invocation.namedArguments[#startTime]}',
+            dateFrom: invocation.namedArguments[#startTime] as DateTime,
+          ),
+        ],
+      );
+
+      final readings = await readAll(
+        types: [HealthDataType.SLEEP_DEEP, HealthDataType.SLEEP_REM],
+        start: DateTime(2026, 1, 1),
+        end: DateTime(2026, 4, 1),
+        window: defaultReadWindow,
+      );
+
+      // The first window of the failing type was handed over; the other type
+      // delivered every window
+      expect(readings.where((r) => r.type == HealthDataType.SLEEP_DEEP), hasLength(1));
+      expect(readings.where((r) => r.type == HealthDataType.SLEEP_REM), hasLength(3));
+      // After the failure the type is not asked again
+      verify(
+        health.getHealthDataFromTypes(
+          types: [HealthDataType.SLEEP_DEEP],
+          startTime: anyNamed('startTime'),
+          endTime: anyNamed('endTime'),
+        ),
+      ).called(2);
+    });
+
+    test('a wholesale failure still propagates', () async {
+      when(
+        health.getHealthDataFromTypes(
+          types: anyNamed('types'),
+          startTime: anyNamed('startTime'),
+          endTime: anyNamed('endTime'),
+        ),
+      ).thenThrow(Exception('boom'));
+
+      expect(
+        () => readAll(
+          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..67635a293
--- /dev/null
+++ b/test/features/health/providers/health_sync_test.dart
@@ -0,0 +1,295 @@
+/*
+ * 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'),
+        onBatch: anyNamed('onBatch'),
+      ),
+    ).thenAnswer((invocation) async {
+      if (readings.isEmpty) {
+        return;
+      }
+      final onBatch =
+          invocation.namedArguments[#onBatch]
+              as Future<void> Function(List<HealthReading>, DateTime);
+      await onBatch(readings, invocation.namedArguments[#end] as DateTime);
+    });
+  }
+
+  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'),
+          onBatch: anyNamed('onBatch'),
+        ),
+      );
+    });
+
+    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);
+    });
+  });
+
+  group('syncIfDue', () {
+    test('runs when nothing was imported yet', () async {
+      stubReadings([]);
+
+      await createNotifier().syncIfDue();
+
+      verify(health.readableTypes(any)).called(1);
+    });
+
+    test('skips a run that follows a completed one', () async {
+      // Every run re-reads a month of platform records per metric, so the app
+      // being restarted twice in a row must not read it twice
+      stubReadings([]);
+      final notifier = createNotifier();
+      await notifier.sync();
+
+      await notifier.syncIfDue();
+
+      verify(health.readableTypes(any)).called(1);
+    });
+
+    test('runs again once the pause is over', () async {
+      stubReadings([]);
+      final notifier = createNotifier();
+      await notifier.sync();
+      await PreferenceHelper.instance.setHealthSyncLastRun(
+        DateTime.now().subtract(const Duration(hours: 1)),
+      );
+
+      await notifier.syncIfDue();
+
+      verify(health.readableTypes(any)).called(2);
+    });
+
+    test('skips after a restart, since the last run is persisted', () async {
+      // The timestamp only lived in the notifier state before, so a cold start
+      // always read the full overlap window again
+      stubReadings([]);
+      await createNotifier().sync();
+
+      await createNotifier().syncIfDue();
+
+      verify(health.readableTypes(any)).called(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..2a8381d03
--- /dev/null
+++ b/test/features/health/providers/health_sync_test.mocks.dart
@@ -0,0 +1,501 @@
+// 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<_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<void> read({
+    required List<_i5.HealthDataType>? types,
+    required DateTime? start,
+    required DateTime? end,
+    required Duration? window,
+    required _i4.Future<void> Function(List<_i6.HealthReading>, DateTime)? onBatch,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#read, [], {
+              #types: types,
+              #start: start,
+              #end: end,
+              #window: window,
+              #onBatch: onBatch,
+            }),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+}
+
+/// 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> clearCredentials() =>
+      (super.noSuchMethod(
+            Invocation.method(#clearCredentials, []),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
+  @override
+  _i4.Future<void> clearLegacyDrfToken() =>
+      (super.noSuchMethod(
+            Invocation.method(#clearLegacyDrfToken, []),
+            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/calendar_test.dart b/test/features/measurements/charts/calendar_test.dart
new file mode 100644
index 000000000..65392fb92
--- /dev/null
+++ b/test/features/measurements/charts/calendar_test.dart
@@ -0,0 +1,104 @@
+/*
+ * 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/calendar.dart';
+
+void main() {
+  group('dayOf', () {
+    test('takes the calendar day, whatever the time on it', () {
+      expect(dayOf(DateTime(2026, 5, 4, 23, 59, 59)), DateTime(2026, 5, 4));
+      expect(dayOf(DateTime(2026, 5, 4)), DateTime(2026, 5, 4));
+    });
+  });
+
+  group('shiftDays', () {
+    test('walks the calendar, forwards and backwards', () {
+      expect(shiftDays(DateTime(2026, 5, 4), 3), DateTime(2026, 5, 7));
+      expect(shiftDays(DateTime(2026, 5, 4), -3), DateTime(2026, 5, 1));
+      expect(shiftDays(DateTime(2026, 5, 4), 0), DateTime(2026, 5, 4));
+    });
+
+    test('crosses month and year boundaries', () {
+      expect(shiftDays(DateTime(2026, 5, 31), 1), DateTime(2026, 6, 1));
+      expect(shiftDays(DateTime(2026, 1, 1), -1), DateTime(2025, 12, 31));
+      expect(shiftDays(DateTime(2024, 2, 28), 1), DateTime(2024, 2, 29));
+    });
+
+    test('drops the time of the day it starts from', () {
+      expect(shiftDays(DateTime(2026, 5, 4, 18, 30), 1), DateTime(2026, 5, 5));
+    });
+
+    test('a shifted day is that many days away, also over a DST switch', () {
+      // The point of shifting through the components: on a machine in a DST
+      // zone, adding 24 hours lands at 23:00 of the day before
+      for (final day in [
+        DateTime(2026, 3, 29),
+        DateTime(2026, 10, 25),
+        DateTime(2026, 5, 4),
+      ]) {
+        expect(daysBetween(day, shiftDays(day, 1)), 1, reason: '$day');
+        expect(daysBetween(day, shiftDays(day, -1)), -1, reason: '$day');
+        expect(daysBetween(day, shiftDays(day, 7)), 7, reason: '$day');
+      }
+    });
+  });
+
+  group('weekStart', () {
+    test('every day of a week points at its Monday', () {
+      // 4 May 2026 is a Monday
+      for (var offset = 0; offset < 7; offset++) {
+        expect(weekStart(shiftDays(DateTime(2026, 5, 4), offset)), DateTime(2026, 5, 4));
+      }
+    });
+
+    test('a Sunday belongs to the week that started six days earlier', () {
+      expect(weekStart(DateTime(2026, 5, 10)), DateTime(2026, 5, 4));
+    });
+
+    test('the week of a month boundary starts in the month before', () {
+      expect(weekStart(DateTime(2026, 6, 2)), DateTime(2026, 6, 1));
+      expect(weekStart(DateTime(2026, 1, 1)), DateTime(2025, 12, 29));
+    });
+  });
+
+  group('daysBetween', () {
+    test('counts whole days, in both directions', () {
+      expect(daysBetween(DateTime(2026, 5, 4), DateTime(2026, 5, 7)), 3);
+      expect(daysBetween(DateTime(2026, 5, 7), DateTime(2026, 5, 4)), -3);
+      expect(daysBetween(DateTime(2026, 5, 4), DateTime(2026, 5, 4)), 0);
+    });
+
+    test('the time of day does not count as part of a day', () {
+      expect(daysBetween(DateTime(2026, 5, 4, 23, 30), DateTime(2026, 5, 5, 0, 30)), 1);
+      expect(daysBetween(DateTime(2026, 5, 4, 0, 30), DateTime(2026, 5, 4, 23, 30)), 0);
+    });
+
+    test('a 23 and a 25 hour day each count as one', () {
+      // The zone the machine runs in decides whether these are short or long;
+      // counted in UTC they are one day either way
+      expect(daysBetween(DateTime(2026, 3, 28), DateTime(2026, 3, 29)), 1);
+      expect(daysBetween(DateTime(2026, 10, 24), DateTime(2026, 10, 25)), 1);
+    });
+
+    test('a year of days is a year of days', () {
+      expect(daysBetween(DateTime(2025, 1, 1), DateTime(2026, 1, 1)), 365);
+      expect(daysBetween(DateTime(2024, 1, 1), DateTime(2025, 1, 1)), 366);
+    });
+  });
+}
diff --git a/test/features/measurements/charts/data_test.dart b/test/features/measurements/charts/data_test.dart
new file mode 100644
index 000000000..eeb164f05
--- /dev/null
+++ b/test/features/measurements/charts/data_test.dart
@@ -0,0 +1,682 @@
+/*
+ * 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';
+
+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('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('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..1ad1c6454
--- /dev/null
+++ b/test/features/measurements/charts/range_test.dart
@@ -0,0 +1,75 @@
+/*
+ * 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 cutoff sits at the same midnight as the count cutoff', () {
+      // Chart filter and count queries have to agree on the calendar days a
+      // range covers, and the day buckets they compare against sit at midnight
+      expect(ChartRange.lastWeek.cutoff, ChartRange.lastWeek.countCutoff);
+      expect(ChartRange.lastMonth.cutoff, ChartRange.lastMonth.countCutoff);
+    });
+
+    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..0a4d1c92d 100644
--- a/test/features/measurements/measurements_test.dart
+++ b/test/features/measurements/measurements_test.dart
@@ -1,9 +1,37 @@
 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('whereDate', () {
+    MeasurementChartEntry entry(num value, DateTime date) => MeasurementChartEntry(value, date);
+
+    test('keeps a point sitting exactly on the start bound', () {
+      // Day buckets and the range cutoff both sit at midnight, so the oldest
+      // day of a range lands exactly on the bound
+      final entries = [
+        entry(10, DateTime(2023, 1, 1)),
+        entry(20, DateTime(2023, 1, 2, 14)),
+      ];
+
+      final result = entries.whereDate(DateTime(2023, 1, 1), null);
+
+      expect(result.map((e) => e.value), [10, 20]);
+    });
+
+    test('the end stays exclusive', () {
+      final entries = [
+        entry(10, DateTime(2023, 1, 1)),
+        entry(20, DateTime(2023, 1, 2)),
+      ];
+
+      final result = entries.whereDate(DateTime(2023, 1, 1), DateTime(2023, 1, 2));
+
+      expect(result.map((e) => e.value), [10]);
+    });
+  });
+
   group('whereDateWithInterpolation', () {
     // Helper to create entries
     MeasurementChartEntry entry(num value, DateTime date) => MeasurementChartEntry(value, date);
diff --git a/test/features/measurements/models/measurement_calculation_test.dart b/test/features/measurements/models/measurement_calculation_test.dart
new file mode 100644
index 000000000..3968ef0c8
--- /dev/null
+++ b/test/features/measurements/models/measurement_calculation_test.dart
@@ -0,0 +1,142 @@
+/*
+ * 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/models/measurement_calculation.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+void main() {
+  group('the table', () {
+    test('holds exactly the calculations the server registers', () {
+      // Mirrors wger/measurements/dynamic/types.py: a slug this release does
+      // not know is rendered read-only, one the server dropped is offered in
+      // the form and refused on save
+      expect(calculationTypes.map((t) => t.slug), ['BMI', 'WHTR', 'ONE_REP_MAX', 'ONE_RM_TOTAL']);
+    });
+
+    test('bounds the numbers the way the server does', () {
+      final total = calculationTypeOf('ONE_RM_TOTAL')!;
+      final exercises = total.params.whereType<ExercisesParam>().single;
+      final byKey = {for (final p in total.params.whereType<IntParam>()) p.key: p};
+
+      expect((exercises.minItems, exercises.maxItems), (2, 5));
+      expect((byKey['max_reps']!.min, byKey['max_reps']!.max), (1, 10));
+      expect((byKey['window_days']!.min, byKey['window_days']!.max), (7, 120));
+    });
+  });
+
+  group('calculationTypeOf', () {
+    test('resolves a known slug', () {
+      expect(calculationTypeOf('WHTR')?.params.single, isA<CategoryParam>());
+    });
+
+    test('returns null for a slug from a newer server', () {
+      expect(calculationTypeOf('FFMI'), isNull);
+    });
+  });
+
+  group('isKnownCalculation', () {
+    test('accepts a hand-kept category', () {
+      expect(isKnownCalculation(noDynamicType), isTrue);
+    });
+
+    test('accepts a calculation this release renders', () {
+      expect(isKnownCalculation('BMI'), isTrue);
+    });
+
+    test('refuses one it does not, so its parameters are left alone', () {
+      expect(isKnownCalculation('NAVY_BODY_FAT'), isFalse);
+    });
+  });
+
+  group('the labels', () {
+    testWidgets('name a calculation this release does not know by its slug', (tester) async {
+      // Rather than by whichever case the switch happens to end on: a type
+      // added to the table without a string would otherwise show a wrong name
+      late BuildContext ctx;
+      await tester.pumpWidget(
+        MaterialApp(
+          localizationsDelegates: AppLocalizations.localizationsDelegates,
+          supportedLocales: AppLocalizations.supportedLocales,
+          home: Builder(
+            builder: (context) {
+              ctx = context;
+              return const SizedBox.shrink();
+            },
+          ),
+        ),
+      );
+
+      const unknown = CalculationType(slug: 'FFMI', unit: 'kg/m²', params: []);
+      expect(unknown.localizedName(ctx), 'FFMI');
+      expect(unknown.localizedDescription(ctx), isNull);
+      expect(const ExerciseParam('exercise_id').localizedLabel(ctx), 'exercise_id');
+      expect(calculationTypeOf('ONE_RM_TOTAL')!.localizedName(ctx), 'One-rep max total');
+    });
+  });
+
+  group('defaultParams', () {
+    test('is empty for a calculation without parameters', () {
+      expect(defaultParams(calculationTypeOf('BMI')!), isEmpty);
+    });
+
+    test('writes the numbers out, so two clients store the same thing', () {
+      // The server compares the parameters as stored, so an omitted value and
+      // a typed default would read as two configurations
+      expect(defaultParams(calculationTypeOf('ONE_RM_TOTAL')!), {
+        'exercise_ids': <int>[],
+        'max_reps': 5,
+        'window_days': 30,
+      });
+    });
+
+    test('leaves a reference unset rather than guessing one', () {
+      expect(defaultParams(calculationTypeOf('WHTR')!), {'category_id': null});
+    });
+  });
+
+  group('CategoryParam.accepts', () {
+    final param = calculationTypeOf('WHTR')!.params.whereType<CategoryParam>().single;
+
+    test('takes every length unit the server converts', () {
+      // Mirrors LENGTH_UNITS in measurements/dynamic/types.py
+      for (final unit in ['mm', 'cm', 'm', 'meters', 'in', 'inches', '"', '\u2033']) {
+        expect(param.accepts(unit), isTrue, reason: unit);
+      }
+    });
+
+    test('ignores case, padding and the dot of an abbreviation', () {
+      expect(param.accepts(' CM '), isTrue);
+      expect(param.accepts('cm.'), isTrue);
+    });
+
+    test('refuses a unit that is not a length', () {
+      expect(param.accepts('kg'), isFalse);
+      expect(param.accepts(''), isFalse);
+    });
+  });
+
+  group('the big three', () {
+    test('are the three uuids the server ships them under', () {
+      expect(bigThreeUuids, hasLength(3));
+      expect(bigThreeUuids.toSet(), hasLength(3));
+    });
+  });
+}
diff --git a/test/features/measurements/models/measurement_category_test.dart b/test/features/measurements/models/measurement_category_test.dart
index e76820418..d01321855 100644
--- a/test/features/measurements/models/measurement_category_test.dart
+++ b/test/features/measurements/models/measurement_category_test.dart
@@ -17,30 +17,236 @@
  */
 
 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 line the user turned off has no period and no window', () {
+      expect(withConfig({'trend': 'none'}).chartSettings.trend.emaPeriod, isNull);
+      expect(withConfig({'average_window': 'none'}).chartSettings.averageWindow, isNull);
+    });
+
+    test('turning one line off leaves the other alone', () {
+      final settings = withConfig({'trend': 'none', 'average_window': 14}).chartSettings;
+
+      expect(settings.trend, TrendCharacter.none);
+      expect(settings.averageWindow, 14);
+    });
+
+    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'});
+    });
+
+    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);
+    });
+  });
 
-  setUp(() {
-    category = getMeasurementCategories()[0];
+  group('limits', () {
+    test('body weight is bounded in the unit it was entered in', () {
+      expect(MetricType.bodyWeight.limits('kg').max, 350);
+      expect(MetricType.bodyWeight.limits('lb').max, 770);
+    });
+
+    test('a typed metric carries the bounds of its own scale', () {
+      expect(MetricType.bloodOxygen.limits().min, 50);
+      expect(MetricType.bloodOxygen.limits().max, 100);
+    });
+
+    test('a free-form category is bounded by what the column holds', () {
+      expect(MetricType.custom.limits().max, measurementSchemaMaxValue);
+    });
+  });
+
+  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);
 
-      // assert
-      expect(result.id, '1');
+      // every other type has one unit, so the argument changes nothing
+      expect(MetricType.heartRate.limits('bpm').max, MetricType.heartRate.limits().max);
     });
 
-    test('should throw a NoSuchEntryException if no MeasurementEntry was found', () {
-      // act & assert
-      expect(() => category.findEntryById('abc'), throwsA(isA<NoSuchEntryException>()));
+    test('limits of the components differ from each other', () {
+      expect(MetricType.bloodPressureSystolic.limits().max, 250);
+      expect(MetricType.bloodPressureDiastolic.limits().max, 150);
+    });
+
+    test('limits of an untyped category are the column itself', () {
+      expect(MetricType.custom.limits().min, 0);
+      expect(MetricType.custom.limits().max, measurementSchemaMaxValue);
+    });
+
+    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..bd827dc95 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,150 @@ 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> clearCredentials() =>
+      (super.noSuchMethod(
+            Invocation.method(#clearCredentials, []),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> clearLegacyDrfToken() =>
+      (super.noSuchMethod(
+            Invocation.method(#clearLegacyDrfToken, []),
+            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..0752009ae 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,836 @@ 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());
 
-      final emitted = await repo.watchAll().first;
+      expect(await repo.watchLatestEntries().first, isEmpty);
+    });
+  });
 
-      expect(emitted, hasLength(1));
-      expect(emitted.first.entries, isEmpty);
+  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);
+
+      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);
+      expect(category.dynamicType, noDynamicType);
+      expect(category.isCalculated, isFalse);
+
+      final entry = (await repo.watchEntries('legacy', limit: 10).first).single;
+      expect(entry.source, 'user');
+    });
+  });
+
+  group('updateLocalDriftCategory', () {
+    test('leaves the metric type column untouched', () async {
+      // A type added after this app version reads as custom; writing that
+      // narrowed value back would queue a change the server refuses
+      await db.customStatement(
+        'INSERT INTO measurements_category (id, name, unit, metric_type) '
+        "VALUES ('future', 'Vo2max', 'ml', 'vo2_max')",
+      );
+      final category = (await repo.watchAllWithoutEntries().first).single;
+      expect(category.metricType, MetricType.custom);
+
+      await repo.updateLocalDriftCategory(category.copyWith(name: 'VO2 max'));
+
+      final row = await db
+          .customSelect("SELECT name, metric_type FROM measurements_category WHERE id = 'future'")
+          .getSingle();
+      expect(row.read<String>('name'), 'VO2 max');
+      expect(row.read<String>('metric_type'), 'vo2_max');
+    });
+  });
+
+  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]);
+    });
+
+    /// An entry as the sync writes it back: the service serialises timestamps
+    /// with six fractional digits, drift with three.
+    Future<void> seedSyncedEntry(String id, DateTime date, num value) {
+      final iso = date.toUtc().toIso8601String();
+      final utc = '${iso.substring(0, iso.length - 1)}000Z';
+
+      return db.customStatement(
+        'INSERT INTO measurements_measurement (id, category_id, date, value, notes) '
+        "VALUES ('$id', '1', '$utc', $value, '')",
+      );
+    }
+
+    test('since keeps a synced entry sitting exactly on it', () async {
+      // Where the daily aggregates of a health metric are: on the start of the
+      // day, which is what a window starts on too
+      await seedEntries([]);
+      await seedSyncedEntry('synced', DateTime(2026, 3, 1), 60);
+
+      final buckets = await repo.watchEntryBuckets('1', since: DateTime(2026, 3, 1)).first;
+
+      expect(buckets.map((b) => b.sum), [60]);
+    });
+
+    test('until drops a synced entry sitting exactly on it', () async {
+      await seedEntries([]);
+      await seedSyncedEntry('synced', DateTime(2026, 5, 4), 80);
+
+      final buckets = await repo.watchEntryBuckets('1', until: DateTime(2026, 5, 4)).first;
+
+      expect(buckets, isEmpty);
+    });
+
+    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 counts = await repo.watchValueCounts('1').first;
+
+      expect(counts.map((c) => (c.value, c.count)), [(60, 2), (75, 1)]);
+    });
 
-      final emitted = await repo.watchLocalDriftCategoryById('1').first;
+    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),
+      ]);
 
-      expect(emitted, isNotNull);
-      expect(emitted!.name, 'Body fat');
-      expect(emitted.entries, hasLength(6));
+      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('since keeps a synced entry sitting exactly on it', () async {
+      await seedValues([(DateTime(2026, 5, 4, 8), 60)]);
+      final iso = DateTime(2026, 3, 1).toUtc().toIso8601String();
+      await db.customStatement(
+        'INSERT INTO measurements_measurement (id, category_id, date, value, notes) '
+        "VALUES ('synced', '1', '${iso.substring(0, iso.length - 1)}000Z', 50, '')",
+      );
+
+      final counts = await repo.watchValueCounts('1', since: DateTime(2026, 3, 1)).first;
+
+      expect(counts.map((c) => c.value), [50, 60]);
     });
 
-    test('returns null when no category matches', () async {
+    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;
+
+      expect(emitted!.id, testBodyWeightCategoryId);
+    });
 
-      final emitted = await repo.watchLocalDriftCategoryById('does-not-exist').first;
+    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 +883,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 +905,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 +915,56 @@ 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('the calculation round-trips through the table', () async {
+      await repo.addLocalDriftCategory(
+        MeasurementCategory(
+          id: 'whtr',
+          name: 'Waist to height',
+          unit: '',
+          dynamicType: 'WHTR',
+          dynamicParams: const {'category_id': 'waist'},
+        ),
+      );
+
+      final emitted = await repo.watchAllWithoutEntries().first;
+      expect(emitted.single.dynamicType, 'WHTR');
+      expect(emitted.single.dynamicParams, {'category_id': 'waist'});
+      expect(emitted.single.isCalculated, isTrue);
     });
 
     test('updateLocalDriftCategory overwrites name and unit', () async {
@@ -203,7 +975,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 +990,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..b213f6b20 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,20 @@ 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;
+    addTearDown(tester.view.reset);
+
     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..3dada0959 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/line_chart.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,70 @@ 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('a calculated category offers no way to add an entry', (tester) async {
+    stubMeasurementReads(
+      mockMeasurementRepo,
+      [MeasurementCategory(id: '1', name: 'BMI', unit: '', dynamicType: 'BMI')],
+      getMeasurementEntries(),
+    );
+
+    await tester.pumpWidget(createEntriesScreen());
+    await tester.tap(find.byType(TextButton));
+    await tester.pumpAndSettle();
+
+    expect(find.byType(FloatingActionButton), 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 +182,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 +192,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..5cf916203
--- /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)  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/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/line_chart.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 56%
rename from test/features/weight/screens/weight_screen_test.mocks.dart
rename to test/features/measurements/screens/weight_screen_test.mocks.dart
index da87a606f..587a5b0db 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.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.Stream<List<_i13.WeightEntry>>);
+          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,102 @@ 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> updateTimeZoneDrift(int? id, String? timeZone) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateTimeZoneDrift, [id, timeZone]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
 
   @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/calculation_mark_test.dart b/test/features/measurements/widgets/calculation_mark_test.dart
new file mode 100644
index 000000000..df960662a
--- /dev/null
+++ b/test/features/measurements/widgets/calculation_mark_test.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/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/models/measurement_category.dart';
+import 'package:wger/features/measurements/providers/measurement_repository.dart';
+import 'package:wger/features/measurements/widgets/calculation_mark.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+import '../../../helpers/measurement_repository_stubs.dart';
+import 'calculation_mark_test.mocks.dart';
+
+@GenerateMocks([MeasurementRepository])
+void main() {
+  final waist = MeasurementCategory(id: 'waist', name: 'Waist', unit: 'cm');
+
+  Future<void> pump(
+    WidgetTester tester,
+    MeasurementCategory category, {
+    bool dense = false,
+  }) async {
+    final repo = MockMeasurementRepository();
+    stubMeasurementReads(repo, [waist, category]);
+
+    await tester.pumpWidget(
+      ProviderScope(
+        overrides: [measurementRepositoryProvider.overrideWithValue(repo)],
+        child: MaterialApp(
+          localizationsDelegates: AppLocalizations.localizationsDelegates,
+          supportedLocales: AppLocalizations.supportedLocales,
+          home: Scaffold(body: CalculationMark(category, dense: dense)),
+        ),
+      ),
+    );
+    await tester.pumpAndSettle();
+  }
+
+  testWidgets('a hand-kept category is not marked at all', (tester) async {
+    await pump(tester, MeasurementCategory(id: 'biceps', name: 'Biceps', unit: 'cm'));
+
+    expect(find.text('Calculated'), findsNothing);
+    expect(find.byType(Text), findsNothing);
+  });
+
+  testWidgets('a calculated category gets the badge and what it is computed from', (tester) async {
+    await pump(tester, MeasurementCategory(id: 'bmi', name: 'BMI', unit: '', dynamicType: 'BMI'));
+
+    expect(find.text('Calculated'), findsOneWidget);
+    expect(find.text('From your body weight and the height in your profile'), findsOneWidget);
+  });
+
+  testWidgets('the ratio names the category it reads', (tester) async {
+    await pump(
+      tester,
+      MeasurementCategory(
+        id: 'whtr',
+        name: 'Waist to height',
+        unit: '',
+        dynamicType: 'WHTR',
+        dynamicParams: const {'category_id': 'waist'},
+      ),
+    );
+
+    expect(find.text('From Waist and the height in your profile'), findsOneWidget);
+  });
+
+  testWidgets('a one-rep max is badged but not explained', (tester) async {
+    // The sentence would only repeat the category name, which already carries
+    // the exercise
+    await pump(
+      tester,
+      MeasurementCategory(id: '1rm', name: '1RM bench', unit: 'kg', dynamicType: 'ONE_REP_MAX'),
+    );
+
+    expect(find.text('Calculated'), findsOneWidget);
+    expect(find.byType(Text), findsOneWidget);
+  });
+
+  testWidgets('a calculation from a newer server is badged but not explained', (tester) async {
+    // The provenance sentence is per type, and this release has none for it
+    await pump(
+      tester,
+      MeasurementCategory(id: 'ffmi', name: 'FFMI', unit: '', dynamicType: 'FFMI'),
+    );
+
+    expect(find.text('Calculated'), findsOneWidget);
+    expect(find.byType(Text), findsOneWidget);
+  });
+
+  testWidgets('dense puts badge and provenance on one line', (tester) async {
+    await pump(
+      tester,
+      MeasurementCategory(id: 'bmi', name: 'BMI', unit: '', dynamicType: 'BMI'),
+      dense: true,
+    );
+
+    expect(find.byType(Row), findsWidgets);
+    expect(find.text('From your body weight and the height in your profile'), findsOneWidget);
+  });
+}
diff --git a/test/features/measurements/widgets/calculation_mark_test.mocks.dart b/test/features/measurements/widgets/calculation_mark_test.mocks.dart
new file mode 100644
index 000000000..fa1085047
--- /dev/null
+++ b/test/features/measurements/widgets/calculation_mark_test.mocks.dart
@@ -0,0 +1,281 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in wger/test/features/measurements/widgets/calculation_mark_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/calculation_params_test.dart b/test/features/measurements/widgets/calculation_params_test.dart
new file mode 100644
index 000000000..74ec5c615
--- /dev/null
+++ b/test/features/measurements/widgets/calculation_params_test.dart
@@ -0,0 +1,333 @@
+/*
+ * 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/network/network_provider.dart';
+import 'package:wger/features/exercises/models/exercise.dart';
+import 'package:wger/features/exercises/providers/exercise_repository.dart';
+import 'package:wger/features/exercises/providers/exercises_notifier.dart';
+import 'package:wger/features/measurements/models/measurement_calculation.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:wger/features/measurements/providers/measurement_repository.dart';
+import 'package:wger/features/measurements/widgets/calculation_params.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+import '../../../../test_data/exercises.dart';
+import '../../../helpers/fake_auth_environment.dart';
+import '../../../helpers/measurement_repository_stubs.dart';
+import 'calculation_params_test.mocks.dart';
+
+@GenerateMocks([MeasurementRepository, ExerciseRepository])
+void main() {
+  // The exercise search reads the stored filters, which need the async
+  // preferences platform in place
+  installFakeAuthEnvironment();
+
+  final waist = MeasurementCategory(id: 'waist', name: 'Waist', unit: 'cm');
+  final weight = MeasurementCategory(id: 'weight', name: 'Weight', unit: 'kg');
+  final bmi = MeasurementCategory(id: 'bmi', name: 'BMI', unit: '', dynamicType: 'BMI');
+
+  late Map<String, dynamic> saved;
+
+  setUp(() => saved = {});
+
+  /// Renders the parameter block of [slug] over [categories] and [exercises],
+  /// keeping what it writes back in [saved].
+  Future<GlobalKey<FormState>> pump(
+    WidgetTester tester,
+    String slug, {
+    List<MeasurementCategory> categories = const [],
+    List<Exercise> exercises = const [],
+    Map<String, dynamic> params = const {},
+    String? categoryId,
+  }) async {
+    final measurementRepo = MockMeasurementRepository();
+    stubMeasurementReads(measurementRepo, categories);
+    final exerciseRepo = MockExerciseRepository();
+    when(exerciseRepo.watchAllDrift()).thenAnswer((_) => Stream.value(ExerciseState(exercises)));
+
+    saved = {...params};
+    final formKey = GlobalKey<FormState>();
+
+    await tester.pumpWidget(
+      ProviderScope(
+        overrides: [
+          measurementRepositoryProvider.overrideWithValue(measurementRepo),
+          exerciseRepositoryProvider.overrideWithValue(exerciseRepo),
+          // The search then reads the local catalogue instead of the API
+          networkStatusProvider.overrideWithValue(false),
+        ],
+        child: MaterialApp(
+          localizationsDelegates: AppLocalizations.localizationsDelegates,
+          supportedLocales: AppLocalizations.supportedLocales,
+          home: Scaffold(
+            body: Form(
+              key: formKey,
+              child: StatefulBuilder(
+                builder: (context, setState) => SingleChildScrollView(
+                  child: CalculationParamsBlock(
+                    type: calculationTypeOf(slug)!,
+                    params: saved,
+                    categoryId: categoryId,
+                    onChanged: (next) => setState(() => saved = next),
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+    await tester.pumpAndSettle();
+    return formKey;
+  }
+
+  group('the category picker', () {
+    testWidgets('shows what it cannot read instead of hiding it', (tester) async {
+      await pump(
+        tester,
+        'WHTR',
+        categories: [waist, weight, bmi],
+      );
+
+      await tester.tap(find.byType(DropdownButtonFormField<String>));
+      await tester.pumpAndSettle();
+
+      // The unit next to a category is what the user has to change, so one
+      // measured in kg is offered and disabled rather than left out
+      expect(find.text('Waist (cm)'), findsWidgets);
+      expect(find.text('Weight (kg)'), findsWidgets);
+      final items = tester
+          .widgetList<DropdownMenuItem<String>>(find.byType(DropdownMenuItem<String>))
+          .toList();
+      expect(
+        {for (final item in items) item.value: item.enabled},
+        containsPair('waist', true),
+      );
+      expect(
+        {for (final item in items) item.value: item.enabled},
+        containsPair('weight', false),
+      );
+      // A calculated category cannot feed another one at all
+      expect(find.textContaining('BMI'), findsNothing);
+    });
+
+    testWidgets('leaves out the category being edited, which cannot feed itself', (tester) async {
+      await pump(
+        tester,
+        'WHTR',
+        categories: [waist],
+        categoryId: 'waist',
+      );
+
+      expect(find.byType(DropdownButtonFormField<String>), findsNothing);
+      expect(find.text('You have no other category to read from yet.'), findsOneWidget);
+    });
+
+    testWidgets('writes the picked category back', (tester) async {
+      await pump(tester, 'WHTR', categories: [waist]);
+
+      await tester.tap(find.byType(DropdownButtonFormField<String>));
+      await tester.pumpAndSettle();
+      await tester.tap(find.text('Waist (cm)').last);
+      await tester.pumpAndSettle();
+
+      expect(saved['category_id'], 'waist');
+    });
+
+    testWidgets('an unset source fails validation', (tester) async {
+      final formKey = await pump(tester, 'WHTR', categories: [waist]);
+
+      expect(formKey.currentState!.validate(), isFalse);
+    });
+  });
+
+  group('the exercise picker', () {
+    // Local rather than the shared fixture: the ids are what the parameters
+    // store, and the big-three uuid is what the prefill looks for
+    final bench = testBenchPress.copyWith(id: 73, uuid: bigThreeUuids.first);
+    final squat = testSquats.copyWith(id: 74, uuid: bigThreeUuids[1]);
+
+    testWidgets('shows the stored ids as exercise names', (tester) async {
+      await pump(
+        tester,
+        'ONE_REP_MAX',
+        exercises: [bench],
+        params: {'exercise_id': 73, 'max_reps': 5},
+      );
+
+      expect(find.text('Bench press'), findsOneWidget);
+    });
+
+    testWidgets('falls back to the id while the catalogue has not synced', (tester) async {
+      await pump(
+        tester,
+        'ONE_REP_MAX',
+        params: {'exercise_id': 73, 'max_reps': 5},
+      );
+
+      expect(find.text('#73'), findsOneWidget);
+    });
+
+    testWidgets('removing a chip clears the parameter', (tester) async {
+      await pump(
+        tester,
+        'ONE_REP_MAX',
+        exercises: [bench],
+        params: {'exercise_id': 73, 'max_reps': 5},
+      );
+
+      await tester.tap(
+        find.descendant(of: find.byType(InputChip), matching: find.byType(Icon)),
+      );
+      await tester.pumpAndSettle();
+
+      expect(saved['exercise_id'], isNull);
+    });
+
+    testWidgets('picking an exercise twice does not count it twice', (tester) async {
+      // The chips and the parameters come from one place, the form value from
+      // another; a pick the parameters refuse must not reach the value either
+      final formKey = await pump(
+        tester,
+        'ONE_RM_TOTAL',
+        exercises: [bench, squat],
+        params: {
+          'exercise_ids': [73, 74],
+          'max_reps': 5,
+          'window_days': 30,
+        },
+      );
+
+      for (var attempt = 0; attempt < 2; attempt++) {
+        await tester.enterText(find.byKey(const Key('field-typeahead')), 'Bench');
+        await tester.pump(const Duration(milliseconds: 600));
+        await tester.pumpAndSettle();
+        await tester.tap(find.byKey(const Key('exercise-73')));
+        await tester.pumpAndSettle();
+      }
+
+      // What the form validates against and what gets stored are two objects,
+      // so the invariant is that they say the same thing
+      final field = tester.state<FormFieldState<List<int>>>(
+        find.byType(FormField<List<int>>),
+      );
+      expect(field.value, [73, 74]);
+      expect(saved['exercise_ids'], [73, 74]);
+      expect(find.byType(InputChip), findsNWidgets(2));
+      expect(formKey.currentState!.validate(), isTrue);
+    });
+
+    testWidgets('a total below its minimum fails validation', (tester) async {
+      final formKey = await pump(
+        tester,
+        'ONE_RM_TOTAL',
+        exercises: [bench],
+        params: {
+          'exercise_ids': [73],
+          'max_reps': 5,
+          'window_days': 30,
+        },
+      );
+
+      expect(formKey.currentState!.validate(), isFalse);
+    });
+
+    testWidgets('a total within its bounds passes', (tester) async {
+      final formKey = await pump(
+        tester,
+        'ONE_RM_TOTAL',
+        exercises: [bench, squat],
+        params: {
+          'exercise_ids': [73, 74],
+          'max_reps': 5,
+          'window_days': 30,
+        },
+      );
+
+      expect(formKey.currentState!.validate(), isTrue);
+    });
+  });
+
+  group('the numbers', () {
+    testWidgets('start at the server default, which is also the hint', (tester) async {
+      await pump(tester, 'ONE_RM_TOTAL', params: defaultParams(calculationTypeOf('ONE_RM_TOTAL')!));
+
+      // Written out rather than left absent: the server compares the stored
+      // parameters, so an omitted value is a different configuration to it
+      expect(saved['max_reps'], 5);
+      expect(saved['window_days'], 30);
+      // The text the fields actually hold, not the hint behind it, which
+      // carries the same number
+      final texts = tester
+          .widgetList<EditableText>(find.byType(EditableText))
+          .map((field) => field.controller.text);
+      expect(texts, containsAll(['5', '30']));
+      // The hint is what an emptied field falls back to showing
+      final hints = tester
+          .widgetList<TextField>(find.byType(TextField))
+          .map((field) => field.decoration?.hintText);
+      expect(hints, containsAll(['5', '30']));
+    });
+
+    testWidgets('an empty field passes and drops the parameter', (tester) async {
+      final formKey = await pump(
+        tester,
+        'ONE_REP_MAX',
+        params: {'exercise_id': 73, 'max_reps': 8},
+      );
+
+      await tester.enterText(find.byKey(const Key('calculation-param-max_reps')), '');
+      await tester.pumpAndSettle();
+
+      expect(saved.containsKey('max_reps'), isFalse);
+      expect(formKey.currentState!.validate(), isTrue);
+    });
+
+    testWidgets('refuse a value the server would refuse', (tester) async {
+      final formKey = await pump(
+        tester,
+        'ONE_REP_MAX',
+        params: {'exercise_id': 73, 'max_reps': 5},
+      );
+
+      await tester.enterText(find.byKey(const Key('calculation-param-max_reps')), '11');
+      await tester.pumpAndSettle();
+
+      expect(formKey.currentState!.validate(), isFalse);
+      expect(saved['max_reps'], 11);
+    });
+
+    testWidgets('take a value inside the bounds', (tester) async {
+      await pump(
+        tester,
+        'ONE_REP_MAX',
+        params: {'exercise_id': 73, 'max_reps': 5},
+      );
+
+      await tester.enterText(find.byKey(const Key('calculation-param-max_reps')), '3');
+      await tester.pumpAndSettle();
+
+      expect(saved['max_reps'], 3);
+    });
+  });
+}
diff --git a/test/features/measurements/widgets/calculation_params_test.mocks.dart b/test/features/measurements/widgets/calculation_params_test.mocks.dart
new file mode 100644
index 000000000..a7f26a6a3
--- /dev/null
+++ b/test/features/measurements/widgets/calculation_params_test.mocks.dart
@@ -0,0 +1,377 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in wger/test/features/measurements/widgets/calculation_params_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/language.dart' as _i14;
+import 'package:wger/core/search_options.dart' as _i8;
+import 'package:wger/features/exercises/models/category.dart' as _i10;
+import 'package:wger/features/exercises/models/equipment.dart' as _i12;
+import 'package:wger/features/exercises/models/exercise_filters.dart' as _i9;
+import 'package:wger/features/exercises/models/muscle.dart' as _i13;
+import 'package:wger/features/exercises/providers/exercise_repository.dart' as _i7;
+import 'package:wger/features/exercises/providers/exercises_notifier.dart' as _i11;
+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 [ExerciseRepository].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockExerciseRepository extends _i1.Mock implements _i7.ExerciseRepository {
+  MockExerciseRepository() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i3.Future<List<int>> searchExerciseServer(
+    String? term, {
+    String? languageCode = 'en',
+    bool? searchEnglish = false,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #searchExerciseServer,
+              [term],
+              {#languageCode: languageCode, #searchEnglish: searchEnglish},
+            ),
+            returnValue: _i3.Future<List<int>>.value(<int>[]),
+          )
+          as _i3.Future<List<int>>);
+
+  @override
+  _i3.Future<List<int>> searchExerciseServerWithSearchMode(
+    String? term, {
+    String? languageCode = 'en',
+    _i8.SearchLanguage? searchLanguage = _i8.SearchLanguage.currentAndEnglish,
+    _i9.ExerciseSearchMode? searchMode = _i9.ExerciseSearchMode.fulltext,
+    Set<_i10.ExerciseCategory>? categories = const {},
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #searchExerciseServerWithSearchMode,
+              [term],
+              {
+                #languageCode: languageCode,
+                #searchLanguage: searchLanguage,
+                #searchMode: searchMode,
+                #categories: categories,
+              },
+            ),
+            returnValue: _i3.Future<List<int>>.value(<int>[]),
+          )
+          as _i3.Future<List<int>>);
+
+  @override
+  _i3.Stream<_i11.ExerciseState> watchAllDrift() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchAllDrift, []),
+            returnValue: _i3.Stream<_i11.ExerciseState>.empty(),
+          )
+          as _i3.Stream<_i11.ExerciseState>);
+
+  @override
+  _i3.Stream<List<_i10.ExerciseCategory>> watchCategoriesDrift() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchCategoriesDrift, []),
+            returnValue: _i3.Stream<List<_i10.ExerciseCategory>>.empty(),
+          )
+          as _i3.Stream<List<_i10.ExerciseCategory>>);
+
+  @override
+  _i3.Stream<List<_i12.Equipment>> watchEquipmentDrift() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchEquipmentDrift, []),
+            returnValue: _i3.Stream<List<_i12.Equipment>>.empty(),
+          )
+          as _i3.Stream<List<_i12.Equipment>>);
+
+  @override
+  _i3.Stream<List<_i13.Muscle>> watchMusclesDrift() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchMusclesDrift, []),
+            returnValue: _i3.Stream<List<_i13.Muscle>>.empty(),
+          )
+          as _i3.Stream<List<_i13.Muscle>>);
+
+  @override
+  _i3.Stream<List<_i14.Language>> watchLanguagesDrift() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchLanguagesDrift, []),
+            returnValue: _i3.Stream<List<_i14.Language>>.empty(),
+          )
+          as _i3.Stream<List<_i14.Language>>);
+}
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..742c46e36
--- /dev/null
+++ b/test/features/measurements/widgets/categories_card_test.dart
@@ -0,0 +1,329 @@
+/*
+ * 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: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 {},
+  Locale? locale,
+}) => 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(
+    locale: locale,
+    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, {Locale? locale}) => _wrap(
+  CategoriesCard(seed.category, range: ChartRange.all),
+  latest: _latestOf(seed.entries),
+  categories: [seed.category],
+  entries: seed.entries,
+  locale: locale,
+);
+
+_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..5ea452d64
--- /dev/null
+++ b/test/features/measurements/widgets/categories_test.mocks.dart
@@ -0,0 +1,318 @@
+// 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> updateTimeZoneDrift(int? id, String? timeZone) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateTimeZoneDrift, [id, timeZone]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @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..d50775827
--- /dev/null
+++ b/test/features/measurements/widgets/chart_range_selector_test.dart
@@ -0,0 +1,71 @@
+/*
+ * 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() {
+  late ChartRange picked;
+
+  Future<void> pumpSelector(WidgetTester tester, ChartRange selected) async {
+    picked = selected;
+    await tester.pumpWidget(
+      MaterialApp(
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        home: Scaffold(
+          body: ChartRangeSelector(
+            value: selected,
+            onChanged: (range) => picked = range,
+          ),
+        ),
+      ),
+    );
+    await tester.pumpAndSettle();
+  }
+
+  testWidgets('every range is offered', (tester) async {
+    await pumpSelector(tester, ChartRange.last3Months);
+
+    final context = tester.element(find.byType(ChartRangeSelector));
+    final i18n = AppLocalizations.of(context);
+    for (final range in ChartRange.values) {
+      expect(find.text(range.label(i18n)), findsOneWidget, reason: range.name);
+    }
+  });
+
+  testWidgets('picking a range reports that range', (tester) async {
+    for (final range in ChartRange.values) {
+      // Start on another one, so a selector that always reports its own value
+      // cannot pass
+      await pumpSelector(
+        tester,
+        range == ChartRange.all ? ChartRange.lastWeek : ChartRange.all,
+      );
+      final context = tester.element(find.byType(ChartRangeSelector));
+
+      await tester.tap(find.text(range.label(AppLocalizations.of(context))));
+      await tester.pumpAndSettle();
+
+      expect(picked, range, reason: range.name);
+    }
+  });
+}
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..51c3c69a7
--- /dev/null
+++ b/test/features/measurements/widgets/charts/chart_widgets_test.dart
@@ -0,0 +1,514 @@
+/*
+ * 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/bar_chart.dart';
+import 'package:wger/features/measurements/widgets/charts/line_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('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('a series that does not move', () {
+    testWidgets('gets a value axis with room in it', (tester) async {
+      // Every reading the same weight. fl_chart derives its own bounds from
+      // the spots, lands on a range of nothing, and then walks the axis in
+      // steps smaller than the value's own precision: the walk never advances
+      // and it builds labels until the heap gives out. Without the bounds set
+      // here this test hangs rather than fails.
+      final flat = [
+        for (var day = 1; day <= 5; day++) entry(111.18, DateTime(2026, 1, day)),
+      ];
+
+      await tester.pumpWidget(
+        _wrap(MeasurementChartWidgetFl.singleMeasurement(flat, 'kg')),
+      );
+      await tester.pumpAndSettle();
+
+      final data = tester.widget<LineChart>(find.byType(LineChart)).data;
+      expect(data.minY, lessThan(111.18));
+      expect(data.maxY, greaterThan(111.18));
+      expect(tester.takeException(), isNull);
+    });
+
+    testWidgets('and so does a bar chart of one repeated value', (tester) async {
+      final flat = [
+        for (var day = 1; day <= 5; day++) entry(8000, DateTime(2026, 1, day)),
+      ];
+
+      await tester.pumpWidget(_wrap(MeasurementBarChartWidgetFl(flat, 'steps')));
+      await tester.pumpAndSettle();
+
+      expect(find.byType(BarChart), findsOneWidget);
+      expect(tester.takeException(), isNull);
+    });
+  });
+
+  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('a point without a spread pinches the band to the line', (tester) async {
+      // A day with a single measurement has no range of its own; the band
+      // narrows to the line there instead of vanishing for the whole series
+      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();
+
+      final data = chartData(tester);
+      expect(data.betweenBarsData, hasLength(1));
+      expect(data.lineBarsData, hasLength(3));
+      // The bounds fall back to the value where the point has no range
+      expect(data.lineBarsData[0].spots.map((s) => s.y), [50, 70]);
+      expect(data.lineBarsData[1].spots.map((s) => s.y), [80, 70]);
+    });
+  });
+
+  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..23fdb7517
--- /dev/null
+++ b/test/features/measurements/widgets/charts/spark_charts_test.dart
@@ -0,0 +1,197 @@
+/*
+ * 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:ui';
+
+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';
+
+const _size = Size(150, 40);
+
+Widget _wrap(Widget spark) => MaterialApp(
+  home: Scaffold(
+    body: SizedBox(width: _size.width, height: _size.height, child: spark),
+  ),
+);
+
+void main() {
+  final start = DateTime(2026, 8, 1);
+
+  group('SparkLineChart', () {
+    testWidgets('a series is drawn as one line ending in the dot of today', (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)));
+
+      // One polyline through the readings, plus the dot that marks today
+      expect(find.byType(SparkLineChart), paintsExactlyCountTimes(#drawPoints, 1));
+      expect(find.byType(SparkLineChart), paintsExactlyCountTimes(#drawCircle, 1));
+    });
+
+    testWidgets('an empty series paints nothing', (tester) async {
+      await tester.pumpWidget(_wrap(SparkLineChart(const [], start: start, days: 7)));
+
+      expect(find.byType(SparkLineChart), paintsNothing);
+    });
+
+    testWidgets('a flat series sits at mid height 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)));
+
+      // The window fixes the x axis: the second reading sits four of six days in
+      expect(
+        find.byType(SparkLineChart),
+        paints..something((symbol, arguments) {
+          if (symbol != #drawPoints) {
+            return false;
+          }
+          expect(arguments[0], PointMode.polygon);
+          expect(arguments[1], const [Offset(0, 20), Offset(100, 20)]);
+          return true;
+        }),
+      );
+    });
+
+    testWidgets('dots mode draws a dot per reading and no line', (tester) async {
+      final entries = [
+        MeasurementChartEntry(38.5, DateTime(2026, 8, 1)),
+        MeasurementChartEntry(39, DateTime(2026, 8, 40)),
+      ];
+
+      await tester.pumpWidget(
+        _wrap(SparkLineChart(entries, start: start, days: 91, dots: true)),
+      );
+
+      expect(find.byType(SparkLineChart), paintsExactlyCountTimes(#drawCircle, 2));
+      expect(find.byType(SparkLineChart), paintsExactlyCountTimes(#drawPoints, 0));
+    });
+
+    testWidgets('a single reading is a dot, a line of one point would be invisible', (
+      tester,
+    ) async {
+      final entries = [MeasurementChartEntry(38.5, DateTime(2026, 8, 1))];
+
+      await tester.pumpWidget(_wrap(SparkLineChart(entries, start: start, days: 7)));
+
+      expect(find.byType(SparkLineChart), paintsExactlyCountTimes(#drawCircle, 1));
+      expect(find.byType(SparkLineChart), paintsExactlyCountTimes(#drawPoints, 0));
+    });
+  });
+
+  group('SparkBarChart', () {
+    testWidgets('a plain and a floating bar are one shape each', (tester) async {
+      final plain = sparkBars(
+        [MeasurementChartEntry(8000, DateTime(2026, 8, 2))],
+        start: start,
+        slotCount: 7,
+      );
+      final floating = sparkFloatingBars(
+        [MeasurementChartEntry(100, DateTime(2026, 8, 2), min: 79, max: 122)],
+        start: start,
+        slotCount: 7,
+      );
+
+      await tester.pumpWidget(_wrap(SparkBarChart(plain)));
+      expect(find.byType(SparkBarChart), paintsExactlyCountTimes(#drawRRect, 1));
+
+      await tester.pumpWidget(_wrap(SparkBarChart(floating)));
+      expect(find.byType(SparkBarChart), paintsExactlyCountTimes(#drawRRect, 1));
+    });
+
+    testWidgets('a stacked bar is one shape per component', (tester) async {
+      final stacked = sparkStackedBars(
+        [
+          MeasurementStackedEntry(DateTime(2026, 8, 2), const [240, 60]),
+        ],
+        start: start,
+        slotCount: 7,
+      );
+
+      await tester.pumpWidget(_wrap(SparkBarChart(stacked)));
+
+      expect(find.byType(SparkBarChart), paintsExactlyCountTimes(#drawRRect, 2));
+    });
+
+    testWidgets('a signed spark hangs its bar off a zero line', (tester) async {
+      final delta = sparkDeltaBars(
+        [MeasurementChartEntry(-0.4, DateTime(2026, 8, 3))],
+        start: start,
+        slotCount: 9,
+      );
+
+      await tester.pumpWidget(_wrap(SparkBarChart(delta)));
+
+      expect(
+        find.byType(SparkBarChart),
+        paints
+          ..line()
+          ..rrect(),
+      );
+    });
+
+    testWidgets('an empty spark paints nothing', (tester) async {
+      await tester.pumpWidget(
+        _wrap(SparkBarChart(sparkBars(const [], start: start, slotCount: 7))),
+      );
+
+      expect(find.byType(SparkBarChart), paintsNothing);
+    });
+  });
+
+  group('SparkHeatmap', () {
+    final today = DateTime(2026, 8, 7);
+
+    /// Cells of a strip [weeks] columns wide: one per day up to today, the
+    /// rest of the current week is not yet history
+    int cells(int weeks) => weeks * DateTime.daysPerWeek - (DateTime.daysPerWeek - today.weekday);
+
+    List<MeasurementChartEntry> history(int days) => [
+      for (var day = 0; day < days; day++)
+        MeasurementChartEntry(day.isEven ? 8000 : 0, DateTime(2026, 8, 7 - day)),
+    ];
+
+    testWidgets('the strip covers the weeks the history spans', (tester) async {
+      // Two weeks of readings fall into three calendar weeks
+      await tester.pumpWidget(_wrap(SparkHeatmap(history(14), weeks: 4, today: today)));
+
+      expect(find.byType(SparkHeatmap), paintsExactlyCountTimes(#drawRRect, cells(3)));
+    });
+
+    testWidgets('a longer history is cut to the weeks it was given', (tester) async {
+      await tester.pumpWidget(_wrap(SparkHeatmap(history(60), weeks: 4, today: today)));
+
+      expect(find.byType(SparkHeatmap), paintsExactlyCountTimes(#drawRRect, cells(4)));
+    });
+
+    testWidgets('an empty history still paints the grid', (tester) async {
+      await tester.pumpWidget(_wrap(SparkHeatmap(const [], weeks: 4, today: today)));
+
+      expect(find.byType(SparkHeatmap), paintsExactlyCountTimes(#drawRRect, cells(4)));
+    });
+  });
+}
diff --git a/test/features/measurements/widgets/entries_test.dart b/test/features/measurements/widgets/entries_test.dart
new file mode 100644
index 000000000..efff1194d
--- /dev/null
+++ b/test/features/measurements/widgets/entries_test.dart
@@ -0,0 +1,257 @@
+/*
+ * 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/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/distribution_chart.dart';
+import 'package:wger/features/measurements/widgets/charts/stacked_bar_chart.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 '../../../../test_data/measurements.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 calculated category is marked and its entries are read-only', (
+    WidgetTester tester,
+  ) async {
+    final category = MeasurementCategory(
+      id: 'c1',
+      name: 'BMI',
+      unit: 'kg/m²',
+      dynamicType: 'BMI',
+    );
+    final calculated = MeasurementEntry(
+      id: 'e-calc',
+      categoryId: 'c1',
+      date: DateTime(2026, 1, 2),
+      value: 22,
+      notes: '',
+      source: 'calculated',
+    );
+
+    await tester.pumpWidget(
+      createEntriesList(category, {
+        'c1': [calculated],
+      }),
+    );
+    await tester.pumpAndSettle();
+
+    // The mark sits on the category, the rows carry no menu at all
+    expect(find.text('Calculated'), findsOneWidget);
+    expect(find.text('From your body weight and the height in your profile'), findsOneWidget);
+    expect(find.byTooltip('Show menu'), findsNothing);
+    // A calculated value is read-only for a different reason than an import,
+    // and says so
+    expect(find.byIcon(Icons.calculate_outlined), findsOneWidget);
+    expect(
+      find.byTooltip('This value is calculated by wger and cannot be edited'),
+      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);
+    // The component is listed under the group's own "Sleep" heading, so its
+    // label drops the word: the stored name is "Deep sleep", the label "Deep"
+    expect(find.textContaining('Deep 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)),
+    ];
+    final group = testMeasurementCategoryBloodPressure;
+    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/screenshots/screenshots_06_weight.mocks.dart b/test/features/measurements/widgets/entries_test.mocks.dart
similarity index 58%
rename from test/screenshots/screenshots_06_weight.mocks.dart
rename to test/features/measurements/widgets/entries_test.mocks.dart
index d9c43d176..88400880a 100644
--- a/test/screenshots/screenshots_06_weight.mocks.dart
+++ b/test/features/measurements/widgets/entries_test.mocks.dart
@@ -1,5 +1,5 @@
 // Mocks generated by Mockito 5.4.6 from annotations
-// in wger/test/screenshots/screenshots_06_weight.dart.
+// in wger/test/features/measurements/widgets/entries_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
@@ -7,8 +7,10 @@ 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/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;
@@ -17,8 +19,6 @@ 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;
 
 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -35,21 +35,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<List<_i4.WeightEntry>>);
+          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) =>
@@ -61,7 +211,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,35 +220,69 @@ 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>);
-}
 
-/// A class which mocks [UserProfileRepository].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockUserProfileRepository extends _i1.Mock implements _i5.UserProfileRepository {
-  MockUserProfileRepository() {
-    _i1.throwOnMissingStub(this);
-  }
+  @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.Stream<_i6.UserProfile?> watchDrift() =>
+  _i3.Future<void> deleteLocalDriftCategory(String? id) =>
       (super.noSuchMethod(
-            Invocation.method(#watchDrift, []),
-            returnValue: _i3.Stream<_i6.UserProfile?>.empty(),
+            Invocation.method(#deleteLocalDriftCategory, [id]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
           )
-          as _i3.Stream<_i6.UserProfile?>);
+          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> editLocalDrift(_i6.UserProfile? profile) =>
+  _i3.Future<void> reorderCategories(List<String>? orderedIds) =>
       (super.noSuchMethod(
-            Invocation.method(#editLocalDrift, [profile]),
+            Invocation.method(#reorderCategories, [orderedIds]),
             returnValue: _i3.Future<void>.value(),
             returnValueForMissingStub: _i3.Future<void>.value(),
           )
diff --git a/test/features/measurements/widgets/forms/category_test.dart b/test/features/measurements/widgets/forms/category_test.dart
new file mode 100644
index 000000000..fc5fa2274
--- /dev/null
+++ b/test/features/measurements/widgets/forms/category_test.dart
@@ -0,0 +1,806 @@
+/*
+ * 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/account/models/user_profile.dart';
+import 'package:wger/features/account/providers/user_profile_repository.dart';
+import 'package:wger/features/exercises/providers/exercise_repository.dart';
+import 'package:wger/features/exercises/providers/exercises_notifier.dart';
+import 'package:wger/features/measurements/models/measurement_calculation.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:wger/features/measurements/providers/measurement_repository.dart';
+import 'package:wger/features/measurements/widgets/forms/category.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+import '../../../../../test_data/exercises.dart';
+import '../../../../../test_data/measurements.dart';
+import '../../../../helpers/fake_auth_environment.dart';
+import '../../../../helpers/measurement_repository_stubs.dart';
+import 'category_test.mocks.dart';
+
+@GenerateMocks([MeasurementRepository, ExerciseRepository, UserProfileRepository])
+void main() {
+  // The exercise search reads the stored filters, which need the async
+  // preferences platform in place
+  installFakeAuthEnvironment();
+
+  late MockMeasurementRepository mockRepo;
+  late MockExerciseRepository mockExerciseRepo;
+  late MockUserProfileRepository mockProfileRepo;
+
+  setUp(() {
+    mockRepo = MockMeasurementRepository();
+    stubMeasurementReads(mockRepo, []);
+    mockExerciseRepo = MockExerciseRepository();
+    when(mockExerciseRepo.watchAllDrift()).thenAnswer((_) => Stream.value(ExerciseState(const [])));
+    mockProfileRepo = MockUserProfileRepository();
+    when(
+      mockProfileRepo.watchDrift(),
+    ).thenAnswer((_) => Stream.value(UserProfile(id: 1, weightUnitStr: 'kg', height: 182)));
+  });
+
+  /// The form as the app shows it: the screen hands it the space and the form
+  /// brings its own scrolling, see FormScreenArguments.hasListView
+  Widget wrap(Widget child) {
+    return ProviderScope(
+      overrides: [
+        measurementRepositoryProvider.overrideWithValue(mockRepo),
+        exerciseRepositoryProvider.overrideWithValue(mockExerciseRepo),
+        userProfileRepositoryProvider.overrideWithValue(mockProfileRepo),
+      ],
+      child: MaterialApp(
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        home: Scaffold(body: 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<Object>), 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<Object>), 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<Object>>(
+              find.byType(DropdownButtonFormField<Object>),
+            )
+            .onChanged,
+        isNull,
+      );
+    });
+
+    testWidgets('both lines of the chart can be turned off', (tester) async {
+      final category = getMeasurementCategories()[1].copyWith(chartType: ChartType.auto);
+      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('Off').last);
+      await tester.pumpAndSettle();
+
+      await tester.tap(find.byType(DropdownButtonFormField<Object>));
+      await tester.pumpAndSettle();
+      await tester.tap(find.text('Off').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, {'trend': 'none', 'average_window': 'none'});
+    });
+
+    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('MeasurementCategoryForm calculations', () {
+    /// Taps the "Calculated" half of the source switch
+    Future<void> switchToCalculated(WidgetTester tester) async {
+      await tester.tap(find.text('Calculated'));
+      await tester.pumpAndSettle();
+    }
+
+    testWidgets('the form scrolls, so a calculation cannot push it off screen', (
+      tester,
+    ) async {
+      // Picking one adds the type field, its description and a block of
+      // parameters; on a phone that is more than the screen holds
+      tester.view.physicalSize = const Size(400, 800);
+      tester.view.devicePixelRatio = 1;
+      addTearDown(tester.view.reset);
+
+      await tester.pumpWidget(wrap(const MeasurementCategoryForm()));
+      await tester.pumpAndSettle();
+      await switchToCalculated(tester);
+
+      expect(tester.takeException(), isNull);
+      await tester.drag(find.byType(SingleChildScrollView), const Offset(0, -300));
+      await tester.pumpAndSettle();
+      expect(find.byType(ElevatedButton), findsOneWidget);
+    });
+
+    testWidgets('a new free-form category is offered the switch', (tester) async {
+      await tester.pumpWidget(wrap(const MeasurementCategoryForm()));
+      await tester.pumpAndSettle();
+
+      expect(find.byType(SegmentedButton<bool>), findsOneWidget);
+      // Nothing about a calculation until one is asked for
+      expect(find.byKey(const Key('calculation-type')), findsNothing);
+    });
+
+    testWidgets('a typed category is not offered the switch', (tester) async {
+      // The server writes those itself and refuses the combination
+      final typed = getMeasurementCategories()[1].copyWith(metricType: MetricType.heartRate);
+
+      await tester.pumpWidget(wrap(MeasurementCategoryForm(typed)));
+      await tester.pumpAndSettle();
+
+      expect(find.byType(SegmentedButton<bool>), findsNothing);
+    });
+
+    testWidgets('switching reveals the type picker and its description', (tester) async {
+      await tester.pumpWidget(wrap(const MeasurementCategoryForm()));
+      await tester.pumpAndSettle();
+      await switchToCalculated(tester);
+
+      expect(find.byKey(const Key('calculation-type')), findsOneWidget);
+      expect(
+        find.text('From your body weight and the height in your profile'),
+        findsOneWidget,
+      );
+    });
+
+    testWidgets('a calculation without a description gets no paragraph', (tester) async {
+      await tester.pumpWidget(wrap(const MeasurementCategoryForm()));
+      await tester.pumpAndSettle();
+      await switchToCalculated(tester);
+
+      await tester.tap(find.byKey(const Key('calculation-type')));
+      await tester.pumpAndSettle();
+      await tester.tap(find.text('One-rep max').last);
+      await tester.pumpAndSettle();
+
+      // The exercise picker right below says what it reads, so the sentence
+      // that BMI needs would only repeat the category name here
+      expect(find.byKey(const Key('calculation-type')), findsOneWidget);
+      expect(find.textContaining('From your'), findsNothing);
+    });
+
+    testWidgets('the description names the source category once it is picked', (tester) async {
+      // One sentence serves the form and the category itself, so the ratio
+      // has to fill its placeholder here too
+      final waist = MeasurementCategory(id: 'waist', name: 'Waist', unit: 'cm');
+      stubMeasurementReads(mockRepo, [waist]);
+
+      await tester.pumpWidget(wrap(const MeasurementCategoryForm()));
+      await tester.pumpAndSettle();
+      await switchToCalculated(tester);
+
+      await tester.tap(find.byKey(const Key('calculation-type')));
+      await tester.pumpAndSettle();
+      await tester.tap(find.text('Waist to height ratio').last);
+      await tester.pumpAndSettle();
+
+      expect(find.text('From  and the height in your profile'), findsOneWidget);
+
+      await tester.tap(find.byKey(const Key('calculation-param-category_id')));
+      await tester.pumpAndSettle();
+      await tester.tap(find.text('Waist (cm)').last);
+      await tester.pumpAndSettle();
+
+      expect(find.text('From Waist and the height in your profile'), findsOneWidget);
+    });
+
+    testWidgets('switching prefills name and unit from the calculation', (tester) async {
+      await tester.pumpWidget(wrap(const MeasurementCategoryForm()));
+      await tester.pumpAndSettle();
+      await switchToCalculated(tester);
+
+      expect(find.widgetWithText(TextFormField, 'BMI'), findsOneWidget);
+      expect(find.widgetWithText(TextFormField, 'kg/m²'), findsOneWidget);
+    });
+
+    testWidgets('a name the user wrote survives the prefill', (tester) async {
+      await tester.pumpWidget(wrap(const MeasurementCategoryForm()));
+      await tester.pumpAndSettle();
+
+      await tester.enterText(find.byType(TextFormField).first, 'My index');
+      await switchToCalculated(tester);
+
+      expect(find.widgetWithText(TextFormField, 'My index'), findsOneWidget);
+      expect(find.widgetWithText(TextFormField, 'BMI'), findsNothing);
+      // The unit was not touched either, so it still takes the prefill
+      expect(find.widgetWithText(TextFormField, 'kg/m²'), findsOneWidget);
+    });
+
+    testWidgets('switching back to hand-kept clears the configuration', (tester) async {
+      when(mockRepo.addLocalDriftCategory(any)).thenAnswer((_) async {});
+
+      await tester.pumpWidget(wrap(const MeasurementCategoryForm()));
+      await tester.pumpAndSettle();
+      await switchToCalculated(tester);
+      await tester.tap(find.text('Entered by hand'));
+      await tester.pumpAndSettle();
+
+      expect(find.byKey(const Key('calculation-type')), findsNothing);
+
+      await tester.enterText(find.byType(TextFormField).at(1), 'cm');
+      await tester.ensureVisible(find.byType(ElevatedButton));
+      await tester.tap(find.byType(ElevatedButton));
+      await tester.pumpAndSettle();
+
+      final saved =
+          verify(mockRepo.addLocalDriftCategory(captureAny)).captured.single as MeasurementCategory;
+      expect(saved.dynamicType, noDynamicType);
+      expect(saved.dynamicParams, isNull);
+    });
+
+    testWidgets('a calculation the user already has cannot be picked twice', (tester) async {
+      // BMI computes the same series whatever else is configured, so a second
+      // one would only sync the same values again
+      final bmi = MeasurementCategory(id: 'bmi', name: 'BMI', unit: '', dynamicType: 'BMI');
+      stubMeasurementReads(mockRepo, [bmi]);
+
+      await tester.pumpWidget(wrap(const MeasurementCategoryForm()));
+      await tester.pumpAndSettle();
+      await switchToCalculated(tester);
+
+      await tester.tap(find.byKey(const Key('calculation-type')));
+      await tester.pumpAndSettle();
+
+      final items = tester
+          .widgetList<DropdownMenuItem<String>>(find.byType(DropdownMenuItem<String>))
+          .toList();
+      expect({for (final item in items) item.value: item.enabled}, containsPair('BMI', false));
+      expect({for (final item in items) item.value: item.enabled}, containsPair('WHTR', true));
+      expect(find.textContaining('Already tracked'), findsWidgets);
+    });
+
+    testWidgets('switching lands on a calculation that is still free', (tester) async {
+      final bmi = MeasurementCategory(id: 'bmi', name: 'BMI', unit: '', dynamicType: 'BMI');
+      stubMeasurementReads(mockRepo, [bmi]);
+
+      await tester.pumpWidget(wrap(const MeasurementCategoryForm()));
+      await tester.pumpAndSettle();
+      await switchToCalculated(tester);
+
+      // BMI is the first of the list but taken, so the form does not open on
+      // a calculation that cannot be saved
+      final picker = tester.widget<DropdownButtonFormField<String>>(
+        find.byKey(const Key('calculation-type')),
+      );
+      expect(picker.initialValue, 'WHTR');
+    });
+
+    testWidgets('a second calculation with the same settings is refused', (tester) async {
+      final waist = MeasurementCategory(id: 'waist', name: 'Waist', unit: 'cm');
+      final ratio = MeasurementCategory(
+        id: 'whtr',
+        name: 'Waist to height',
+        unit: '',
+        dynamicType: 'WHTR',
+        dynamicParams: const {'category_id': 'waist'},
+      );
+      stubMeasurementReads(mockRepo, [waist, ratio]);
+
+      await tester.pumpWidget(wrap(const MeasurementCategoryForm()));
+      await tester.pumpAndSettle();
+      await switchToCalculated(tester);
+      await tester.tap(find.byKey(const Key('calculation-type')));
+      await tester.pumpAndSettle();
+      await tester.tap(find.text('Waist to height ratio').last);
+      await tester.pumpAndSettle();
+      await tester.tap(find.byKey(const Key('calculation-param-category_id')));
+      await tester.pumpAndSettle();
+      await tester.tap(find.text('Waist (cm)').last);
+      await tester.pumpAndSettle();
+
+      await tester.ensureVisible(find.byType(ElevatedButton));
+      await tester.tap(find.byType(ElevatedButton));
+      await tester.pumpAndSettle();
+
+      // Caught here rather than on the next push: a category built offline
+      // reaches the server long after the form that made it is gone
+      expect(
+        find.text('You already have a Waist to height ratio category with these settings'),
+        findsOneWidget,
+      );
+      verifyNever(mockRepo.addLocalDriftCategory(any));
+    });
+
+    testWidgets('the same calculation on another source is allowed', (tester) async {
+      final waist = MeasurementCategory(id: 'waist', name: 'Waist', unit: 'cm');
+      final hip = MeasurementCategory(id: 'hip', name: 'Hip', unit: 'cm');
+      final ratio = MeasurementCategory(
+        id: 'whtr',
+        name: 'Waist to height',
+        unit: '',
+        dynamicType: 'WHTR',
+        dynamicParams: const {'category_id': 'waist'},
+      );
+      stubMeasurementReads(mockRepo, [waist, hip, ratio]);
+      when(mockRepo.addLocalDriftCategory(any)).thenAnswer((_) async {});
+
+      await tester.pumpWidget(wrap(const MeasurementCategoryForm()));
+      await tester.pumpAndSettle();
+      await switchToCalculated(tester);
+      await tester.tap(find.byKey(const Key('calculation-type')));
+      await tester.pumpAndSettle();
+      await tester.tap(find.text('Waist to height ratio').last);
+      await tester.pumpAndSettle();
+      await tester.tap(find.byKey(const Key('calculation-param-category_id')));
+      await tester.pumpAndSettle();
+      await tester.tap(find.text('Hip (cm)').last);
+      await tester.pumpAndSettle();
+
+      await tester.ensureVisible(find.byType(ElevatedButton));
+      await tester.tap(find.byType(ElevatedButton));
+      await tester.pumpAndSettle();
+
+      final saved =
+          verify(mockRepo.addLocalDriftCategory(captureAny)).captured.single as MeasurementCategory;
+      expect(saved.dynamicParams, {'category_id': 'hip'});
+    });
+
+    testWidgets('renaming an existing calculation is not a duplicate of itself', (tester) async {
+      final bmi = MeasurementCategory(id: 'bmi', name: 'BMI', unit: '', dynamicType: 'BMI');
+      stubMeasurementReads(mockRepo, [bmi]);
+      when(mockRepo.updateLocalDriftCategory(any)).thenAnswer((_) async {});
+
+      await tester.pumpWidget(wrap(MeasurementCategoryForm(bmi)));
+      await tester.pumpAndSettle();
+
+      await tester.enterText(find.byType(TextFormField).first, 'Body mass index');
+      await tester.ensureVisible(find.byType(ElevatedButton));
+      await tester.tap(find.byType(ElevatedButton));
+      await tester.pumpAndSettle();
+
+      final saved =
+          verify(mockRepo.updateLocalDriftCategory(captureAny)).captured.single
+              as MeasurementCategory;
+      expect(saved.name, 'Body mass index');
+    });
+
+    testWidgets('an existing hand-kept category is not offered a calculation', (tester) async {
+      // What a category computes is fixed on the first save, so the choice
+      // belongs to the form that creates one
+      final category = getMeasurementCategories()[1];
+      stubMeasurementReads(
+        mockRepo,
+        [category],
+        {
+          category.id!: [getMeasurementEntries()[category.id]!.first],
+        },
+      );
+
+      await tester.pumpWidget(wrap(MeasurementCategoryForm(category)));
+      await tester.pumpAndSettle();
+
+      expect(find.byType(SegmentedButton<bool>), findsNothing);
+      expect(find.byKey(const Key('calculation-type')), findsNothing);
+      // The name is still the user's to change, without anything looking wrong
+      expect(find.widgetWithText(TextFormField, 'Biceps'), findsOneWidget);
+    });
+
+    testWidgets('an existing calculation is shown locked, not as a switch', (tester) async {
+      final bmi = MeasurementCategory(id: 'bmi', name: 'BMI', unit: '', dynamicType: 'BMI');
+      stubMeasurementReads(mockRepo, [bmi]);
+
+      await tester.pumpWidget(wrap(MeasurementCategoryForm(bmi)));
+      await tester.pumpAndSettle();
+
+      expect(find.byType(SegmentedButton<bool>), findsNothing);
+      final picker = tester.widget<DropdownButtonFormField<String>>(
+        find.byKey(const Key('calculation-type')),
+      );
+      expect(picker.onChanged, isNull);
+      expect(
+        find.text('The calculation cannot be changed. Delete the category to stop calculating it.'),
+        findsOneWidget,
+      );
+    });
+
+    testWidgets('a calculation from a newer server is shown but not editable', (tester) async {
+      final unknown = MeasurementCategory(
+        id: 'ffmi',
+        name: 'FFMI',
+        unit: 'kg/m²',
+        dynamicType: 'FFMI',
+        dynamicParams: const {'category_id': 'fat', 'unknown_key': 3},
+      );
+      stubMeasurementReads(mockRepo, [unknown]);
+      when(mockRepo.updateLocalDriftCategory(any)).thenAnswer((_) async {});
+
+      await tester.pumpWidget(wrap(MeasurementCategoryForm(unknown)));
+      await tester.pumpAndSettle();
+
+      expect(
+        find.textContaining('set up in a newer version of wger'),
+        findsOneWidget,
+      );
+      expect(find.byType(SegmentedButton<bool>), findsNothing);
+      expect(find.byKey(const Key('calculation-type')), findsNothing);
+
+      // Everything else stays editable, and saving leaves the configuration
+      // this release cannot render exactly as it was
+      await tester.enterText(find.byType(TextFormField).first, 'Renamed');
+      await tester.ensureVisible(find.byType(ElevatedButton));
+      await tester.tap(find.byType(ElevatedButton));
+      await tester.pumpAndSettle();
+
+      final saved =
+          verify(mockRepo.updateLocalDriftCategory(captureAny)).captured.single
+              as MeasurementCategory;
+      expect(saved.name, 'Renamed');
+      expect(saved.dynamicType, 'FFMI');
+      expect(saved.dynamicParams, {'category_id': 'fat', 'unknown_key': 3});
+    });
+
+    testWidgets('the height hint appears only for a profile without one', (tester) async {
+      when(
+        mockProfileRepo.watchDrift(),
+      ).thenAnswer((_) => Stream.value(UserProfile(id: 1, weightUnitStr: 'kg')));
+
+      await tester.pumpWidget(wrap(const MeasurementCategoryForm()));
+      await tester.pumpAndSettle();
+      await switchToCalculated(tester);
+
+      expect(
+        find.text('The height in your profile is missing, so no values can be computed yet.'),
+        findsOneWidget,
+      );
+    });
+
+    testWidgets('the height hint stays away while the profile has one', (tester) async {
+      await tester.pumpWidget(wrap(const MeasurementCategoryForm()));
+      await tester.pumpAndSettle();
+      await switchToCalculated(tester);
+
+      expect(
+        find.text('The height in your profile is missing, so no values can be computed yet.'),
+        findsNothing,
+      );
+    });
+
+    testWidgets('a total starts at bench press, squat and deadlift', (tester) async {
+      final bigThree = [
+        for (final (index, uuid) in bigThreeUuids.indexed)
+          testBenchPress.copyWith(id: 90 + index, uuid: uuid),
+      ];
+      when(
+        mockExerciseRepo.watchAllDrift(),
+      ).thenAnswer((_) => Stream.value(ExerciseState(bigThree)));
+      when(mockRepo.addLocalDriftCategory(any)).thenAnswer((_) async {});
+
+      await tester.pumpWidget(wrap(const MeasurementCategoryForm()));
+      await tester.pumpAndSettle();
+      await switchToCalculated(tester);
+
+      await tester.tap(find.byKey(const Key('calculation-type')));
+      await tester.pumpAndSettle();
+      await tester.tap(find.text('One-rep max total').last);
+      await tester.pumpAndSettle();
+
+      await tester.ensureVisible(find.byType(ElevatedButton));
+      await tester.tap(find.byType(ElevatedButton));
+      await tester.pumpAndSettle();
+
+      final saved =
+          verify(mockRepo.addLocalDriftCategory(captureAny)).captured.single as MeasurementCategory;
+      expect(saved.dynamicType, 'ONE_RM_TOTAL');
+      expect(saved.dynamicParams, {
+        'exercise_ids': [90, 91, 92],
+        'max_reps': 5,
+        'window_days': 30,
+      });
+      expect(saved.unit, 'kg');
+    });
+
+    testWidgets('switching the type does not carry a number over', (tester) async {
+      // Both one-rep max types have a max_reps field, so the widget of the
+      // first survived into the second and went on showing what was typed
+      // there while the parameters had already been reset
+      when(mockRepo.addLocalDriftCategory(any)).thenAnswer((_) async {});
+
+      await tester.pumpWidget(wrap(const MeasurementCategoryForm()));
+      await tester.pumpAndSettle();
+      await switchToCalculated(tester);
+
+      await tester.tap(find.byKey(const Key('calculation-type')));
+      await tester.pumpAndSettle();
+      await tester.tap(find.text('One-rep max').last);
+      await tester.pumpAndSettle();
+      await tester.enterText(find.byKey(const Key('calculation-param-max_reps')), '3');
+      await tester.pumpAndSettle();
+
+      await tester.tap(find.byKey(const Key('calculation-type')));
+      await tester.pumpAndSettle();
+      await tester.tap(find.text('One-rep max total').last);
+      await tester.pumpAndSettle();
+
+      final shown = tester
+          .widget<TextField>(
+            find.descendant(
+              of: find.byKey(const Key('calculation-param-max_reps')),
+              matching: find.byType(TextField),
+            ),
+          )
+          .controller!
+          .text;
+      expect(shown, '5');
+    });
+
+    testWidgets('a total starts empty where the exercises never synced', (tester) async {
+      // The default mock knows no exercises at all
+      await tester.pumpWidget(wrap(const MeasurementCategoryForm()));
+      await tester.pumpAndSettle();
+      await switchToCalculated(tester);
+
+      await tester.tap(find.byKey(const Key('calculation-type')));
+      await tester.pumpAndSettle();
+      await tester.tap(find.text('One-rep max total').last);
+      await tester.pumpAndSettle();
+
+      // Nothing was picked, so the form does not let the configuration through
+      await tester.ensureVisible(find.byType(ElevatedButton));
+      await tester.tap(find.byType(ElevatedButton));
+      await tester.pumpAndSettle();
+
+      verifyNever(mockRepo.addLocalDriftCategory(any));
+    });
+
+    testWidgets('an incomplete configuration is refused before it is pushed', (tester) async {
+      final waist = MeasurementCategory(id: 'waist', name: 'Waist', unit: 'cm');
+      stubMeasurementReads(mockRepo, [waist]);
+
+      await tester.pumpWidget(wrap(const MeasurementCategoryForm()));
+      await tester.pumpAndSettle();
+      await switchToCalculated(tester);
+
+      await tester.tap(find.byKey(const Key('calculation-type')));
+      await tester.pumpAndSettle();
+      await tester.tap(find.text('Waist to height ratio').last);
+      await tester.pumpAndSettle();
+
+      await tester.ensureVisible(find.byType(ElevatedButton));
+      await tester.tap(find.byType(ElevatedButton));
+      await tester.pumpAndSettle();
+
+      verifyNever(mockRepo.addLocalDriftCategory(any));
+    });
+
+    testWidgets('a ratio with nothing to read from cannot be saved', (tester) async {
+      // The category is created locally and pushed later, so a configuration
+      // the server can only refuse has to be stopped here or the refusal
+      // arrives long after the form is gone
+      when(mockRepo.addLocalDriftCategory(any)).thenAnswer((_) async {});
+
+      await tester.pumpWidget(wrap(const MeasurementCategoryForm()));
+      await tester.pumpAndSettle();
+      await switchToCalculated(tester);
+
+      await tester.tap(find.byKey(const Key('calculation-type')));
+      await tester.pumpAndSettle();
+      await tester.tap(find.text('Waist to height ratio').last);
+      await tester.pumpAndSettle();
+
+      await tester.ensureVisible(find.byType(ElevatedButton));
+      await tester.tap(find.byType(ElevatedButton));
+      await tester.pumpAndSettle();
+
+      verifyNever(mockRepo.addLocalDriftCategory(any));
+    });
+
+    testWidgets('a calculated category may be saved without a unit', (tester) async {
+      final waist = MeasurementCategory(id: 'waist', name: 'Waist', unit: 'cm');
+      stubMeasurementReads(mockRepo, [waist]);
+      when(mockRepo.addLocalDriftCategory(any)).thenAnswer((_) async {});
+
+      await tester.pumpWidget(wrap(const MeasurementCategoryForm()));
+      await tester.pumpAndSettle();
+      await switchToCalculated(tester);
+
+      await tester.tap(find.byKey(const Key('calculation-type')));
+      await tester.pumpAndSettle();
+      await tester.tap(find.text('Waist to height ratio').last);
+      await tester.pumpAndSettle();
+      await tester.tap(find.byKey(const Key('calculation-param-category_id')));
+      await tester.pumpAndSettle();
+      await tester.tap(find.text('Waist (cm)').last);
+      await tester.pumpAndSettle();
+
+      await tester.ensureVisible(find.byType(ElevatedButton));
+      await tester.tap(find.byType(ElevatedButton));
+      await tester.pumpAndSettle();
+
+      final saved =
+          verify(mockRepo.addLocalDriftCategory(captureAny)).captured.single as MeasurementCategory;
+      // A ratio of two lengths carries no unit, and the server takes it empty
+      expect(saved.unit, '');
+      expect(saved.dynamicType, 'WHTR');
+      expect(saved.dynamicParams, {'category_id': 'waist'});
+    });
+  });
+}
diff --git a/test/features/measurements/widgets/forms/category_test.mocks.dart b/test/features/measurements/widgets/forms/category_test.mocks.dart
new file mode 100644
index 000000000..b9ebb339a
--- /dev/null
+++ b/test/features/measurements/widgets/forms/category_test.mocks.dart
@@ -0,0 +1,414 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in wger/test/features/measurements/widgets/forms/category_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/language.dart' as _i14;
+import 'package:wger/core/search_options.dart' as _i8;
+import 'package:wger/features/account/models/user_profile.dart' as _i16;
+import 'package:wger/features/account/providers/user_profile_repository.dart' as _i15;
+import 'package:wger/features/exercises/models/category.dart' as _i10;
+import 'package:wger/features/exercises/models/equipment.dart' as _i12;
+import 'package:wger/features/exercises/models/exercise_filters.dart' as _i9;
+import 'package:wger/features/exercises/models/muscle.dart' as _i13;
+import 'package:wger/features/exercises/providers/exercise_repository.dart' as _i7;
+import 'package:wger/features/exercises/providers/exercises_notifier.dart' as _i11;
+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 [ExerciseRepository].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockExerciseRepository extends _i1.Mock implements _i7.ExerciseRepository {
+  MockExerciseRepository() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i3.Future<List<int>> searchExerciseServer(
+    String? term, {
+    String? languageCode = 'en',
+    bool? searchEnglish = false,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #searchExerciseServer,
+              [term],
+              {#languageCode: languageCode, #searchEnglish: searchEnglish},
+            ),
+            returnValue: _i3.Future<List<int>>.value(<int>[]),
+          )
+          as _i3.Future<List<int>>);
+
+  @override
+  _i3.Future<List<int>> searchExerciseServerWithSearchMode(
+    String? term, {
+    String? languageCode = 'en',
+    _i8.SearchLanguage? searchLanguage = _i8.SearchLanguage.currentAndEnglish,
+    _i9.ExerciseSearchMode? searchMode = _i9.ExerciseSearchMode.fulltext,
+    Set<_i10.ExerciseCategory>? categories = const {},
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #searchExerciseServerWithSearchMode,
+              [term],
+              {
+                #languageCode: languageCode,
+                #searchLanguage: searchLanguage,
+                #searchMode: searchMode,
+                #categories: categories,
+              },
+            ),
+            returnValue: _i3.Future<List<int>>.value(<int>[]),
+          )
+          as _i3.Future<List<int>>);
+
+  @override
+  _i3.Stream<_i11.ExerciseState> watchAllDrift() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchAllDrift, []),
+            returnValue: _i3.Stream<_i11.ExerciseState>.empty(),
+          )
+          as _i3.Stream<_i11.ExerciseState>);
+
+  @override
+  _i3.Stream<List<_i10.ExerciseCategory>> watchCategoriesDrift() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchCategoriesDrift, []),
+            returnValue: _i3.Stream<List<_i10.ExerciseCategory>>.empty(),
+          )
+          as _i3.Stream<List<_i10.ExerciseCategory>>);
+
+  @override
+  _i3.Stream<List<_i12.Equipment>> watchEquipmentDrift() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchEquipmentDrift, []),
+            returnValue: _i3.Stream<List<_i12.Equipment>>.empty(),
+          )
+          as _i3.Stream<List<_i12.Equipment>>);
+
+  @override
+  _i3.Stream<List<_i13.Muscle>> watchMusclesDrift() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchMusclesDrift, []),
+            returnValue: _i3.Stream<List<_i13.Muscle>>.empty(),
+          )
+          as _i3.Stream<List<_i13.Muscle>>);
+
+  @override
+  _i3.Stream<List<_i14.Language>> watchLanguagesDrift() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchLanguagesDrift, []),
+            returnValue: _i3.Stream<List<_i14.Language>>.empty(),
+          )
+          as _i3.Stream<List<_i14.Language>>);
+}
+
+/// A class which mocks [UserProfileRepository].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockUserProfileRepository extends _i1.Mock implements _i15.UserProfileRepository {
+  MockUserProfileRepository() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i3.Stream<_i16.UserProfile?> watchDrift() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchDrift, []),
+            returnValue: _i3.Stream<_i16.UserProfile?>.empty(),
+          )
+          as _i3.Stream<_i16.UserProfile?>);
+
+  @override
+  _i3.Future<void> updateTimeZoneDrift(int? id, String? timeZone) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateTimeZoneDrift, [id, timeZone]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> editLocalDrift(_i16.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/forms/entry_test.dart b/test/features/measurements/widgets/forms/entry_test.dart
new file mode 100644
index 000000000..644964ce0
--- /dev/null
+++ b/test/features/measurements/widgets/forms/entry_test.dart
@@ -0,0 +1,148 @@
+/*
+ * 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/entry.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+import '../../../../../test_data/measurements.dart';
+import '../../../../helpers/measurement_repository_stubs.dart';
+import 'entry_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('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.ensureVisible(find.byType(ElevatedButton));
+      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);
+    });
+
+    testWidgets('a value outside the limits of the metric type is refused', (tester) async {
+      final category = MeasurementCategory(
+        id: 'hr',
+        name: 'Heart rate',
+        unit: 'bpm',
+        metricType: MetricType.heartRate,
+      );
+      stubMeasurementReads(mockRepo, [category]);
+      when(mockRepo.addLocalDrift(any)).thenAnswer((_) async {});
+
+      await tester.pumpWidget(wrap(MeasurementEntryForm(category.id!)));
+      await tester.pumpAndSettle();
+
+      // 500 bpm are over the bound the server enforces as well
+      await tester.enterText(
+        find.descendant(
+          of: find.byType(DecimalInputWidget),
+          matching: find.byType(TextFormField),
+        ),
+        '500',
+      );
+      await tester.ensureVisible(find.byType(ElevatedButton));
+      await tester.tap(find.byType(ElevatedButton));
+      await tester.pumpAndSettle();
+
+      verifyNever(mockRepo.addLocalDrift(any));
+      expect(find.text('Please enter a value between 30 and 250'), findsOneWidget);
+    });
+
+    testWidgets('editing pre-fills the notes and saves them changed', (tester) async {
+      final category = getMeasurementCategories()[0];
+      stubMeasurementReads(mockRepo, [category]);
+      when(mockRepo.updateLocalDrift(any)).thenAnswer((_) async {});
+
+      final entry = MeasurementEntry(
+        id: 'e-1',
+        categoryId: category.id!,
+        date: DateTime(2026, 1, 1),
+        value: 30,
+        notes: 'Old notes',
+      );
+
+      await tester.pumpWidget(wrap(MeasurementEntryForm(category.id!, entry)));
+      await tester.pumpAndSettle();
+      expect(find.widgetWithText(TextFormField, 'Old notes'), findsOneWidget);
+
+      await tester.enterText(find.widgetWithText(TextFormField, 'Old notes'), 'New notes');
+      await tester.ensureVisible(find.byType(ElevatedButton));
+      await tester.tap(find.byType(ElevatedButton));
+      await tester.pumpAndSettle();
+
+      final saved =
+          verify(mockRepo.updateLocalDrift(captureAny)).captured.single as MeasurementEntry;
+      expect(saved.notes, 'New notes');
+    });
+  });
+}
diff --git a/test/features/measurements/widgets/forms/entry_test.mocks.dart b/test/features/measurements/widgets/forms/entry_test.mocks.dart
new file mode 100644
index 000000000..f785b71a6
--- /dev/null
+++ b/test/features/measurements/widgets/forms/entry_test.mocks.dart
@@ -0,0 +1,281 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in wger/test/features/measurements/widgets/forms/entry_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/forms/group_entry_test.dart b/test/features/measurements/widgets/forms/group_entry_test.dart
new file mode 100644
index 000000000..6267b2a0c
--- /dev/null
+++ b/test/features/measurements/widgets/forms/group_entry_test.dart
@@ -0,0 +1,107 @@
+/*
+ * 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_entry.dart';
+import 'package:wger/features/measurements/providers/measurement_repository.dart';
+import 'package:wger/features/measurements/widgets/forms/group_entry.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+import '../../../../../test_data/measurements.dart';
+import '../../../../helpers/measurement_repository_stubs.dart';
+import 'group_entry_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('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.ensureVisible(find.byType(ElevatedButton));
+      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.ensureVisible(find.byType(ElevatedButton));
+      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/group_entry_test.mocks.dart b/test/features/measurements/widgets/forms/group_entry_test.mocks.dart
new file mode 100644
index 000000000..eb8c471cc
--- /dev/null
+++ b/test/features/measurements/widgets/forms/group_entry_test.mocks.dart
@@ -0,0 +1,281 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in wger/test/features/measurements/widgets/forms/group_entry_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..9f14d4801
--- /dev/null
+++ b/test/features/measurements/widgets/helpers_test.dart
@@ -0,0 +1,688 @@
+/*
+ * 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:fl_chart/fl_chart.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:wger/core/widgets/legend.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/bar_chart.dart';
+import 'package:wger/features/measurements/widgets/charts/distribution_chart.dart';
+import 'package:wger/features/measurements/widgets/charts/heatmap_chart.dart';
+import 'package:wger/features/measurements/widgets/charts/line_chart.dart';
+import 'package:wger/features/measurements/widgets/charts/overall_change.dart';
+import 'package:wger/features/measurements/widgets/charts/stacked_bar_chart.dart';
+import 'package:wger/features/measurements/widgets/helpers.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+import '../../../../test_data/measurements.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() => testMeasurementCategoryBloodPressure;
+
+    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..c21c8190b
--- /dev/null
+++ b/test/features/measurements/widgets/measurement_fab_test.dart
@@ -0,0 +1,141 @@
+/*
+ * 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);
+    });
+
+    testWidgets('a calculated category is not offered, also while still empty', (tester) async {
+      final bmi = MeasurementCategory(id: 'bmi', name: 'BMI', unit: '', dynamicType: 'BMI');
+
+      await tester.pumpWidget(_wrap([biceps, bmi], const {}));
+      await tester.pumpAndSettle();
+
+      await tester.tap(find.byType(FloatingActionButton));
+      await tester.pumpAndSettle();
+
+      expect(find.text('Biceps').hitTestable(), findsOneWidget);
+      expect(find.text('BMI').hitTestable(), findsNothing);
+    });
+  });
+}
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..4c1dd83d5
--- /dev/null
+++ b/test/features/measurements/widgets/measurement_tile_test.dart
@@ -0,0 +1,368 @@
+/*
+ * 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/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/spark_charts.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_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 calculated tile is badged and says what it is computed from', (tester) async {
+      // Rendered at the height the grid gives every tile, so the extra row
+      // has to fit next to the value, the spark and its axis
+      final bmi = MeasurementCategory(id: 'bmi', name: 'BMI', unit: 'kg/m²', dynamicType: 'BMI');
+      final entries = {
+        'bmi': [for (var day = 6; day >= 0; day--) _entry('bmi', 22.4, _day(day))],
+      };
+
+      await tester.pumpWidget(_wrap(bmi, entries: entries));
+      await tester.pumpAndSettle();
+
+      expect(find.text('Calculated'), findsOneWidget);
+      expect(find.text('From your body weight and the height in your profile'), findsOneWidget);
+      expect(find.byType(SparkLineChart), findsOneWidget);
+    });
+
+    testWidgets('the mark still fits over the tallest spark', (tester) async {
+      // The heatmap has no axis row and takes that room for its grid, so it
+      // is the tile the extra row has the least space in
+      final bmi = MeasurementCategory(
+        id: 'bmi',
+        name: 'BMI',
+        unit: 'kg/m²',
+        dynamicType: 'BMI',
+        chartType: ChartType.heatmap,
+      );
+      final entries = {
+        'bmi': [for (var day = 6; day >= 0; day--) _entry('bmi', 22.4, _day(day))],
+      };
+
+      await tester.pumpWidget(_wrap(bmi, entries: entries));
+      await tester.pumpAndSettle();
+
+      expect(find.text('Calculated'), findsOneWidget);
+    });
+
+    testWidgets('a hand-kept tile carries no badge', (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('Calculated'), findsNothing);
+    });
+
+    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 = testMeasurementCategoryBloodPressure;
+      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..c2822fd5b
--- /dev/null
+++ b/test/features/measurements/widgets/metric_picker_test.dart
@@ -0,0 +1,208 @@
+/*
+ * 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/category.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()),
+      ),
+    );
+  }
+
+  /// Brings the tile named [label] into view; where it sits follows from the
+  /// alphabetical order, so no test may assume it is on the first screen
+  Future<void> scrollTo(WidgetTester tester, String label) async {
+    await tester.dragUntilVisible(
+      find.text(label),
+      find.byType(ListView),
+      const Offset(0, -100),
+    );
+    await tester.ensureVisible(find.text(label));
+    await tester.pumpAndSettle();
+  }
+
+  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 scrollTo(tester, MetricType.restingHeartRate.localized(context));
+    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 scrollTo(tester, MetricType.restingHeartRate.localized(context));
+    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();
+
+    await tester.tap(
+      find.text(
+        AppLocalizations.of(tester.element(find.byType(MetricPickerSheet))).customMeasurement,
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    expect(find.byType(MeasurementCategoryForm), findsOneWidget);
+    verifyNever(mockRepo.addLocalDriftCategoryGroup(any));
+  });
+
+  testWidgets('the own measurement leads, the known ones follow in order', (tester) async {
+    await tester.pumpWidget(wrap());
+    await tester.pumpAndSettle();
+
+    final i18n = AppLocalizations.of(tester.element(find.byType(MetricPickerSheet)));
+    final titles = tester
+        .widgetList<ListTile>(find.byType(ListTile))
+        .map((tile) => (tile.title! as Text).data!)
+        .toList();
+
+    expect(titles.first, i18n.customMeasurement);
+    // Alphabetical by the translated name, not by the order they are declared
+    final known = titles.skip(1).toList();
+    expect(known, [...known]..sort());
+    expect(known, isNotEmpty);
+  });
+}
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..d6a3e298b
--- /dev/null
+++ b/test/features/measurements/widgets/metric_picker_test.mocks.dart
@@ -0,0 +1,409 @@
+// 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> clearCredentials() =>
+      (super.noSuchMethod(
+            Invocation.method(#clearCredentials, []),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> clearLegacyDrfToken() =>
+      (super.noSuchMethod(
+            Invocation.method(#clearLegacyDrfToken, []),
+            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..552daaa21
--- /dev/null
+++ b/test/features/measurements/widgets/weight_form_test.dart
@@ -0,0 +1,324 @@
+/*
+ * 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);
+    expect(find.text('After the run'), 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 and takes the edited notes', (
+    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 with the time untouched
+    await tester.enterText(find.byKey(const Key('notesInput')), 'Before breakfast');
+    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);
+    expect(saved.notes, 'Before breakfast');
+  });
+
+  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);
+    });
+
+    testWidgets('Editing keeps source, externalId and extra data of imported entries', (
+      WidgetTester tester,
+    ) async {
+      final imported = MeasurementEntry(
+        id: 'e-import',
+        categoryId: testBodyWeightCategoryId,
+        date: DateTime(2026, 1, 1),
+        value: 80,
+        notes: 'From the watch',
+        source: 'apple',
+        externalId: 'platform-uuid',
+        extraData: const {'unit': 'kg', 'record_type': 'WEIGHT'},
+      );
+
+      await tester.pumpWidget(createWeightForm(entry: imported));
+      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.source, 'apple');
+      expect(saved.externalId, 'platform-uuid');
+      expect(saved.notes, 'From the watch');
+      expect(saved.extraData, {'unit': 'kg', 'record_type': 'WEIGHT'});
+      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..db81a8a44
--- /dev/null
+++ b/test/features/measurements/widgets/weight_form_test.mocks.dart
@@ -0,0 +1,318 @@
+// 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> updateTimeZoneDrift(int? id, String? timeZone) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateTimeZoneDrift, [id, timeZone]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @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..3b7462255 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.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.Stream<List<_i17.WeightEntry>>);
+          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,102 @@ 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> updateTimeZoneDrift(int? id, String? timeZone) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateTimeZoneDrift, [id, timeZone]),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
 
   @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..6d165afac
--- /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/overall_change.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..cd1574dbe
--- /dev/null
+++ b/test/features/nutrition/widgets/plan_weight_chart_test.mocks.dart
@@ -0,0 +1,318 @@
+// 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> updateTimeZoneDrift(int? id, String? timeZone) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateTimeZoneDrift, [id, timeZone]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @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/helpers/routine_form_test_overrides.mocks.dart b/test/features/routines/helpers/routine_form_test_overrides.mocks.dart
index a3bf6e59e..4715131c5 100644
--- a/test/features/routines/helpers/routine_form_test_overrides.mocks.dart
+++ b/test/features/routines/helpers/routine_form_test_overrides.mocks.dart
@@ -191,6 +191,15 @@ class MockUserProfileRepository extends _i1.Mock implements _i13.UserProfileRepo
           )
           as _i4.Stream<_i14.UserProfile?>);
 
+  @override
+  _i4.Future<void> updateTimeZoneDrift(int? id, String? timeZone) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateTimeZoneDrift, [id, timeZone]),
+            returnValue: _i4.Future<void>.value(),
+            returnValueForMissingStub: _i4.Future<void>.value(),
+          )
+          as _i4.Future<void>);
+
   @override
   _i4.Future<void> editLocalDrift(_i14.UserProfile? profile) =>
       (super.noSuchMethod(
diff --git a/test/features/routines/models/session_test.dart b/test/features/routines/models/session_test.dart
index 965272748..5ede05c9c 100644
--- a/test/features/routines/models/session_test.dart
+++ b/test/features/routines/models/session_test.dart
@@ -16,12 +16,80 @@
  * 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:timezone/data/latest.dart' as tzdata;
 import 'package:wger/core/consts.dart';
 import 'package:wger/features/routines/models/log.dart';
 import 'package:wger/features/routines/models/session.dart';
 
 void main() {
+  group('WorkoutSession.fromDb', () {
+    test('takes the new columns when they are set', () {
+      final session = WorkoutSession.fromDb(
+        routineId: 1,
+        datetimeStart: DateTime(2026, 4, 15, 18, 30),
+        datetimeEnd: DateTime(2026, 4, 15, 19, 45),
+      );
+
+      expect(session.datetimeStart, DateTime(2026, 4, 15, 18, 30));
+      expect(session.datetimeEnd, DateTime(2026, 4, 15, 19, 45));
+    });
+
+    test('rebuilds a row that predates 2.7 from its date and times', () {
+      final session = WorkoutSession.fromDb(
+        routineId: 1,
+        date: DateTime(2026, 4, 15),
+        timeStart: const TimeOfDay(hour: 18, minute: 30),
+        timeEnd: const TimeOfDay(hour: 19, minute: 45),
+      );
+
+      expect(session.datetimeStart, DateTime(2026, 4, 15, 18, 30));
+      expect(session.datetimeEnd, DateTime(2026, 4, 15, 19, 45));
+    });
+
+    test('reads an end before the start as the next day', () {
+      final session = WorkoutSession.fromDb(
+        routineId: 1,
+        date: DateTime(2026, 4, 15),
+        timeStart: const TimeOfDay(hour: 23, minute: 0),
+        timeEnd: const TimeOfDay(hour: 1, minute: 30),
+      );
+
+      expect(session.datetimeStart, DateTime(2026, 4, 15, 23, 0));
+      expect(session.datetimeEnd, DateTime(2026, 4, 16, 1, 30));
+    });
+
+    test('an old row without times starts at midnight and stays open', () {
+      final session = WorkoutSession.fromDb(routineId: 1, date: DateTime(2026, 4, 15));
+
+      expect(session.datetimeStart, DateTime(2026, 4, 15));
+      expect(session.datetimeEnd, isNull);
+    });
+  });
+
+  group('WorkoutSession.localDayIn', () {
+    setUpAll(tzdata.initializeTimeZones);
+
+    test('cuts the day in the owner zone, not the device one', () {
+      final session = WorkoutSession.fromDb(
+        routineId: 1,
+        datetimeStart: DateTime.utc(2026, 8, 10, 12, 30),
+      );
+
+      expect(session.localDayIn('Pacific/Auckland'), DateTime(2026, 8, 11));
+    });
+
+    test('falls back to the device day while no zone is reported', () {
+      final session = WorkoutSession.fromDb(
+        routineId: 1,
+        datetimeStart: DateTime(2026, 8, 10, 23, 30),
+      );
+
+      expect(session.localDayIn(null), DateTime(2026, 8, 10));
+    });
+  });
+
   group('WorkoutSession.volume', () {
     test('sums metric volumes correctly', () {
       final a = Log(
@@ -46,7 +114,7 @@ void main() {
         repetitionsUnitId: REP_UNIT_REPETITIONS_ID,
       );
 
-      final session = WorkoutSession(routineId: 1, date: DateTime(2021), logs: [a, b]);
+      final session = WorkoutSession(routineId: 1, datetimeStart: DateTime(2021), logs: [a, b]);
 
       final vol = session.volume;
       expect(vol['metric'], equals(100 * 3 + 50 * 2));
@@ -76,7 +144,7 @@ void main() {
         repetitionsUnitId: REP_UNIT_REPETITIONS_ID,
       );
 
-      final session = WorkoutSession(routineId: 1, date: DateTime(2021), logs: [a, b]);
+      final session = WorkoutSession(routineId: 1, datetimeStart: DateTime(2021), logs: [a, b]);
 
       final vol = session.volume;
       expect(vol['imperial'], equals(220 * 4 + 150 * 1));
@@ -117,7 +185,7 @@ void main() {
         repetitionsUnitId: 999, // some other repetition unit -> should be ignored
       );
 
-      final session = WorkoutSession(routineId: 1, date: DateTime(2021), logs: [a, b, c]);
+      final session = WorkoutSession(routineId: 1, datetimeStart: DateTime(2021), logs: [a, b, c]);
 
       final vol = session.volume;
       // only 'a' should count for metric, only 'b' for imperial
@@ -126,7 +194,7 @@ void main() {
     });
 
     test('returns zero for empty logs', () {
-      final session = WorkoutSession(routineId: 1, date: DateTime(2021), logs: []);
+      final session = WorkoutSession(routineId: 1, datetimeStart: DateTime(2021), logs: []);
 
       final vol = session.volume;
       expect(vol['metric'], equals(0));
@@ -156,7 +224,7 @@ void main() {
         repetitionsUnitId: REP_UNIT_REPETITIONS_ID,
       );
 
-      final session = WorkoutSession(routineId: 1, date: DateTime(2021), logs: [a, b]);
+      final session = WorkoutSession(routineId: 1, datetimeStart: DateTime(2021), logs: [a, b]);
 
       final vol = session.volume;
       expect(vol['metric'], closeTo(10.5 * 3 + 5.25 * 2.5, 1e-9));
diff --git a/test/features/routines/providers/routines_notifier_test.dart b/test/features/routines/providers/routines_notifier_test.dart
index 13edbf2ff..6dac4e9a0 100644
--- a/test/features/routines/providers/routines_notifier_test.dart
+++ b/test/features/routines/providers/routines_notifier_test.dart
@@ -387,7 +387,7 @@ void main() {
       final session = WorkoutSession(
         id: 'session-1',
         routineId: 101,
-        date: DateTime(2025, 1, 1),
+        datetimeStart: DateTime(2025, 1, 1),
         logs: [log],
       );
       when(
diff --git a/test/features/routines/providers/routines_repository_test.mocks.dart b/test/features/routines/providers/routines_repository_test.mocks.dart
index 641d3fc16..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,
@@ -1441,7 +1425,7 @@ class MockDriftPowersyncDatabase extends _i1.Mock implements _i4.DriftPowersyncD
               [table, insertable],
               {#startIndex: startIndex},
             ),
-            returnValue: _FakeGenerationContext_52(
+            returnValue: _FakeGenerationContext_51(
               this,
               Invocation.method(
                 #$writeUpdateInsertable,
diff --git a/test/features/routines/providers/workout_logs_repository_test.dart b/test/features/routines/providers/workout_logs_repository_test.dart
index df82c3965..0e3bd4945 100644
--- a/test/features/routines/providers/workout_logs_repository_test.dart
+++ b/test/features/routines/providers/workout_logs_repository_test.dart
@@ -81,11 +81,11 @@ void main() {
   });
 
   group('addLocalDrift, log without sessionId', () {
-    test('reuses an existing session for the same routine and day', () async {
+    test('reuses an open session within the window', () async {
       final existingSession = WorkoutSession(
         id: 'existing-session-1',
         routineId: 100,
-        date: DateTime.utc(2026, 4, 15),
+        datetimeStart: DateTime.utc(2026, 4, 15, 16),
       );
       await db.into(db.workoutSessionTable).insert(existingSession.toCompanion());
 
@@ -98,12 +98,60 @@ void main() {
       expect(logs.single.sessionId, existingSession.id);
     });
 
+    test('reuses a closed session the log falls into', () async {
+      final existingSession = WorkoutSession(
+        id: 'existing-session-1',
+        routineId: 100,
+        datetimeStart: DateTime.utc(2026, 4, 15, 16),
+        datetimeEnd: DateTime.utc(2026, 4, 15, 19),
+      );
+      await db.into(db.workoutSessionTable).insert(existingSession.toCompanion());
+
+      final log = makeLog(date: DateTime.utc(2026, 4, 15, 18));
+      await repo.addLocalDrift(log);
+
+      expect(await readSessions(), hasLength(1));
+      expect(log.sessionId, existingSession.id);
+    });
+
+    test('reuses a session that runs past midnight for a log after it', () async {
+      // The session it belongs to started the day before, so a lookup by day
+      // would put this log in one of its own (issue wger#2379)
+      final existingSession = WorkoutSession(
+        id: 'existing-session-1',
+        routineId: 100,
+        datetimeStart: DateTime.utc(2026, 4, 15, 23, 30),
+        datetimeEnd: DateTime.utc(2026, 4, 16, 1),
+      );
+      await db.into(db.workoutSessionTable).insert(existingSession.toCompanion());
+
+      final log = makeLog(date: DateTime.utc(2026, 4, 16, 0, 30));
+      await repo.addLocalDrift(log);
+
+      expect(await readSessions(), hasLength(1));
+      expect(log.sessionId, existingSession.id);
+    });
+
+    test('does not reuse a closed session the log falls outside of', () async {
+      await db
+          .into(db.workoutSessionTable)
+          .insert(
+            WorkoutSession(
+              routineId: 100,
+              datetimeStart: DateTime.utc(2026, 4, 15, 16),
+              datetimeEnd: DateTime.utc(2026, 4, 15, 17),
+            ).toCompanion(),
+          );
+
+      await repo.addLocalDrift(makeLog(date: DateTime.utc(2026, 4, 15, 18)));
+
+      expect(await readSessions(), hasLength(2));
+    });
+
     test('reuses a server-synced session whose date has no time component', () async {
-      // After a round-trip the backend stores the date as a bare 'YYYY-MM-DD'
-      // (Django DateField), not the local 'T00:00:00.000Z' format. The day
-      // lookup must still match it, otherwise a duplicate session is created
-      // and the server rejects it on the unique (date, routine, user)
-      // constraint, taking every log on it down with it.
+      // A row replicated before 2.7 carries only the bare 'YYYY-MM-DD' date and
+      // no datetime_start. The day lookup has to keep matching it, otherwise a
+      // duplicate session appears next to every one of them.
       await db.customStatement(
         "INSERT INTO manager_workoutsession (id, routine_id, date, impression) VALUES ('server-session', 100, '2026-04-15', '2')",
       );
@@ -117,14 +165,16 @@ void main() {
       expect(logs.single.sessionId, 'server-session');
     });
 
-    test('creates a new session at midnight UTC of the log date', () async {
+    test('creates a new session starting at the moment of the log', () async {
+      // Without a start the lookups above could never find it again and every
+      // further log would create one of its own.
       final log = makeLog(date: DateTime.utc(2026, 4, 15, 18, 30));
 
       await repo.addLocalDrift(log);
 
       final sessions = await readSessions();
       expect(sessions, hasLength(1));
-      expect(sessions.single.date, DateTime.utc(2026, 4, 15));
+      expect(sessions.single.datetimeStart, DateTime.utc(2026, 4, 15, 18, 30).toLocal());
       expect(log.sessionId, sessions.single.id);
     });
 
@@ -139,11 +189,26 @@ void main() {
       expect(sessions.single.dayId, 42);
     });
 
+    test('starts a new session when the open one is older than the window', () async {
+      await db
+          .into(db.workoutSessionTable)
+          .insert(
+            WorkoutSession(
+              routineId: 100,
+              datetimeStart: DateTime.utc(2026, 4, 15, 8),
+            ).toCompanion(),
+          );
+
+      await repo.addLocalDrift(makeLog(routineId: 100, date: DateTime.utc(2026, 4, 15, 18)));
+
+      expect(await readSessions(), hasLength(2));
+    });
+
     test('does not reuse a session from a different day', () async {
       await db
           .into(db.workoutSessionTable)
           .insert(
-            WorkoutSession(routineId: 100, date: DateTime.utc(2026, 4, 14)).toCompanion(),
+            WorkoutSession(routineId: 100, datetimeStart: DateTime.utc(2026, 4, 14)).toCompanion(),
           );
 
       await repo.addLocalDrift(makeLog(date: DateTime.utc(2026, 4, 15)));
@@ -155,7 +220,7 @@ void main() {
       await db
           .into(db.workoutSessionTable)
           .insert(
-            WorkoutSession(routineId: 999, date: DateTime.utc(2026, 4, 15)).toCompanion(),
+            WorkoutSession(routineId: 999, datetimeStart: DateTime.utc(2026, 4, 15)).toCompanion(),
           );
 
       await repo.addLocalDrift(makeLog(routineId: 100, date: DateTime.utc(2026, 4, 15)));
@@ -178,7 +243,7 @@ void main() {
       final existingSession = WorkoutSession(
         id: 'free-session',
         routineId: null,
-        date: DateTime.utc(2026, 4, 15),
+        datetimeStart: DateTime.utc(2026, 4, 15, 16),
       );
       await db.into(db.workoutSessionTable).insert(existingSession.toCompanion());
 
@@ -193,7 +258,7 @@ void main() {
       await db
           .into(db.workoutSessionTable)
           .insert(
-            WorkoutSession(routineId: 100, date: DateTime.utc(2026, 4, 15)).toCompanion(),
+            WorkoutSession(routineId: 100, datetimeStart: DateTime.utc(2026, 4, 15)).toCompanion(),
           );
 
       await repo.addLocalDrift(makeLog(routineId: null, date: DateTime.utc(2026, 4, 15)));
diff --git a/test/features/routines/providers/workout_session_repository_test.dart b/test/features/routines/providers/workout_session_repository_test.dart
index 819f06dc5..5799e1548 100644
--- a/test/features/routines/providers/workout_session_repository_test.dart
+++ b/test/features/routines/providers/workout_session_repository_test.dart
@@ -16,7 +16,6 @@
  * 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/database/powersync/database.dart';
 import 'package:wger/features/routines/models/log.dart';
@@ -55,7 +54,7 @@ void main() {
     return WorkoutSession(
       id: id,
       routineId: routineId,
-      date: date ?? DateTime.utc(2026, 4, 15),
+      datetimeStart: date ?? DateTime.utc(2026, 4, 15),
     );
   }
 
@@ -96,20 +95,20 @@ void main() {
       expect(rows.single.notes, 'updated');
     });
 
-    test('editLocalDrift clears times that were nulled', () async {
+    test('editLocalDrift clears an end that was nulled', () async {
       final inserted = await repo.addLocalDrift(
         makeSession().copyWith(
-          timeStart: const TimeOfDay(hour: 8, minute: 0),
-          timeEnd: const TimeOfDay(hour: 9, minute: 30),
+          datetimeStart: DateTime(2021, 5, 1, 8, 0),
+          datetimeEnd: DateTime(2021, 5, 1, 9, 30),
         ),
       );
 
-      // The user clears both times via the form's clear buttons
-      await repo.editLocalDrift(inserted.copyWith(timeStart: null, timeEnd: null));
+      // The user clears the end via the form's clear button
+      await repo.editLocalDrift(inserted.copyWith(datetimeEnd: null));
 
       final row = await db.select(db.workoutSessionTable).getSingle();
-      expect(row.timeStart, isNull);
-      expect(row.timeEnd, isNull);
+      expect(row.datetimeStart, DateTime(2021, 5, 1, 8, 0));
+      expect(row.datetimeEnd, isNull);
     });
 
     test('deleteLocalDrift removes the row with matching id', () async {
@@ -134,7 +133,7 @@ void main() {
       expect(await repo.watchAllDrift().first, isEmpty);
     });
 
-    test('emits sessions sorted by date desc', () async {
+    test('emits sessions sorted by start desc', () async {
       await repo.addLocalDrift(makeSession(routineId: 1, date: DateTime.utc(2026, 4, 14)));
       await repo.addLocalDrift(makeSession(routineId: 2, date: DateTime.utc(2026, 4, 16)));
       await repo.addLocalDrift(makeSession(routineId: 3, date: DateTime.utc(2026, 4, 15)));
diff --git a/test/features/routines/screens/goldens/routine_logs_screen_detail.png b/test/features/routines/screens/goldens/routine_logs_screen_detail.png
index 9a6a765de..199ed6e5d 100644
Binary files a/test/features/routines/screens/goldens/routine_logs_screen_detail.png and b/test/features/routines/screens/goldens/routine_logs_screen_detail.png differ
diff --git a/test/features/routines/screens/gym_mode_test.mocks.dart b/test/features/routines/screens/gym_mode_test.mocks.dart
index 9f72a24ca..acd9adffc 100644
--- a/test/features/routines/screens/gym_mode_test.mocks.dart
+++ b/test/features/routines/screens/gym_mode_test.mocks.dart
@@ -595,6 +595,15 @@ class MockUserProfileRepository extends _i1.Mock implements _i29.UserProfileRepo
           )
           as _i10.Stream<_i30.UserProfile?>);
 
+  @override
+  _i10.Future<void> updateTimeZoneDrift(int? id, String? timeZone) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateTimeZoneDrift, [id, timeZone]),
+            returnValue: _i10.Future<void>.value(),
+            returnValueForMissingStub: _i10.Future<void>.value(),
+          )
+          as _i10.Future<void>);
+
   @override
   _i10.Future<void> editLocalDrift(_i30.UserProfile? profile) =>
       (super.noSuchMethod(
diff --git a/test/features/routines/screens/routine_logs_screen_test.dart b/test/features/routines/screens/routine_logs_screen_test.dart
index 3d5da8547..c425326d6 100644
--- a/test/features/routines/screens/routine_logs_screen_test.dart
+++ b/test/features/routines/screens/routine_logs_screen_test.dart
@@ -25,6 +25,7 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
 import 'package:wger/core/network/network_provider.dart';
+import 'package:wger/features/account/providers/user_profile_repository.dart';
 import 'package:wger/features/routines/models/log.dart';
 import 'package:wger/features/routines/models/repetition_unit.dart';
 import 'package:wger/features/routines/models/routine.dart';
@@ -34,6 +35,7 @@ import 'package:wger/features/routines/providers/workout_logs_repository.dart';
 import 'package:wger/features/routines/screens/routine_logs_screen.dart';
 import 'package:wger/features/routines/screens/routine_screen.dart';
 import 'package:wger/features/routines/widgets/logs/log_overview_routine.dart';
+import 'package:wger/features/routines/widgets/logs/session_info.dart';
 import 'package:wger/features/trophies/providers/trophy_repository.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 
@@ -49,14 +51,14 @@ class _StubRoutinesRiverpod extends RoutinesRiverpod {
   Stream<RoutinesState> build() => Stream.value(RoutinesState(routines: _routines));
 }
 
-@GenerateMocks([TrophyRepository, WorkoutLogRepository])
+@GenerateMocks([TrophyRepository, WorkoutLogRepository, UserProfileRepository])
 void main() {
   late Routine routine;
   final mockWorkoutLogRepository = MockWorkoutLogRepository();
 
   setUp(() {
     routine = getTestRoutine();
-    routine.sessions[0] = routine.sessions[0].copyWith(date: DateTime(2025, 3, 29));
+    routine.sessions[0] = routine.sessions[0].copyWith(datetimeStart: DateTime(2025, 3, 29));
     // Pin every log to a known session id so we can verify the edit
     // dialog round-trips the value through the model.
     for (final log in routine.sessions[0].logs) {
@@ -78,9 +80,17 @@ void main() {
       ),
     ).thenAnswer((_) async => getUserTrophies());
 
+    // The log calendar cuts its days in the owner's zone, which reaches the
+    // Drift-backed profile repository. Stub it so the real database is not
+    // pulled into a widget test: a failing stream there leaves Riverpod's
+    // retry timer pending after the tree is disposed.
+    final mockUserProfileRepository = MockUserProfileRepository();
+    when(mockUserProfileRepository.watchDrift()).thenAnswer((_) => Stream.value(null));
+
     final container = ProviderContainer.test(
       overrides: [
         networkStatusProvider.overrideWithValue(isOnline),
+        userProfileRepositoryProvider.overrideWithValue(mockUserProfileRepository),
         workoutLogRepositoryProvider.overrideWithValue(mockWorkoutLogRepository),
         trophyRepositoryProvider.overrideWithValue(mockRepository),
         routinesRiverpodProvider.overrideWith(
@@ -217,6 +227,29 @@ void main() {
     });
   });
 
+  testWidgets('Shows every session logged on the selected day', (WidgetTester tester) async {
+    tester.view.physicalSize = const Size(500, 1200);
+    tester.view.devicePixelRatio = 1.0;
+    addTearDown(tester.view.reset);
+
+    // A second workout later the same day, which the server allows since 2.7
+    routine.sessions[1] = routine.sessions[1].copyWith(
+      datetimeStart: DateTime(2025, 3, 29, 18, 0),
+      datetimeEnd: DateTime(2025, 3, 29, 19, 30),
+    );
+
+    await withClock(Clock.fixed(DateTime(2025, 3, 29)), () async {
+      await tester.pumpWidget(renderWidget());
+      await tester.tap(find.byType(TextButton));
+      await tester.pumpAndSettle();
+
+      // Both sessions are rendered, each with its own logs
+      expect(find.byType(SessionInfo), findsNWidgets(2));
+      expect(find.byKey(const ValueKey('delete-log-1')), findsOneWidget);
+      expect(find.byKey(const ValueKey('delete-log-3')), findsOneWidget);
+    });
+  });
+
   testWidgets('Edit dialog quick-plus updates the controller without rebuild error', (
     WidgetTester tester,
   ) async {
diff --git a/test/features/routines/screens/routine_logs_screen_test.mocks.dart b/test/features/routines/screens/routine_logs_screen_test.mocks.dart
index ee127dafe..70b9852f4 100644
--- a/test/features/routines/screens/routine_logs_screen_test.mocks.dart
+++ b/test/features/routines/screens/routine_logs_screen_test.mocks.dart
@@ -8,6 +8,8 @@ import 'dart:async' as _i5;
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:mockito/src/dummies.dart' as _i4;
 import 'package:wger/core/network/base_provider.dart' as _i2;
+import 'package:wger/features/account/models/user_profile.dart' as _i12;
+import 'package:wger/features/account/providers/user_profile_repository.dart' as _i11;
 import 'package:wger/features/routines/models/log.dart' as _i10;
 import 'package:wger/features/routines/providers/workout_logs_repository.dart' as _i9;
 import 'package:wger/features/trophies/models/trophy.dart' as _i6;
@@ -179,3 +181,38 @@ class MockWorkoutLogRepository extends _i1.Mock implements _i9.WorkoutLogReposit
           )
           as _i5.Future<void>);
 }
+
+/// A class which mocks [UserProfileRepository].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockUserProfileRepository extends _i1.Mock implements _i11.UserProfileRepository {
+  MockUserProfileRepository() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i5.Stream<_i12.UserProfile?> watchDrift() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchDrift, []),
+            returnValue: _i5.Stream<_i12.UserProfile?>.empty(),
+          )
+          as _i5.Stream<_i12.UserProfile?>);
+
+  @override
+  _i5.Future<void> updateTimeZoneDrift(int? id, String? timeZone) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateTimeZoneDrift, [id, timeZone]),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
+
+  @override
+  _i5.Future<void> editLocalDrift(_i12.UserProfile? profile) =>
+      (super.noSuchMethod(
+            Invocation.method(#editLocalDrift, [profile]),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
+}
diff --git a/test/features/routines/validators_test.dart b/test/features/routines/validators_test.dart
new file mode 100644
index 000000000..1140bcb70
--- /dev/null
+++ b/test/features/routines/validators_test.dart
@@ -0,0 +1,81 @@
+/*
+ * 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/routines/models/session.dart';
+import 'package:wger/features/routines/validators.dart';
+import 'package:wger/l10n/generated/app_localizations_en.dart';
+
+void main() {
+  final i18n = AppLocalizationsEn();
+  final start = DateTime(2026, 5, 4, 18, 0);
+
+  String? validate(DateTime? end) =>
+      validateWorkoutSessionTimes(datetimeStart: start, datetimeEnd: end, i18n: i18n);
+
+  group('validateWorkoutLogCrossField', () {
+    test('a log needs a repetition count or a weight', () {
+      expect(
+        validateWorkoutLogCrossField(repetitions: null, weight: null, i18n: i18n),
+        i18n.weightOrRepsRequired,
+      );
+    });
+
+    test('either one on its own is enough', () {
+      expect(validateWorkoutLogCrossField(repetitions: 8, weight: null, i18n: i18n), isNull);
+      expect(validateWorkoutLogCrossField(repetitions: null, weight: 60, i18n: i18n), isNull);
+      expect(validateWorkoutLogCrossField(repetitions: 8, weight: 60, i18n: i18n), isNull);
+    });
+  });
+
+  group('validateWorkoutSessionTimes', () {
+    test('a session that is still running has nothing to compare', () {
+      expect(validate(null), isNull);
+    });
+
+    test('an end after the start passes', () {
+      expect(validate(start.add(const Duration(hours: 1))), isNull);
+    });
+
+    test('an end before the start is refused', () {
+      expect(validate(start.subtract(const Duration(minutes: 30))), i18n.timeStartAhead);
+    });
+
+    test('a session running past midnight ends on the next day, not before its start', () {
+      // 18:00 to 00:30 is six and a half hours on the following day
+      expect(validate(DateTime(2026, 5, 5, 0, 30)), i18n.sessionTooLong(5));
+      expect(validate(DateTime(2026, 5, 4, 23, 0)), isNull);
+    });
+
+    test('the longest allowed session is exactly the maximum', () {
+      // The bound the server enforces as WGER_MAX_SESSION_LENGTH_HOURS
+      expect(validate(start.add(sessionMaxDuration)), isNull);
+    });
+
+    test('a minute over the maximum is refused', () {
+      expect(
+        validate(start.add(sessionMaxDuration + const Duration(minutes: 1))),
+        i18n.sessionTooLong(sessionMaxDuration.inHours),
+      );
+    });
+
+    test('the message names the hours the server allows', () {
+      expect(validate(start.add(const Duration(hours: 9))), contains('5'));
+    });
+  });
+}
diff --git a/test/features/routines/widgets/charts_test.dart b/test/features/routines/widgets/charts_test.dart
index 50dbb1bbf..9f392e2b0 100644
--- a/test/features/routines/widgets/charts_test.dart
+++ b/test/features/routines/widgets/charts_test.dart
@@ -70,4 +70,48 @@ void main() {
     expect(tester.takeException(), isNull);
     expect(find.byType(LineChart), findsNothing);
   });
+
+  testWidgets('a group without logs is nothing to plot either', (WidgetTester tester) async {
+    await tester.pumpWidget(createChartScreen({10: []}));
+    await tester.pumpAndSettle();
+
+    expect(tester.takeException(), isNull);
+    expect(find.byType(LineChart), findsNothing);
+  });
+
+  /// The interval the date axis is labelled at
+  double? intervalOf(WidgetTester tester) => tester
+      .widget<LineChart>(find.byType(LineChart))
+      .data
+      .titlesData
+      .bottomTitles
+      .sideTitles
+      .interval;
+
+  testWidgets('spaces the date labels over everything that is plotted', (
+    WidgetTester tester,
+  ) async {
+    // The groups are keyed by repetitions, so the first and the last of them
+    // say nothing about the range: here they sit on one day while the logs
+    // span a year. An interval taken from those two would be minutes wide on
+    // a year-long axis, and fl_chart builds one label per step
+    final start = DateTime(2026, 1, 1);
+    final end = DateTime(2026, 12, 31);
+    await tester.pumpWidget(
+      createChartScreen({
+        // Insertion order decides what `keys.first` and `keys.last` are, and
+        // both of these sit on the same July day
+        10: [makeLog(10, 100, DateTime(2026, 7, 1))],
+        // while the series that spans the axis is neither of them
+        5: [makeLog(5, 140, start), makeLog(5, 150, end)],
+        8: [makeLog(8, 120, DateTime(2026, 7, 1))],
+      }),
+    );
+    await tester.pumpAndSettle();
+
+    // Taken from the two July logs the span reads as zero, which used to fall
+    // back to a hundred seconds: fl_chart would then label a year-long axis
+    // every hundred seconds, some three hundred thousand times over
+    expect(intervalOf(tester), end.difference(start).inMilliseconds / 3);
+  });
 }
diff --git a/test/features/routines/widgets/forms/routine_form_test.mocks.dart b/test/features/routines/widgets/forms/routine_form_test.mocks.dart
index fd307b5ab..2a2ae4525 100644
--- a/test/features/routines/widgets/forms/routine_form_test.mocks.dart
+++ b/test/features/routines/widgets/forms/routine_form_test.mocks.dart
@@ -437,6 +437,15 @@ class MockUserProfileRepository extends _i1.Mock implements _i21.UserProfileRepo
           )
           as _i9.Stream<_i22.UserProfile?>);
 
+  @override
+  _i9.Future<void> updateTimeZoneDrift(int? id, String? timeZone) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateTimeZoneDrift, [id, timeZone]),
+            returnValue: _i9.Future<void>.value(),
+            returnValueForMissingStub: _i9.Future<void>.value(),
+          )
+          as _i9.Future<void>);
+
   @override
   _i9.Future<void> editLocalDrift(_i22.UserProfile? profile) =>
       (super.noSuchMethod(
diff --git a/test/features/routines/widgets/forms/session_form_test.dart b/test/features/routines/widgets/forms/session_form_test.dart
index 0b450c93b..a681e10bd 100644
--- a/test/features/routines/widgets/forms/session_form_test.dart
+++ b/test/features/routines/widgets/forms/session_form_test.dart
@@ -4,6 +4,7 @@ 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/datetime_input.dart';
 import 'package:wger/features/routines/models/session.dart';
 import 'package:wger/features/routines/providers/workout_session_repository.dart';
 import 'package:wger/features/routines/widgets/forms/session.dart';
@@ -55,9 +56,8 @@ void main() {
         routineId: 1,
         notes: 'Existing notes',
         impression: WorkoutImpression.bad,
-        date: DateTime.now(),
-        timeStart: const TimeOfDay(hour: 10, minute: 0),
-        timeEnd: const TimeOfDay(hour: 11, minute: 0),
+        datetimeStart: DateTime.now().copyWith(hour: 10, minute: 0),
+        datetimeEnd: DateTime.now().copyWith(hour: 11, minute: 0),
       );
 
       //Act
@@ -97,7 +97,7 @@ void main() {
         routineId: 1,
         notes: 'Old notes',
         impression: WorkoutImpression.neutral,
-        date: DateTime.now(),
+        datetimeStart: DateTime.now(),
       );
 
       when(mockRepository.editLocalDrift(any as dynamic)).thenAnswer(
@@ -122,6 +122,55 @@ void main() {
       expect(onSavedCalled, isTrue);
     });
 
+    testWidgets('refuses a start moved past the end', (WidgetTester tester) async {
+      // Arrange
+      final existingSession = WorkoutSession(
+        id: '1',
+        routineId: 1,
+        impression: WorkoutImpression.neutral,
+        datetimeStart: DateTime(2026, 8, 13, 10, 0),
+        datetimeEnd: DateTime(2026, 8, 13, 11, 0),
+      );
+      when(mockRepository.editLocalDrift(any as dynamic)).thenAnswer((_) async {});
+      await pumpSessionForm(tester, session: existingSession);
+
+      // Act
+      tester
+          .widget<TimeInputWidget>(find.byKey(const ValueKey('time-start')))
+          .onChanged(const TimeOfDay(hour: 12, minute: 0));
+      await tester.tap(find.byKey(const ValueKey('save-button')));
+      await tester.pumpAndSettle();
+
+      // Assert
+      verifyNever(mockRepository.editLocalDrift(any as dynamic));
+      expect(find.text('Start time cannot be ahead of end time'), findsOneWidget);
+    });
+
+    testWidgets('saves a session that ran past midnight', (WidgetTester tester) async {
+      // Arrange
+      final existingSession = WorkoutSession(
+        id: '1',
+        routineId: 1,
+        impression: WorkoutImpression.neutral,
+        datetimeStart: DateTime(2026, 8, 13, 23, 0),
+      );
+      when(mockRepository.editLocalDrift(any as dynamic)).thenAnswer((_) async {});
+      await pumpSessionForm(tester, session: existingSession);
+
+      // Act
+      tester
+          .widget<TimeInputWidget>(find.byKey(const ValueKey('time-end')))
+          .onChanged(const TimeOfDay(hour: 1, minute: 0));
+      await tester.tap(find.byKey(const ValueKey('save-button')));
+      await tester.pumpAndSettle();
+
+      // Assert
+      final captured =
+          verify(mockRepository.editLocalDrift(captureAny as dynamic)).captured.single
+              as WorkoutSession;
+      expect(captured.datetimeEnd, DateTime(2026, 8, 14, 1, 0));
+    });
+
     // testWidgets('shows server side error messages', (WidgetTester tester) async {
     //   // Arrange
     //   await pumpSessionForm(tester);
diff --git a/test/features/routines/widgets/gym_mode/session_page_test.dart b/test/features/routines/widgets/gym_mode/session_page_test.dart
index 199d9a7d5..0076162d5 100644
--- a/test/features/routines/widgets/gym_mode/session_page_test.dart
+++ b/test/features/routines/widgets/gym_mode/session_page_test.dart
@@ -105,13 +105,12 @@ void main() {
     });
   });
 
-  testWidgets('Existing session with null times falls back to defaults', (
+  testWidgets('An open session keeps its start and gets the current time as end', (
     WidgetTester tester,
   ) async {
-    // A session created lazily while logging has no times; the page should
-    // prefill the gym session's start and the current time instead of leaving
-    // both fields blank.
-    testRoutine.sessions[0] = testRoutine.sessions[0].copyWith(timeStart: null, timeEnd: null);
+    // A session created lazily while logging has a start but no end yet; the
+    // page prefills the current time so the form opens on a full interval.
+    testRoutine.sessions[0] = testRoutine.sessions[0].copyWith(datetimeEnd: null);
 
     notifier.state = notifier.state.copyWith(
       routine: testRoutine,
@@ -123,7 +122,7 @@ void main() {
       await tester.pumpWidget(renderSessionPage());
       await tester.pumpAndSettle();
 
-      expect(find.text('1:35 PM'), findsOneWidget);
+      expect(find.text('10:00 AM'), findsOneWidget);
       expect(find.text('3:23 PM'), findsOneWidget);
     });
   });
@@ -159,8 +158,8 @@ void main() {
       expect(captured.id, '1');
       expect(captured.impression, WorkoutImpression.good);
       expect(captured.notes, equals('This is a note'));
-      expect(captured.timeStart, equals(const TimeOfDay(hour: 10, minute: 0)));
-      expect(captured.timeEnd, equals(const TimeOfDay(hour: 12, minute: 34)));
+      expect(captured.datetimeStart, equals(DateTime(2021, 5, 1, 10, 0)));
+      expect(captured.datetimeEnd, equals(DateTime(2021, 5, 1, 12, 34)));
     });
   });
 }
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 8a8aa2ec9..2b0e3222a 100644
--- a/test/powersync/connector_test.dart
+++ b/test/powersync/connector_test.dart
@@ -80,6 +80,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'});
@@ -104,17 +114,19 @@ void main() {
         expect(out['created'], '2024-10-30T10:15:00.000Z');
       });
 
-      test('strips the time component on `manager_workoutsession.date`', () {
+      test('leaves the session timestamps untouched', () {
+        // The session no longer has a date-only column, both timestamps go to
+        // the server as the full ISO8601 values they are.
         final out = connector.genericTransform(
           'manager_workoutsession',
           {
-            'date': '2024-11-01T00:00:00.000Z',
+            'datetime_start': '2024-11-01T18:30:00.000Z',
             'notes': 'felt great',
             'impression': '1',
           },
           '12',
         );
-        expect(out['date'], '2024-11-01');
+        expect(out['datetime_start'], '2024-11-01T18:30:00.000Z');
         expect(out['notes'], 'felt great');
       });
 
diff --git a/test/screenshots/screenshots_01_dashboard.dart b/test/screenshots/screenshots_01_dashboard.dart
index a14937ac0..84e07c9c8 100644
--- a/test/screenshots/screenshots_01_dashboard.dart
+++ b/test/screenshots/screenshots_01_dashboard.dart
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import 'package:drift/native.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:mockito/annotations.dart';
@@ -24,39 +25,47 @@ import 'package:wger/core/home_tabs_screen.dart';
 import 'package:wger/core/network/auth_notifier.dart';
 import 'package:wger/core/network/auth_state.dart';
 import 'package:wger/core/network/network_provider.dart';
+import 'package:wger/database/powersync/database.dart';
+import 'package:wger/database/powersync/powersync.dart';
 import 'package:wger/features/account/providers/user_profile_repository.dart';
+import 'package:wger/features/exercises/providers/exercise_repository.dart';
 import 'package:wger/features/gallery/providers/gallery_repository.dart';
-import 'package:wger/features/measurements/models/measurement_category.dart';
+import 'package:wger/features/health/providers/health_repository.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/routines/providers/workout_session_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 '../helpers/sync_status.dart';
 import 'screenshots_01_dashboard.mocks.dart';
 
 @GenerateMocks([
   GalleryRepository,
   NutritionRepository,
   IngredientRepository,
-  BodyWeightRepository,
   MeasurementRepository,
   UserProfileRepository,
   RoutinesRepository,
   TrophyRepository,
+  // The dashboard builds these too, they just have nothing to answer here
+  ExerciseRepository,
+  HealthRepository,
+  WorkoutSessionRepository,
 ])
 Widget createDashboardScreen({Locale? locale}) {
   locale ??= const Locale('en');
@@ -68,15 +77,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 +93,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(
@@ -107,12 +114,15 @@ Widget createDashboardScreen({Locale? locale}) {
 
   const loggedInAuth = AuthState(
     status: AuthStatus.loggedIn,
-    credential: LegacyCredential('test-token'),
+    credential: JwtCredential(accessToken: 'test-token'),
     serverUrl: 'http://localhost',
   );
   final container = ProviderContainer.test(
     overrides: [
-      bodyWeightRepositoryProvider.overrideWithValue(mockBodyWeightRepository),
+      // Backstop for repositories that are not mocked: they all read the
+      // database, and none of them should reach the real PowerSync file
+      driftPowerSyncDatabase.overrideWithValue(DriftPowersyncDatabase(NativeDatabase.memory())),
+      syncStatus.overrideWithValue(buildUninitializedSyncStatus()),
       measurementRepositoryProvider.overrideWithValue(mockMeasurementRepo),
       authProvider.overrideWith(() => FakeAuthNotifier(loggedInAuth)),
       userProfileRepositoryProvider.overrideWithValue(mockUserProfileRepo),
@@ -123,6 +133,9 @@ Widget createDashboardScreen({Locale? locale}) {
       networkStatusProvider.overrideWithValue(true),
       routinesRepositoryProvider.overrideWithValue(mockRoutinesRepo),
       trophyRepositoryProvider.overrideWithValue(mockTrophyRepo),
+      exerciseRepositoryProvider.overrideWithValue(MockExerciseRepository()),
+      healthRepositoryProvider.overrideWithValue(MockHealthRepository()),
+      workoutSessionRepositoryProvider.overrideWithValue(MockWorkoutSessionRepository()),
     ],
   );
 
diff --git a/test/screenshots/screenshots_01_dashboard.mocks.dart b/test/screenshots/screenshots_01_dashboard.mocks.dart
index 82a19b2ff..8fa44e20a 100644
--- a/test/screenshots/screenshots_01_dashboard.mocks.dart
+++ b/test/screenshots/screenshots_01_dashboard.mocks.dart
@@ -3,42 +3,53 @@
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i10;
+import 'dart:async' as _i11;
 
-import 'package:image_picker/image_picker.dart' as _i11;
+import 'package:health_bridge/health.dart' as _i44;
+import 'package:image_picker/image_picker.dart' as _i12;
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:mockito/src/dummies.dart' as _i32;
+import 'package:wger/core/language.dart' as _i42;
 import 'package:wger/core/network/base_provider.dart' as _i8;
-import 'package:wger/core/search_options.dart' as _i20;
+import 'package:wger/core/search_options.dart' as _i21;
 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/exercises/models/category.dart' as _i38;
+import 'package:wger/features/exercises/models/equipment.dart' as _i40;
+import 'package:wger/features/exercises/models/exercise_filters.dart' as _i37;
+import 'package:wger/features/exercises/models/muscle.dart' as _i41;
+import 'package:wger/features/exercises/providers/exercise_repository.dart' as _i36;
+import 'package:wger/features/exercises/providers/exercises_notifier.dart' as _i39;
 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/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;
-import 'package:wger/features/nutrition/models/meal.dart' as _i14;
-import 'package:wger/features/nutrition/models/meal_item.dart' as _i15;
-import 'package:wger/features/nutrition/models/nutritional_plan.dart' as _i13;
-import 'package:wger/features/nutrition/providers/ingredient_repository.dart' as _i17;
-import 'package:wger/features/nutrition/providers/nutrition_repository.dart' as _i12;
+import 'package:wger/features/gallery/providers/gallery_repository.dart' as _i10;
+import 'package:wger/features/health/models/health_reading.dart' as _i45;
+import 'package:wger/features/health/providers/health_repository.dart' as _i43;
+import 'package:wger/features/measurements/models/measurement_bucket.dart' as _i25;
+import 'package:wger/features/measurements/models/measurement_category.dart' as _i23;
+import 'package:wger/features/measurements/models/measurement_entry.dart' as _i24;
+import 'package:wger/features/measurements/providers/measurement_repository.dart' as _i22;
+import 'package:wger/features/nutrition/models/ingredient.dart' as _i19;
+import 'package:wger/features/nutrition/models/ingredient_filters.dart' as _i20;
+import 'package:wger/features/nutrition/models/log.dart' as _i17;
+import 'package:wger/features/nutrition/models/meal.dart' as _i15;
+import 'package:wger/features/nutrition/models/meal_item.dart' as _i16;
+import 'package:wger/features/nutrition/models/nutritional_plan.dart' as _i14;
+import 'package:wger/features/nutrition/providers/ingredient_repository.dart' as _i18;
+import 'package:wger/features/nutrition/providers/nutrition_repository.dart' as _i13;
 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/routine.dart' as _i3;
+import 'package:wger/features/routines/models/session.dart' as _i9;
 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/routines/providers/workout_session_repository.dart' as _i46;
 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;
 
 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -84,240 +95,245 @@ class _FakeWgerBaseProvider_6 extends _i1.SmartFake implements _i8.WgerBaseProvi
     : super(parent, parentInvocation);
 }
 
+class _FakeWorkoutSession_7 extends _i1.SmartFake implements _i9.WorkoutSession {
+  _FakeWorkoutSession_7(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
 /// A class which mocks [GalleryRepository].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockGalleryRepository extends _i1.Mock implements _i9.GalleryRepository {
+class MockGalleryRepository extends _i1.Mock implements _i10.GalleryRepository {
   MockGalleryRepository() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  _i10.Stream<List<_i2.GalleryImage>> watchAllDrift() =>
+  _i11.Stream<List<_i2.GalleryImage>> watchAllDrift() =>
       (super.noSuchMethod(
             Invocation.method(#watchAllDrift, []),
-            returnValue: _i10.Stream<List<_i2.GalleryImage>>.empty(),
+            returnValue: _i11.Stream<List<_i2.GalleryImage>>.empty(),
           )
-          as _i10.Stream<List<_i2.GalleryImage>>);
+          as _i11.Stream<List<_i2.GalleryImage>>);
 
   @override
-  _i10.Future<_i2.GalleryImage> addImageServer(
+  _i11.Future<_i2.GalleryImage> addImageServer(
     _i2.GalleryImage? image,
-    _i11.XFile? imageFile,
+    _i12.XFile? imageFile,
   ) =>
       (super.noSuchMethod(
             Invocation.method(#addImageServer, [image, imageFile]),
-            returnValue: _i10.Future<_i2.GalleryImage>.value(
+            returnValue: _i11.Future<_i2.GalleryImage>.value(
               _FakeGalleryImage_0(
                 this,
                 Invocation.method(#addImageServer, [image, imageFile]),
               ),
             ),
           )
-          as _i10.Future<_i2.GalleryImage>);
+          as _i11.Future<_i2.GalleryImage>);
 
   @override
-  _i10.Future<String?> editImageServer(
+  _i11.Future<String?> editImageServer(
     _i2.GalleryImage? image,
-    _i11.XFile? imageFile,
+    _i12.XFile? imageFile,
   ) =>
       (super.noSuchMethod(
             Invocation.method(#editImageServer, [image, imageFile]),
-            returnValue: _i10.Future<String?>.value(),
+            returnValue: _i11.Future<String?>.value(),
           )
-          as _i10.Future<String?>);
+          as _i11.Future<String?>);
 
   @override
-  _i10.Future<void> editLocalDrift(_i2.GalleryImage? image) =>
+  _i11.Future<void> editLocalDrift(_i2.GalleryImage? image) =>
       (super.noSuchMethod(
             Invocation.method(#editLocalDrift, [image]),
-            returnValue: _i10.Future<void>.value(),
-            returnValueForMissingStub: _i10.Future<void>.value(),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
           )
-          as _i10.Future<void>);
+          as _i11.Future<void>);
 
   @override
-  _i10.Future<void> deleteLocalDrift(int? id) =>
+  _i11.Future<void> deleteLocalDrift(int? id) =>
       (super.noSuchMethod(
             Invocation.method(#deleteLocalDrift, [id]),
-            returnValue: _i10.Future<void>.value(),
-            returnValueForMissingStub: _i10.Future<void>.value(),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
           )
-          as _i10.Future<void>);
+          as _i11.Future<void>);
 }
 
 /// A class which mocks [NutritionRepository].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockNutritionRepository extends _i1.Mock implements _i12.NutritionRepository {
+class MockNutritionRepository extends _i1.Mock implements _i13.NutritionRepository {
   MockNutritionRepository() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  _i10.Stream<List<_i13.NutritionalPlan>> watchAllDrift() =>
+  _i11.Stream<List<_i14.NutritionalPlan>> watchAllDrift() =>
       (super.noSuchMethod(
             Invocation.method(#watchAllDrift, []),
-            returnValue: _i10.Stream<List<_i13.NutritionalPlan>>.empty(),
+            returnValue: _i11.Stream<List<_i14.NutritionalPlan>>.empty(),
           )
-          as _i10.Stream<List<_i13.NutritionalPlan>>);
+          as _i11.Stream<List<_i14.NutritionalPlan>>);
 
   @override
-  _i10.Future<void> addPlanLocalDrift(_i13.NutritionalPlan? plan) =>
+  _i11.Future<void> addPlanLocalDrift(_i14.NutritionalPlan? plan) =>
       (super.noSuchMethod(
             Invocation.method(#addPlanLocalDrift, [plan]),
-            returnValue: _i10.Future<void>.value(),
-            returnValueForMissingStub: _i10.Future<void>.value(),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
           )
-          as _i10.Future<void>);
+          as _i11.Future<void>);
 
   @override
-  _i10.Future<void> editLocalDrift(_i13.NutritionalPlan? plan) =>
+  _i11.Future<void> editLocalDrift(_i14.NutritionalPlan? plan) =>
       (super.noSuchMethod(
             Invocation.method(#editLocalDrift, [plan]),
-            returnValue: _i10.Future<void>.value(),
-            returnValueForMissingStub: _i10.Future<void>.value(),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
           )
-          as _i10.Future<void>);
+          as _i11.Future<void>);
 
   @override
-  _i10.Future<void> deleteLocalDrift(String? id) =>
+  _i11.Future<void> deleteLocalDrift(String? id) =>
       (super.noSuchMethod(
             Invocation.method(#deleteLocalDrift, [id]),
-            returnValue: _i10.Future<void>.value(),
-            returnValueForMissingStub: _i10.Future<void>.value(),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
           )
-          as _i10.Future<void>);
+          as _i11.Future<void>);
 
   @override
-  _i10.Stream<List<_i14.Meal>> watchAllMealsHydrated() =>
+  _i11.Stream<List<_i15.Meal>> watchAllMealsHydrated() =>
       (super.noSuchMethod(
             Invocation.method(#watchAllMealsHydrated, []),
-            returnValue: _i10.Stream<List<_i14.Meal>>.empty(),
+            returnValue: _i11.Stream<List<_i15.Meal>>.empty(),
           )
-          as _i10.Stream<List<_i14.Meal>>);
+          as _i11.Stream<List<_i15.Meal>>);
 
   @override
-  _i10.Future<void> addMealLocalDrift(_i14.Meal? meal) =>
+  _i11.Future<void> addMealLocalDrift(_i15.Meal? meal) =>
       (super.noSuchMethod(
             Invocation.method(#addMealLocalDrift, [meal]),
-            returnValue: _i10.Future<void>.value(),
-            returnValueForMissingStub: _i10.Future<void>.value(),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
           )
-          as _i10.Future<void>);
+          as _i11.Future<void>);
 
   @override
-  _i10.Future<void> editMealLocalDrift(_i14.Meal? meal) =>
+  _i11.Future<void> editMealLocalDrift(_i15.Meal? meal) =>
       (super.noSuchMethod(
             Invocation.method(#editMealLocalDrift, [meal]),
-            returnValue: _i10.Future<void>.value(),
-            returnValueForMissingStub: _i10.Future<void>.value(),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
           )
-          as _i10.Future<void>);
+          as _i11.Future<void>);
 
   @override
-  _i10.Future<void> deleteMealLocalDrift(String? id) =>
+  _i11.Future<void> deleteMealLocalDrift(String? id) =>
       (super.noSuchMethod(
             Invocation.method(#deleteMealLocalDrift, [id]),
-            returnValue: _i10.Future<void>.value(),
-            returnValueForMissingStub: _i10.Future<void>.value(),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
           )
-          as _i10.Future<void>);
+          as _i11.Future<void>);
 
   @override
-  _i10.Future<void> addMealItemLocalDrift(_i15.MealItem? item) =>
+  _i11.Future<void> addMealItemLocalDrift(_i16.MealItem? item) =>
       (super.noSuchMethod(
             Invocation.method(#addMealItemLocalDrift, [item]),
-            returnValue: _i10.Future<void>.value(),
-            returnValueForMissingStub: _i10.Future<void>.value(),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
           )
-          as _i10.Future<void>);
+          as _i11.Future<void>);
 
   @override
-  _i10.Future<void> editMealItemLocalDrift(_i15.MealItem? item) =>
+  _i11.Future<void> editMealItemLocalDrift(_i16.MealItem? item) =>
       (super.noSuchMethod(
             Invocation.method(#editMealItemLocalDrift, [item]),
-            returnValue: _i10.Future<void>.value(),
-            returnValueForMissingStub: _i10.Future<void>.value(),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
           )
-          as _i10.Future<void>);
+          as _i11.Future<void>);
 
   @override
-  _i10.Future<void> deleteMealItemLocalDrift(String? id) =>
+  _i11.Future<void> deleteMealItemLocalDrift(String? id) =>
       (super.noSuchMethod(
             Invocation.method(#deleteMealItemLocalDrift, [id]),
-            returnValue: _i10.Future<void>.value(),
-            returnValueForMissingStub: _i10.Future<void>.value(),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
           )
-          as _i10.Future<void>);
+          as _i11.Future<void>);
 
   @override
-  _i10.Stream<List<_i16.LogItem>> watchAllLogsHydrated() =>
+  _i11.Stream<List<_i17.LogItem>> watchAllLogsHydrated() =>
       (super.noSuchMethod(
             Invocation.method(#watchAllLogsHydrated, []),
-            returnValue: _i10.Stream<List<_i16.LogItem>>.empty(),
+            returnValue: _i11.Stream<List<_i17.LogItem>>.empty(),
           )
-          as _i10.Stream<List<_i16.LogItem>>);
+          as _i11.Stream<List<_i17.LogItem>>);
 
   @override
-  _i10.Future<void> addLogLocalDrift(_i16.LogItem? log) =>
+  _i11.Future<void> addLogLocalDrift(_i17.LogItem? log) =>
       (super.noSuchMethod(
             Invocation.method(#addLogLocalDrift, [log]),
-            returnValue: _i10.Future<void>.value(),
-            returnValueForMissingStub: _i10.Future<void>.value(),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
           )
-          as _i10.Future<void>);
+          as _i11.Future<void>);
 
   @override
-  _i10.Future<void> deleteLogLocalDrift(String? id) =>
+  _i11.Future<void> deleteLogLocalDrift(String? id) =>
       (super.noSuchMethod(
             Invocation.method(#deleteLogLocalDrift, [id]),
-            returnValue: _i10.Future<void>.value(),
-            returnValueForMissingStub: _i10.Future<void>.value(),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
           )
-          as _i10.Future<void>);
+          as _i11.Future<void>);
 }
 
 /// A class which mocks [IngredientRepository].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockIngredientRepository extends _i1.Mock implements _i17.IngredientRepository {
+class MockIngredientRepository extends _i1.Mock implements _i18.IngredientRepository {
   MockIngredientRepository() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  _i10.Stream<_i18.Ingredient?> watchById(int? id) =>
+  _i11.Stream<_i19.Ingredient?> watchById(int? id) =>
       (super.noSuchMethod(
             Invocation.method(#watchById, [id]),
-            returnValue: _i10.Stream<_i18.Ingredient?>.empty(),
+            returnValue: _i11.Stream<_i19.Ingredient?>.empty(),
           )
-          as _i10.Stream<_i18.Ingredient?>);
+          as _i11.Stream<_i19.Ingredient?>);
 
   @override
-  _i10.Stream<List<_i18.Ingredient>> watchAllDrift({
-    _i19.IngredientFilters? filters = const _i19.IngredientFilters(),
+  _i11.Stream<List<_i19.Ingredient>> watchAllDrift({
+    _i20.IngredientFilters? filters = const _i20.IngredientFilters(),
   }) =>
       (super.noSuchMethod(
             Invocation.method(#watchAllDrift, [], {#filters: filters}),
-            returnValue: _i10.Stream<List<_i18.Ingredient>>.empty(),
+            returnValue: _i11.Stream<List<_i19.Ingredient>>.empty(),
           )
-          as _i10.Stream<List<_i18.Ingredient>>);
+          as _i11.Stream<List<_i19.Ingredient>>);
 
   @override
-  _i10.Future<_i18.Ingredient?> getById(int? id) =>
+  _i11.Future<_i19.Ingredient?> getById(int? id) =>
       (super.noSuchMethod(
             Invocation.method(#getById, [id]),
-            returnValue: _i10.Future<_i18.Ingredient?>.value(),
+            returnValue: _i11.Future<_i19.Ingredient?>.value(),
           )
-          as _i10.Future<_i18.Ingredient?>);
+          as _i11.Future<_i19.Ingredient?>);
 
   @override
-  _i10.Future<List<_i18.Ingredient>> searchIngredientLocal(
+  _i11.Future<List<_i19.Ingredient>> searchIngredientLocal(
     String? term, {
     bool? isVegan = false,
     bool? isVegetarian = false,
-    _i18.NutriScore? nutriscoreMax,
+    _i19.NutriScore? nutriscoreMax,
     int? limit = 100,
   }) =>
       (super.noSuchMethod(
@@ -331,20 +347,20 @@ class MockIngredientRepository extends _i1.Mock implements _i17.IngredientReposi
                 #limit: limit,
               },
             ),
-            returnValue: _i10.Future<List<_i18.Ingredient>>.value(
-              <_i18.Ingredient>[],
+            returnValue: _i11.Future<List<_i19.Ingredient>>.value(
+              <_i19.Ingredient>[],
             ),
           )
-          as _i10.Future<List<_i18.Ingredient>>);
+          as _i11.Future<List<_i19.Ingredient>>);
 
   @override
-  _i10.Future<List<_i18.Ingredient>> searchIngredientServer(
+  _i11.Future<List<_i19.Ingredient>> searchIngredientServer(
     String? name, {
     String? languageCode = 'en',
-    _i20.SearchLanguage? searchLanguage = _i20.SearchLanguage.current,
+    _i21.SearchLanguage? searchLanguage = _i21.SearchLanguage.current,
     bool? isVegan = false,
     bool? isVegetarian = false,
-    _i18.NutriScore? nutriscoreMax,
+    _i19.NutriScore? nutriscoreMax,
   }) =>
       (super.noSuchMethod(
             Invocation.method(
@@ -358,21 +374,21 @@ class MockIngredientRepository extends _i1.Mock implements _i17.IngredientReposi
                 #nutriscoreMax: nutriscoreMax,
               },
             ),
-            returnValue: _i10.Future<List<_i18.Ingredient>>.value(
-              <_i18.Ingredient>[],
+            returnValue: _i11.Future<List<_i19.Ingredient>>.value(
+              <_i19.Ingredient>[],
             ),
           )
-          as _i10.Future<List<_i18.Ingredient>>);
+          as _i11.Future<List<_i19.Ingredient>>);
 
   @override
-  _i10.Future<List<_i18.Ingredient>> search(
+  _i11.Future<List<_i19.Ingredient>> search(
     String? name, {
     required bool? isOnline,
     String? languageCode = 'en',
-    _i20.SearchLanguage? searchLanguage = _i20.SearchLanguage.current,
+    _i21.SearchLanguage? searchLanguage = _i21.SearchLanguage.current,
     bool? isVegan = false,
     bool? isVegetarian = false,
-    _i18.NutriScore? nutriscoreMax,
+    _i19.NutriScore? nutriscoreMax,
   }) =>
       (super.noSuchMethod(
             Invocation.method(
@@ -387,146 +403,273 @@ class MockIngredientRepository extends _i1.Mock implements _i17.IngredientReposi
                 #nutriscoreMax: nutriscoreMax,
               },
             ),
-            returnValue: _i10.Future<List<_i18.Ingredient>>.value(
-              <_i18.Ingredient>[],
+            returnValue: _i11.Future<List<_i19.Ingredient>>.value(
+              <_i19.Ingredient>[],
             ),
           )
-          as _i10.Future<List<_i18.Ingredient>>);
+          as _i11.Future<List<_i19.Ingredient>>);
 
   @override
-  _i10.Future<_i18.Ingredient?> searchIngredientByBarcode(String? barcode) =>
+  _i11.Future<_i19.Ingredient?> searchIngredientByBarcode(String? barcode) =>
       (super.noSuchMethod(
             Invocation.method(#searchIngredientByBarcode, [barcode]),
-            returnValue: _i10.Future<_i18.Ingredient?>.value(),
+            returnValue: _i11.Future<_i19.Ingredient?>.value(),
           )
-          as _i10.Future<_i18.Ingredient?>);
+          as _i11.Future<_i19.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 _i22.MeasurementRepository {
+  MockMeasurementRepository() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  _i10.Stream<List<_i22.WeightEntry>> watchAllDrift() =>
+  _i11.Stream<List<_i23.MeasurementCategory>> watchAllWithoutEntries() =>
       (super.noSuchMethod(
-            Invocation.method(#watchAllDrift, []),
-            returnValue: _i10.Stream<List<_i22.WeightEntry>>.empty(),
+            Invocation.method(#watchAllWithoutEntries, []),
+            returnValue: _i11.Stream<List<_i23.MeasurementCategory>>.empty(),
           )
-          as _i10.Stream<List<_i22.WeightEntry>>);
+          as _i11.Stream<List<_i23.MeasurementCategory>>);
 
   @override
-  _i10.Future<void> deleteLocalDrift(String? id) =>
+  _i11.Stream<_i23.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: _i11.Stream<_i23.MeasurementCategory?>.empty(),
           )
-          as _i10.Future<void>);
+          as _i11.Stream<_i23.MeasurementCategory?>);
 
   @override
-  _i10.Future<void> updateLocalDrift(_i22.WeightEntry? entry) =>
+  _i11.Stream<_i23.MeasurementCategory?> watchOfficialBodyWeightCategory() =>
       (super.noSuchMethod(
-            Invocation.method(#updateLocalDrift, [entry]),
-            returnValue: _i10.Future<void>.value(),
-            returnValueForMissingStub: _i10.Future<void>.value(),
+            Invocation.method(#watchOfficialBodyWeightCategory, []),
+            returnValue: _i11.Stream<_i23.MeasurementCategory?>.empty(),
           )
-          as _i10.Future<void>);
+          as _i11.Stream<_i23.MeasurementCategory?>);
 
   @override
-  _i10.Future<void> addLocalDrift(_i22.WeightEntry? entry) =>
+  _i11.Stream<List<_i24.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: _i11.Stream<List<_i24.MeasurementEntry>>.empty(),
           )
-          as _i10.Future<void>);
-}
+          as _i11.Stream<List<_i24.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
+  _i11.Stream<List<_i24.MeasurementEntry>> watchGroupEntries(
+    String? parentId, {
+    required int? limit,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchGroupEntries, [parentId], {#limit: limit}),
+            returnValue: _i11.Stream<List<_i24.MeasurementEntry>>.empty(),
+          )
+          as _i11.Stream<List<_i24.MeasurementEntry>>);
 
   @override
-  _i10.Stream<List<_i24.MeasurementCategory>> watchAll() =>
+  _i11.Stream<Map<String, _i24.MeasurementEntry>> watchLatestEntries() =>
       (super.noSuchMethod(
-            Invocation.method(#watchAll, []),
-            returnValue: _i10.Stream<List<_i24.MeasurementCategory>>.empty(),
+            Invocation.method(#watchLatestEntries, []),
+            returnValue: _i11.Stream<Map<String, _i24.MeasurementEntry>>.empty(),
           )
-          as _i10.Stream<List<_i24.MeasurementCategory>>);
+          as _i11.Stream<Map<String, _i24.MeasurementEntry>>);
 
   @override
-  _i10.Stream<_i24.MeasurementCategory?> watchLocalDriftCategoryById(
-    String? id,
+  _i11.Stream<List<_i25.MeasurementBucket>> watchEntryBuckets(
+    String? categoryId, {
+    DateTime? since,
+    DateTime? until,
+    _i25.MeasurementBucketLevel? level = _i25.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchEntryBuckets,
+              [categoryId],
+              {
+                #since: since,
+                #until: until,
+                #level: level,
+                #maxPoints: maxPoints,
+              },
+            ),
+            returnValue: _i11.Stream<List<_i25.MeasurementBucket>>.empty(),
+          )
+          as _i11.Stream<List<_i25.MeasurementBucket>>);
+
+  @override
+  _i11.Stream<Map<String, List<_i25.MeasurementBucket>>> watchGroupBuckets(
+    String? parentId, {
+    DateTime? since,
+    _i25.MeasurementBucketLevel? level = _i25.MeasurementBucketLevel.auto,
+    int? maxPoints = 200,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchGroupBuckets,
+              [parentId],
+              {#since: since, #level: level, #maxPoints: maxPoints},
+            ),
+            returnValue: _i11.Stream<Map<String, List<_i25.MeasurementBucket>>>.empty(),
+          )
+          as _i11.Stream<Map<String, List<_i25.MeasurementBucket>>>);
+
+  @override
+  _i11.Stream<Map<String, List<_i25.MeasurementBucket>>> watchDailyBuckets() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchDailyBuckets, []),
+            returnValue: _i11.Stream<Map<String, List<_i25.MeasurementBucket>>>.empty(),
+          )
+          as _i11.Stream<Map<String, List<_i25.MeasurementBucket>>>);
+
+  @override
+  _i11.Stream<List<_i25.MeasurementValueCount>> watchValueCounts(
+    String? categoryId, {
+    DateTime? since,
+    bool? summedPerDay = false,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #watchValueCounts,
+              [categoryId],
+              {#since: since, #summedPerDay: summedPerDay},
+            ),
+            returnValue: _i11.Stream<List<_i25.MeasurementValueCount>>.empty(),
+          )
+          as _i11.Stream<List<_i25.MeasurementValueCount>>);
+
+  @override
+  _i11.Future<List<_i23.MeasurementCategory>> getCategoriesOnce() =>
+      (super.noSuchMethod(
+            Invocation.method(#getCategoriesOnce, []),
+            returnValue: _i11.Future<List<_i23.MeasurementCategory>>.value(
+              <_i23.MeasurementCategory>[],
+            ),
+          )
+          as _i11.Future<List<_i23.MeasurementCategory>>);
+
+  @override
+  _i11.Future<Set<String>> getExternalIds(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#getExternalIds, [categoryId]),
+            returnValue: _i11.Future<Set<String>>.value(<String>{}),
+          )
+          as _i11.Future<Set<String>>);
+
+  @override
+  _i11.Future<Map<String, _i24.MeasurementEntry>> getEntriesByExternalId(
+    String? categoryId,
   ) =>
       (super.noSuchMethod(
-            Invocation.method(#watchLocalDriftCategoryById, [id]),
-            returnValue: _i10.Stream<_i24.MeasurementCategory?>.empty(),
+            Invocation.method(#getEntriesByExternalId, [categoryId]),
+            returnValue: _i11.Future<Map<String, _i24.MeasurementEntry>>.value(
+              <String, _i24.MeasurementEntry>{},
+            ),
+          )
+          as _i11.Future<Map<String, _i24.MeasurementEntry>>);
+
+  @override
+  _i11.Future<bool> hasEntries(String? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#hasEntries, [categoryId]),
+            returnValue: _i11.Future<bool>.value(false),
           )
-          as _i10.Stream<_i24.MeasurementCategory?>);
+          as _i11.Future<bool>);
 
   @override
-  _i10.Future<void> deleteLocalDrift(String? id) =>
+  _i11.Future<void> deleteLocalDrift(String? id) =>
       (super.noSuchMethod(
             Invocation.method(#deleteLocalDrift, [id]),
-            returnValue: _i10.Future<void>.value(),
-            returnValueForMissingStub: _i10.Future<void>.value(),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
           )
-          as _i10.Future<void>);
+          as _i11.Future<void>);
 
   @override
-  _i10.Future<void> updateLocalDrift(_i25.MeasurementEntry? entry) =>
+  _i11.Future<void> updateLocalDrift(_i24.MeasurementEntry? entry) =>
       (super.noSuchMethod(
             Invocation.method(#updateLocalDrift, [entry]),
-            returnValue: _i10.Future<void>.value(),
-            returnValueForMissingStub: _i10.Future<void>.value(),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
           )
-          as _i10.Future<void>);
+          as _i11.Future<void>);
 
   @override
-  _i10.Future<void> addLocalDrift(_i25.MeasurementEntry? entry) =>
+  _i11.Future<void> addLocalDrift(_i24.MeasurementEntry? entry) =>
       (super.noSuchMethod(
             Invocation.method(#addLocalDrift, [entry]),
-            returnValue: _i10.Future<void>.value(),
-            returnValueForMissingStub: _i10.Future<void>.value(),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
           )
-          as _i10.Future<void>);
+          as _i11.Future<void>);
 
   @override
-  _i10.Future<void> deleteLocalDriftCategory(String? id) =>
+  _i11.Future<void> addLocalDriftGroupEntries(
+    List<_i24.MeasurementEntry>? entries,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftGroupEntries, [entries]),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  _i11.Future<void> deleteLocalDriftCategory(String? id) =>
       (super.noSuchMethod(
             Invocation.method(#deleteLocalDriftCategory, [id]),
-            returnValue: _i10.Future<void>.value(),
-            returnValueForMissingStub: _i10.Future<void>.value(),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
           )
-          as _i10.Future<void>);
+          as _i11.Future<void>);
 
   @override
-  _i10.Future<void> updateLocalDriftCategory(
-    _i24.MeasurementCategory? category,
+  _i11.Future<void> updateLocalDriftCategory(
+    _i23.MeasurementCategory? category,
   ) =>
       (super.noSuchMethod(
             Invocation.method(#updateLocalDriftCategory, [category]),
-            returnValue: _i10.Future<void>.value(),
-            returnValueForMissingStub: _i10.Future<void>.value(),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
           )
-          as _i10.Future<void>);
+          as _i11.Future<void>);
 
   @override
-  _i10.Future<void> addLocalDriftCategory(_i24.MeasurementCategory? category) =>
+  _i11.Future<void> addLocalDriftCategory(_i23.MeasurementCategory? category) =>
       (super.noSuchMethod(
             Invocation.method(#addLocalDriftCategory, [category]),
-            returnValue: _i10.Future<void>.value(),
-            returnValueForMissingStub: _i10.Future<void>.value(),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
           )
-          as _i10.Future<void>);
+          as _i11.Future<void>);
+
+  @override
+  _i11.Future<void> addLocalDriftCategoryGroup(
+    List<_i23.MeasurementCategory>? categories,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDriftCategoryGroup, [categories]),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  _i11.Future<void> reorderCategories(List<String>? orderedIds) =>
+      (super.noSuchMethod(
+            Invocation.method(#reorderCategories, [orderedIds]),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
 }
 
 /// A class which mocks [UserProfileRepository].
@@ -538,21 +681,30 @@ class MockUserProfileRepository extends _i1.Mock implements _i26.UserProfileRepo
   }
 
   @override
-  _i10.Stream<_i27.UserProfile?> watchDrift() =>
+  _i11.Stream<_i27.UserProfile?> watchDrift() =>
       (super.noSuchMethod(
             Invocation.method(#watchDrift, []),
-            returnValue: _i10.Stream<_i27.UserProfile?>.empty(),
+            returnValue: _i11.Stream<_i27.UserProfile?>.empty(),
           )
-          as _i10.Stream<_i27.UserProfile?>);
+          as _i11.Stream<_i27.UserProfile?>);
 
   @override
-  _i10.Future<void> editLocalDrift(_i27.UserProfile? profile) =>
+  _i11.Future<void> updateTimeZoneDrift(int? id, String? timeZone) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateTimeZoneDrift, [id, timeZone]),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  _i11.Future<void> editLocalDrift(_i27.UserProfile? profile) =>
       (super.noSuchMethod(
             Invocation.method(#editLocalDrift, [profile]),
-            returnValue: _i10.Future<void>.value(),
-            returnValueForMissingStub: _i10.Future<void>.value(),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
           )
-          as _i10.Future<void>);
+          as _i11.Future<void>);
 }
 
 /// A class which mocks [RoutinesRepository].
@@ -564,213 +716,213 @@ class MockRoutinesRepository extends _i1.Mock implements _i28.RoutinesRepository
   }
 
   @override
-  _i10.Future<_i3.Routine> fetchAndSetRoutineFullServer(int? routineId) =>
+  _i11.Future<_i3.Routine> fetchAndSetRoutineFullServer(int? routineId) =>
       (super.noSuchMethod(
             Invocation.method(#fetchAndSetRoutineFullServer, [routineId]),
-            returnValue: _i10.Future<_i3.Routine>.value(
+            returnValue: _i11.Future<_i3.Routine>.value(
               _FakeRoutine_1(
                 this,
                 Invocation.method(#fetchAndSetRoutineFullServer, [routineId]),
               ),
             ),
           )
-          as _i10.Future<_i3.Routine>);
+          as _i11.Future<_i3.Routine>);
 
   @override
-  _i10.Future<_i3.Routine> addRoutineServer(_i3.Routine? routine) =>
+  _i11.Future<_i3.Routine> addRoutineServer(_i3.Routine? routine) =>
       (super.noSuchMethod(
             Invocation.method(#addRoutineServer, [routine]),
-            returnValue: _i10.Future<_i3.Routine>.value(
+            returnValue: _i11.Future<_i3.Routine>.value(
               _FakeRoutine_1(
                 this,
                 Invocation.method(#addRoutineServer, [routine]),
               ),
             ),
           )
-          as _i10.Future<_i3.Routine>);
+          as _i11.Future<_i3.Routine>);
 
   @override
-  _i10.Stream<List<_i3.Routine>> watchAllDrift() =>
+  _i11.Stream<List<_i3.Routine>> watchAllDrift() =>
       (super.noSuchMethod(
             Invocation.method(#watchAllDrift, []),
-            returnValue: _i10.Stream<List<_i3.Routine>>.empty(),
+            returnValue: _i11.Stream<List<_i3.Routine>>.empty(),
           )
-          as _i10.Stream<List<_i3.Routine>>);
+          as _i11.Stream<List<_i3.Routine>>);
 
   @override
-  _i10.Future<void> editLocalDrift(_i3.Routine? routine) =>
+  _i11.Future<void> editLocalDrift(_i3.Routine? routine) =>
       (super.noSuchMethod(
             Invocation.method(#editLocalDrift, [routine]),
-            returnValue: _i10.Future<void>.value(),
-            returnValueForMissingStub: _i10.Future<void>.value(),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
           )
-          as _i10.Future<void>);
+          as _i11.Future<void>);
 
   @override
-  _i10.Future<void> deleteLocalDrift(int? id) =>
+  _i11.Future<void> deleteLocalDrift(int? id) =>
       (super.noSuchMethod(
             Invocation.method(#deleteLocalDrift, [id]),
-            returnValue: _i10.Future<void>.value(),
-            returnValueForMissingStub: _i10.Future<void>.value(),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
           )
-          as _i10.Future<void>);
+          as _i11.Future<void>);
 
   @override
-  _i10.Stream<List<_i29.WeightUnit>> watchWeightUnitsDrift() =>
+  _i11.Stream<List<_i29.WeightUnit>> watchWeightUnitsDrift() =>
       (super.noSuchMethod(
             Invocation.method(#watchWeightUnitsDrift, []),
-            returnValue: _i10.Stream<List<_i29.WeightUnit>>.empty(),
+            returnValue: _i11.Stream<List<_i29.WeightUnit>>.empty(),
           )
-          as _i10.Stream<List<_i29.WeightUnit>>);
+          as _i11.Stream<List<_i29.WeightUnit>>);
 
   @override
-  _i10.Stream<List<_i30.RepetitionUnit>> watchRepetitionUnitsDrift() =>
+  _i11.Stream<List<_i30.RepetitionUnit>> watchRepetitionUnitsDrift() =>
       (super.noSuchMethod(
             Invocation.method(#watchRepetitionUnitsDrift, []),
-            returnValue: _i10.Stream<List<_i30.RepetitionUnit>>.empty(),
+            returnValue: _i11.Stream<List<_i30.RepetitionUnit>>.empty(),
           )
-          as _i10.Stream<List<_i30.RepetitionUnit>>);
+          as _i11.Stream<List<_i30.RepetitionUnit>>);
 
   @override
-  _i10.Future<_i4.Day> addDayServer(_i4.Day? day) =>
+  _i11.Future<_i4.Day> addDayServer(_i4.Day? day) =>
       (super.noSuchMethod(
             Invocation.method(#addDayServer, [day]),
-            returnValue: _i10.Future<_i4.Day>.value(
+            returnValue: _i11.Future<_i4.Day>.value(
               _FakeDay_2(this, Invocation.method(#addDayServer, [day])),
             ),
           )
-          as _i10.Future<_i4.Day>);
+          as _i11.Future<_i4.Day>);
 
   @override
-  _i10.Future<void> editDayServer(_i4.Day? day) =>
+  _i11.Future<void> editDayServer(_i4.Day? day) =>
       (super.noSuchMethod(
             Invocation.method(#editDayServer, [day]),
-            returnValue: _i10.Future<void>.value(),
-            returnValueForMissingStub: _i10.Future<void>.value(),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
           )
-          as _i10.Future<void>);
+          as _i11.Future<void>);
 
   @override
-  _i10.Future<void> deleteDayServer(int? dayId) =>
+  _i11.Future<void> deleteDayServer(int? dayId) =>
       (super.noSuchMethod(
             Invocation.method(#deleteDayServer, [dayId]),
-            returnValue: _i10.Future<void>.value(),
-            returnValueForMissingStub: _i10.Future<void>.value(),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
           )
-          as _i10.Future<void>);
+          as _i11.Future<void>);
 
   @override
-  _i10.Future<_i5.Slot> addSlotServer(_i5.Slot? slot) =>
+  _i11.Future<_i5.Slot> addSlotServer(_i5.Slot? slot) =>
       (super.noSuchMethod(
             Invocation.method(#addSlotServer, [slot]),
-            returnValue: _i10.Future<_i5.Slot>.value(
+            returnValue: _i11.Future<_i5.Slot>.value(
               _FakeSlot_3(this, Invocation.method(#addSlotServer, [slot])),
             ),
           )
-          as _i10.Future<_i5.Slot>);
+          as _i11.Future<_i5.Slot>);
 
   @override
-  _i10.Future<void> deleteSlotServer(int? slotId) =>
+  _i11.Future<void> deleteSlotServer(int? slotId) =>
       (super.noSuchMethod(
             Invocation.method(#deleteSlotServer, [slotId]),
-            returnValue: _i10.Future<void>.value(),
-            returnValueForMissingStub: _i10.Future<void>.value(),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
           )
-          as _i10.Future<void>);
+          as _i11.Future<void>);
 
   @override
-  _i10.Future<void> editSlotServer(_i5.Slot? slot) =>
+  _i11.Future<void> editSlotServer(_i5.Slot? slot) =>
       (super.noSuchMethod(
             Invocation.method(#editSlotServer, [slot]),
-            returnValue: _i10.Future<void>.value(),
-            returnValueForMissingStub: _i10.Future<void>.value(),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
           )
-          as _i10.Future<void>);
+          as _i11.Future<void>);
 
   @override
-  _i10.Future<_i6.SlotEntry> addSlotEntryServer(_i6.SlotEntry? entry) =>
+  _i11.Future<_i6.SlotEntry> addSlotEntryServer(_i6.SlotEntry? entry) =>
       (super.noSuchMethod(
             Invocation.method(#addSlotEntryServer, [entry]),
-            returnValue: _i10.Future<_i6.SlotEntry>.value(
+            returnValue: _i11.Future<_i6.SlotEntry>.value(
               _FakeSlotEntry_4(
                 this,
                 Invocation.method(#addSlotEntryServer, [entry]),
               ),
             ),
           )
-          as _i10.Future<_i6.SlotEntry>);
+          as _i11.Future<_i6.SlotEntry>);
 
   @override
-  _i10.Future<void> deleteSlotEntryServer(int? id) =>
+  _i11.Future<void> deleteSlotEntryServer(int? id) =>
       (super.noSuchMethod(
             Invocation.method(#deleteSlotEntryServer, [id]),
-            returnValue: _i10.Future<void>.value(),
-            returnValueForMissingStub: _i10.Future<void>.value(),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
           )
-          as _i10.Future<void>);
+          as _i11.Future<void>);
 
   @override
-  _i10.Future<void> editSlotEntryServer(_i6.SlotEntry? entry) =>
+  _i11.Future<void> editSlotEntryServer(_i6.SlotEntry? entry) =>
       (super.noSuchMethod(
             Invocation.method(#editSlotEntryServer, [entry]),
-            returnValue: _i10.Future<void>.value(),
-            returnValueForMissingStub: _i10.Future<void>.value(),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
           )
-          as _i10.Future<void>);
+          as _i11.Future<void>);
 
   @override
-  _i10.Future<_i7.BaseConfig> editConfigServer(
+  _i11.Future<_i7.BaseConfig> editConfigServer(
     _i7.BaseConfig? config,
     _i6.ConfigType? type,
   ) =>
       (super.noSuchMethod(
             Invocation.method(#editConfigServer, [config, type]),
-            returnValue: _i10.Future<_i7.BaseConfig>.value(
+            returnValue: _i11.Future<_i7.BaseConfig>.value(
               _FakeBaseConfig_5(
                 this,
                 Invocation.method(#editConfigServer, [config, type]),
               ),
             ),
           )
-          as _i10.Future<_i7.BaseConfig>);
+          as _i11.Future<_i7.BaseConfig>);
 
   @override
-  _i10.Future<_i7.BaseConfig> addConfigServer(
+  _i11.Future<_i7.BaseConfig> addConfigServer(
     _i7.BaseConfig? config,
     _i6.ConfigType? type,
   ) =>
       (super.noSuchMethod(
             Invocation.method(#addConfigServer, [config, type]),
-            returnValue: _i10.Future<_i7.BaseConfig>.value(
+            returnValue: _i11.Future<_i7.BaseConfig>.value(
               _FakeBaseConfig_5(
                 this,
                 Invocation.method(#addConfigServer, [config, type]),
               ),
             ),
           )
-          as _i10.Future<_i7.BaseConfig>);
+          as _i11.Future<_i7.BaseConfig>);
 
   @override
-  _i10.Future<void> deleteConfigServer(int? id, _i6.ConfigType? type) =>
+  _i11.Future<void> deleteConfigServer(int? id, _i6.ConfigType? type) =>
       (super.noSuchMethod(
             Invocation.method(#deleteConfigServer, [id, type]),
-            returnValue: _i10.Future<void>.value(),
-            returnValueForMissingStub: _i10.Future<void>.value(),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
           )
-          as _i10.Future<void>);
+          as _i11.Future<void>);
 
   @override
-  _i10.Future<void> handleConfigServer(
+  _i11.Future<void> handleConfigServer(
     _i6.SlotEntry? entry,
     num? value,
     _i6.ConfigType? type,
   ) =>
       (super.noSuchMethod(
             Invocation.method(#handleConfigServer, [entry, value, type]),
-            returnValue: _i10.Future<void>.value(),
-            returnValueForMissingStub: _i10.Future<void>.value(),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
           )
-          as _i10.Future<void>);
+          as _i11.Future<void>);
 }
 
 /// A class which mocks [TrophyRepository].
@@ -826,15 +978,15 @@ class MockTrophyRepository extends _i1.Mock implements _i31.TrophyRepository {
           as String);
 
   @override
-  _i10.Future<List<_i33.Trophy>> fetchTrophies({String? language}) =>
+  _i11.Future<List<_i33.Trophy>> fetchTrophies({String? language}) =>
       (super.noSuchMethod(
             Invocation.method(#fetchTrophies, [], {#language: language}),
-            returnValue: _i10.Future<List<_i33.Trophy>>.value(<_i33.Trophy>[]),
+            returnValue: _i11.Future<List<_i33.Trophy>>.value(<_i33.Trophy>[]),
           )
-          as _i10.Future<List<_i33.Trophy>>);
+          as _i11.Future<List<_i33.Trophy>>);
 
   @override
-  _i10.Future<List<_i34.UserTrophy>> fetchUserTrophies({
+  _i11.Future<List<_i34.UserTrophy>> fetchUserTrophies({
     Map<String, String>? filterQuery,
     String? language,
   }) =>
@@ -843,14 +995,14 @@ class MockTrophyRepository extends _i1.Mock implements _i31.TrophyRepository {
               #filterQuery: filterQuery,
               #language: language,
             }),
-            returnValue: _i10.Future<List<_i34.UserTrophy>>.value(
+            returnValue: _i11.Future<List<_i34.UserTrophy>>.value(
               <_i34.UserTrophy>[],
             ),
           )
-          as _i10.Future<List<_i34.UserTrophy>>);
+          as _i11.Future<List<_i34.UserTrophy>>);
 
   @override
-  _i10.Future<List<_i35.UserTrophyProgression>> fetchProgression({
+  _i11.Future<List<_i35.UserTrophyProgression>> fetchProgression({
     Map<String, String>? filterQuery,
     String? language,
   }) =>
@@ -859,9 +1011,233 @@ class MockTrophyRepository extends _i1.Mock implements _i31.TrophyRepository {
               #filterQuery: filterQuery,
               #language: language,
             }),
-            returnValue: _i10.Future<List<_i35.UserTrophyProgression>>.value(
+            returnValue: _i11.Future<List<_i35.UserTrophyProgression>>.value(
               <_i35.UserTrophyProgression>[],
             ),
           )
-          as _i10.Future<List<_i35.UserTrophyProgression>>);
+          as _i11.Future<List<_i35.UserTrophyProgression>>);
+}
+
+/// A class which mocks [ExerciseRepository].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockExerciseRepository extends _i1.Mock implements _i36.ExerciseRepository {
+  MockExerciseRepository() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i11.Future<List<int>> searchExerciseServer(
+    String? term, {
+    String? languageCode = 'en',
+    bool? searchEnglish = false,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #searchExerciseServer,
+              [term],
+              {#languageCode: languageCode, #searchEnglish: searchEnglish},
+            ),
+            returnValue: _i11.Future<List<int>>.value(<int>[]),
+          )
+          as _i11.Future<List<int>>);
+
+  @override
+  _i11.Future<List<int>> searchExerciseServerWithSearchMode(
+    String? term, {
+    String? languageCode = 'en',
+    _i21.SearchLanguage? searchLanguage = _i21.SearchLanguage.currentAndEnglish,
+    _i37.ExerciseSearchMode? searchMode = _i37.ExerciseSearchMode.fulltext,
+    Set<_i38.ExerciseCategory>? categories = const {},
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #searchExerciseServerWithSearchMode,
+              [term],
+              {
+                #languageCode: languageCode,
+                #searchLanguage: searchLanguage,
+                #searchMode: searchMode,
+                #categories: categories,
+              },
+            ),
+            returnValue: _i11.Future<List<int>>.value(<int>[]),
+          )
+          as _i11.Future<List<int>>);
+
+  @override
+  _i11.Stream<_i39.ExerciseState> watchAllDrift() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchAllDrift, []),
+            returnValue: _i11.Stream<_i39.ExerciseState>.empty(),
+          )
+          as _i11.Stream<_i39.ExerciseState>);
+
+  @override
+  _i11.Stream<List<_i38.ExerciseCategory>> watchCategoriesDrift() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchCategoriesDrift, []),
+            returnValue: _i11.Stream<List<_i38.ExerciseCategory>>.empty(),
+          )
+          as _i11.Stream<List<_i38.ExerciseCategory>>);
+
+  @override
+  _i11.Stream<List<_i40.Equipment>> watchEquipmentDrift() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchEquipmentDrift, []),
+            returnValue: _i11.Stream<List<_i40.Equipment>>.empty(),
+          )
+          as _i11.Stream<List<_i40.Equipment>>);
+
+  @override
+  _i11.Stream<List<_i41.Muscle>> watchMusclesDrift() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchMusclesDrift, []),
+            returnValue: _i11.Stream<List<_i41.Muscle>>.empty(),
+          )
+          as _i11.Stream<List<_i41.Muscle>>);
+
+  @override
+  _i11.Stream<List<_i42.Language>> watchLanguagesDrift() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchLanguagesDrift, []),
+            returnValue: _i11.Stream<List<_i42.Language>>.empty(),
+          )
+          as _i11.Stream<List<_i42.Language>>);
+}
+
+/// A class which mocks [HealthRepository].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockHealthRepository extends _i1.Mock implements _i43.HealthRepository {
+  MockHealthRepository() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  String get sourceName =>
+      (super.noSuchMethod(
+            Invocation.getter(#sourceName),
+            returnValue: _i32.dummyValue<String>(
+              this,
+              Invocation.getter(#sourceName),
+            ),
+          )
+          as String);
+
+  @override
+  _i11.Future<_i43.HealthPlatformAvailability> availability() =>
+      (super.noSuchMethod(
+            Invocation.method(#availability, []),
+            returnValue: _i11.Future<_i43.HealthPlatformAvailability>.value(
+              _i43.HealthPlatformAvailability.available,
+            ),
+          )
+          as _i11.Future<_i43.HealthPlatformAvailability>);
+
+  @override
+  _i11.Future<void> openHealthConnectInstall() =>
+      (super.noSuchMethod(
+            Invocation.method(#openHealthConnectInstall, []),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  _i11.Future<bool> ensureHistoryAuthorized() =>
+      (super.noSuchMethod(
+            Invocation.method(#ensureHistoryAuthorized, []),
+            returnValue: _i11.Future<bool>.value(false),
+          )
+          as _i11.Future<bool>);
+
+  @override
+  _i11.Future<Set<_i44.HealthDataType>> readableTypes(
+    List<_i44.HealthDataType>? types,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#readableTypes, [types]),
+            returnValue: _i11.Future<Set<_i44.HealthDataType>>.value(
+              <_i44.HealthDataType>{},
+            ),
+          )
+          as _i11.Future<Set<_i44.HealthDataType>>);
+
+  @override
+  _i11.Future<bool> ensureAuthorized(List<_i44.HealthDataType>? types) =>
+      (super.noSuchMethod(
+            Invocation.method(#ensureAuthorized, [types]),
+            returnValue: _i11.Future<bool>.value(false),
+          )
+          as _i11.Future<bool>);
+
+  @override
+  _i11.Future<void> read({
+    required List<_i44.HealthDataType>? types,
+    required DateTime? start,
+    required DateTime? end,
+    required Duration? window,
+    required _i11.Future<void> Function(List<_i45.HealthReading>, DateTime)? onBatch,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#read, [], {
+              #types: types,
+              #start: start,
+              #end: end,
+              #window: window,
+              #onBatch: onBatch,
+            }),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+}
+
+/// A class which mocks [WorkoutSessionRepository].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockWorkoutSessionRepository extends _i1.Mock implements _i46.WorkoutSessionRepository {
+  MockWorkoutSessionRepository() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i11.Stream<List<_i9.WorkoutSession>> watchAllDrift() =>
+      (super.noSuchMethod(
+            Invocation.method(#watchAllDrift, []),
+            returnValue: _i11.Stream<List<_i9.WorkoutSession>>.empty(),
+          )
+          as _i11.Stream<List<_i9.WorkoutSession>>);
+
+  @override
+  _i11.Future<void> deleteLocalDrift(String? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLocalDrift, [id]),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  _i11.Future<void> editLocalDrift(_i9.WorkoutSession? session) =>
+      (super.noSuchMethod(
+            Invocation.method(#editLocalDrift, [session]),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  _i11.Future<_i9.WorkoutSession> addLocalDrift(_i9.WorkoutSession? session) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLocalDrift, [session]),
+            returnValue: _i11.Future<_i9.WorkoutSession>.value(
+              _FakeWorkoutSession_7(
+                this,
+                Invocation.method(#addLocalDrift, [session]),
+              ),
+            ),
+          )
+          as _i11.Future<_i9.WorkoutSession>);
 }
diff --git a/test/screenshots/screenshots_02_workout.dart b/test/screenshots/screenshots_02_workout.dart
index 184418f4c..30af3c43e 100644
--- a/test/screenshots/screenshots_02_workout.dart
+++ b/test/screenshots/screenshots_02_workout.dart
@@ -16,17 +16,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import 'package:drift/native.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart' as riverpod;
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
+import 'package:wger/database/powersync/database.dart';
 import 'package:wger/features/routines/providers/routines_repository.dart';
 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,12 +35,15 @@ 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]));
 
   final container = riverpod.ProviderContainer.test(
     overrides: [
+      // Backstop for repositories that are not mocked: they all read the
+      // database, and none of them should reach the real PowerSync file
+      driftPowerSyncDatabase.overrideWithValue(DriftPowersyncDatabase(NativeDatabase.memory())),
       routinesRepositoryProvider.overrideWithValue(mockRoutinesRepo),
     ],
   );
diff --git a/test/screenshots/screenshots_03_gym_mode.dart b/test/screenshots/screenshots_03_gym_mode.dart
index c7546f5e7..b8232b354 100644
--- a/test/screenshots/screenshots_03_gym_mode.dart
+++ b/test/screenshots/screenshots_03_gym_mode.dart
@@ -16,9 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import 'package:clock/clock.dart';
+import 'package:drift/native.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart' as riverpod;
+import 'package:wger/database/powersync/database.dart';
 import 'package:wger/features/exercises/providers/exercise_filter_state.dart';
 import 'package:wger/features/exercises/providers/exercise_filters_notifier.dart';
 import 'package:wger/features/routines/models/routine.dart';
@@ -31,8 +32,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 +47,20 @@ 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: [
+      // Backstop for repositories that are not mocked: they all read the
+      // database, and none of them should reach the real PowerSync file
+      driftPowerSyncDatabase.overrideWithValue(DriftPowersyncDatabase(NativeDatabase.memory())),
       exerciseListFiltersProvider.overrideWithValue(
-        ExerciseFilterState(exercises: getTestExercises()),
+        ExerciseFilterState(exercises: getScreenshotExercises()),
       ),
     ],
   );
   container.read(routinesRiverpodProvider.notifier).state = riverpod.AsyncData(
     RoutinesState(
-      routines: [getTestRoutine(exercises: getScreenshotExercises())],
+      routines: [getScreenshotRoutine()],
     ),
   );
 
@@ -99,12 +103,14 @@ Widget createGymModeResultsScreen({Locale? locale}) {
   final controller = PageController(initialPage: 0);
 
   final key = GlobalKey<NavigatorState>();
-  final routine = getTestRoutine(exercises: getScreenshotExercises());
-  routine.sessions[0] = routine.sessions.first.copyWith(date: clock.now());
+  final routine = getScreenshotRoutine();
 
   return riverpod.UncontrolledProviderScope(
     container: riverpod.ProviderContainer.test(
       overrides: [
+        // Backstop for repositories that are not mocked: they all read the
+        // database, and none of them should reach the real PowerSync file
+        driftPowerSyncDatabase.overrideWithValue(DriftPowersyncDatabase(NativeDatabase.memory())),
         gymStateProvider.overrideWithValue(
           GymModeState(
             routine: routine,
diff --git a/test/screenshots/screenshots_04_measurements.dart b/test/screenshots/screenshots_04_measurements.dart
index 1097ea8f2..c8534c030 100644
--- a/test/screenshots/screenshots_04_measurements.dart
+++ b/test/screenshots/screenshots_04_measurements.dart
@@ -16,31 +16,43 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import 'package:drift/native.dart';
 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/database/powersync/database.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: [
+      // Backstop for repositories that are not mocked: they all read the
+      // database, and none of them should reach the real PowerSync file
+      driftPowerSyncDatabase.overrideWithValue(DriftPowersyncDatabase(NativeDatabase.memory())),
       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..ef81457af 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,59 @@ 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> updateTimeZoneDrift(int? id, String? timeZone) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateTimeZoneDrift, [id, timeZone]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @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..cebbf01f1 100644
--- a/test/screenshots/screenshots_05_nutritional_plan.dart
+++ b/test/screenshots/screenshots_05_nutritional_plan.dart
@@ -16,23 +16,27 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import 'package:drift/native.dart';
 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/database/powersync/database.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 +47,19 @@ 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),
+      // Backstop for repositories that are not mocked: they all read the
+      // database, and none of them should reach the real PowerSync file
+      driftPowerSyncDatabase.overrideWithValue(DriftPowersyncDatabase(NativeDatabase.memory())),
+      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
deleted file mode 100644
index c7c718f61..000000000
--- a/test/screenshots/screenshots_06_weight.dart
+++ /dev/null
@@ -1,92 +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: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/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 'screenshots_06_weight.mocks.dart';
-
-@GenerateMocks([
-  BodyWeightRepository,
-  UserProfileRepository,
-  NutritionRepository,
-  IngredientRepository,
-])
-Widget createWeightScreen({Locale? locale}) {
-  locale ??= const Locale('en');
-  final mockBodyWeightRepository = MockBodyWeightRepository();
-  when(
-    mockBodyWeightRepository.watchAllDrift(),
-  ).thenAnswer((_) => Stream.value(getScreenshotWeightEntries()));
-
-  final mockUserProfileRepository = MockUserProfileRepository();
-  when(
-    mockUserProfileRepository.watchDrift(),
-  ).thenAnswer((_) => Stream.value(tUserProfile1));
-
-  final mockNutritionRepo = MockNutritionRepository();
-  final mockIngredientRepo = MockIngredientRepository();
-  when(mockIngredientRepo.getById(any)).thenAnswer((_) async => null);
-
-  final container = ProviderContainer(
-    overrides: [
-      bodyWeightRepositoryProvider.overrideWithValue(mockBodyWeightRepository),
-      userProfileRepositoryProvider.overrideWithValue(mockUserProfileRepository),
-      nutritionRepositoryProvider.overrideWithValue(mockNutritionRepo),
-      ingredientRepositoryProvider.overrideWithValue(mockIngredientRepo),
-    ],
-  );
-  // Seed the nutrition notifier with a plan so the weight overview can show it.
-  container.read(nutritionProvider.notifier).state = AsyncData(
-    NutritionState(plans: [getNutritionalPlan()]),
-  );
-
-  return MediaQuery(
-    data: MediaQueryData.fromView(WidgetsBinding.instance.platformDispatcher.views.first).copyWith(
-      padding: EdgeInsets.zero,
-      viewPadding: EdgeInsets.zero,
-      viewInsets: EdgeInsets.zero,
-    ),
-    child: UncontrolledProviderScope(
-      container: container,
-      child: MaterialApp(
-        locale: locale,
-        debugShowCheckedModeBanner: false,
-        localizationsDelegates: AppLocalizations.localizationsDelegates,
-        supportedLocales: AppLocalizations.supportedLocales,
-        theme: wgerLightTheme,
-        home: const WeightScreen(),
-        routes: {FormScreen.routeName: (ctx) => const FormScreen()},
-      ),
-    ),
-  );
-}
diff --git a/test_data/body_weight.dart b/test_data/body_weight.dart
index 8e5cc9c42..4c70bbb8a 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: 'After the run',
 );
-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..4c6595675 100644
--- a/test_data/measurements.dart
+++ b/test_data/measurements.dart
@@ -78,29 +78,89 @@ 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',
+  metricType: MetricType.bloodPressureSystolic,
+  parentId: 'bp',
+  order: 0,
+);
+
+final testMeasurementCategoryDiastolic = MeasurementCategory(
+  id: 'dia',
+  name: 'Diastolic',
+  unit: 'mmHg',
+  metricType: MetricType.bloodPressureDiastolic,
+  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/routines.dart b/test_data/routines.dart
index a3142e235..b7890d380 100644
--- a/test_data/routines.dart
+++ b/test_data/routines.dart
@@ -16,7 +16,6 @@
  * 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';
@@ -92,22 +91,20 @@ Routine getTestRoutine({List<Exercise>? exercises}) {
   final session1 = WorkoutSession(
     id: '1',
     routineId: 1,
-    date: DateTime(2021, 5, 1),
     impression: WorkoutImpression.good,
     notes: 'This is a note',
-    timeStart: const TimeOfDay(hour: 10, minute: 0),
-    timeEnd: const TimeOfDay(hour: 12, minute: 34),
+    datetimeStart: DateTime(2021, 5, 1, 10, 0),
+    datetimeEnd: DateTime(2021, 5, 1, 12, 34),
     logs: [log1, log2],
   );
 
   final session2 = WorkoutSession(
     id: '2',
     routineId: 1,
-    date: DateTime(2021, 5, 2),
     impression: WorkoutImpression.bad,
     notes: 'This is a note',
-    timeStart: const TimeOfDay(hour: 6, minute: 12),
-    timeEnd: const TimeOfDay(hour: 8, minute: 1),
+    datetimeStart: DateTime(2021, 5, 2, 6, 12),
+    datetimeEnd: DateTime(2021, 5, 2, 8, 1),
     logs: [log3],
   );
 
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..0cbfa8ebb
--- /dev/null
+++ b/test_data/screenshots/routines.dart
@@ -0,0 +1,299 @@
+/*
+ * 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/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,
+    impression: WorkoutImpression.good,
+    notes: 'Bench felt strong today',
+    datetimeStart: DateTime(today.year, today.month, today.day, 17, 30),
+    datetimeEnd: DateTime(today.year, today.month, today.day, 18, 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..c77c7052a
--- /dev/null
+++ b/test_data/screenshots/weight.dart
@@ -0,0 +1,72 @@
+/*
+ * 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 '../body_weight.dart';
+
+/// A year of body weight ending today, shaped like a real log: a slow drift
+/// up, a successful cut, a short maintenance phase, and a fresh cut. The cuts
+/// 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());
+}
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',
       ),
diff --git a/test_driver/screenshot_driver.dart b/test_driver/screenshot_driver.dart
index cca70d233..93e05b3ef 100644
--- a/test_driver/screenshot_driver.dart
+++ b/test_driver/screenshot_driver.dart
@@ -1,20 +1,52 @@
+/*
+ * 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/>.
+ */
+
 // ignore_for_file: avoid_print
 
 import 'dart:io';
+import 'dart:typed_data';
 
+import 'package:image/image.dart' as img;
 import 'package:integration_test/integration_test_driver_extended.dart';
 
 // cf. https://dev.to/mjablecnik/take-screenshot-during-flutter-integration-tests-435k
+// Errors stay uncaught: a failed hand-over means no images at all, and
+// swallowing it would leave a green job with an empty artifact.
 Future<void> main() async {
-  try {
-    await integrationDriver(
-      onScreenshot: (String screenshotName, List<int> screenshotBytes, [_]) async {
-        final File image = await File(screenshotName).create(recursive: true);
-        image.writeAsBytesSync(screenshotBytes);
-        return true;
-      },
-    );
-  } catch (e) {
-    print('An error occurred: $e');
+  await integrationDriver(
+    onScreenshot: (String screenshotName, List<int> screenshotBytes, [_]) async {
+      final File image = await File(screenshotName).create(recursive: true);
+      image.writeAsBytesSync(_withoutAlpha(screenshotBytes));
+      return true;
+    },
+  );
+}
+
+/// Re-encodes a PNG as opaque 8 bit RGB
+///
+/// The App Store rejects screenshots with an alpha channel. Returns the
+/// input unchanged if it can't be decoded.
+List<int> _withoutAlpha(List<int> bytes) {
+  final decoded = img.decodePng(Uint8List.fromList(bytes));
+  if (decoded == null) {
+    print('Could not decode the screenshot, writing it out unchanged');
+    return bytes;
   }
+
+  return img.encodePng(decoded.convert(format: img.Format.uint8, numChannels: 3));
 }
diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc
index ddb906182..d51e81857 100644
--- a/windows/flutter/generated_plugin_registrant.cc
+++ b/windows/flutter/generated_plugin_registrant.cc
@@ -11,6 +11,7 @@
 #include <dynamic_color/dynamic_color_plugin_c_api.h>
 #include <file_selector_windows/file_selector_windows.h>
 #include <flutter_secure_storage_windows/flutter_secure_storage_windows_plugin.h>
+#include <flutter_timezone/flutter_timezone_plugin_c_api.h>
 #include <url_launcher_windows/url_launcher_windows.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
@@ -24,6 +25,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
       registry->GetRegistrarForPlugin("FileSelectorWindows"));
   FlutterSecureStorageWindowsPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("FlutterSecureStorageWindowsPlugin"));
+  FlutterTimezonePluginCApiRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("FlutterTimezonePluginCApi"));
   UrlLauncherWindowsRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("UrlLauncherWindows"));
 }
diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake
index 023efb0cc..0df1af527 100644
--- a/windows/flutter/generated_plugins.cmake
+++ b/windows/flutter/generated_plugins.cmake
@@ -8,6 +8,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
   dynamic_color
   file_selector_windows
   flutter_secure_storage_windows
+  flutter_timezone
   url_launcher_windows
 )