add timeline edit/delete

.gitea/workflows/release.yml

@@ -9,15 +9,17 @@ on:
 env:
   JAVA_VERSION: "17"
   ANDROID_SDK_ROOT: "${{ github.workspace }}/android-sdk"
-  FLUTTER_CHANNEL: "stable"
+  FLUTTER_VERSION: "3.38.5"
   BUILD_WINDOWS: "false" # set to "true" when you actually want Windows builds
   GITEA_BASE_URL: https://git.tgj.services
 
 jobs:
   meta:
-    runs-on: ubuntu-latest
+    runs-on:
+      - mileograph
     outputs:
       base_version: ${{ steps.meta.outputs.base }}
+      release_tag: ${{ steps.meta.outputs.release_tag }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -27,10 +29,44 @@ jobs:
         run: |
           RAW_VERSION=$(awk '/^version:/{print $2}' pubspec.yaml)
           BASE_VERSION=${RAW_VERSION%%+*}
+          TAG="v${BASE_VERSION}"
+          if [ "${GITHUB_REF}" = "refs/heads/dev" ]; then
+            TAG="v${BASE_VERSION}-dev"
+          fi
           echo "base=${BASE_VERSION}" >> "$GITHUB_OUTPUT"
+          echo "release_tag=${TAG}" >> "$GITHUB_OUTPUT"
+
+      - name: Fail if release already exists
+        env:
+          TAG: ${{ steps.meta.outputs.release_tag }}
+        run: |
+          set -euo pipefail
+
+          if ! command -v curl >/dev/null 2>&1; then
+            if command -v sudo >/dev/null 2>&1; then
+              SUDO="sudo"
+            else
+              SUDO=""
+            fi
+            $SUDO apt-get update
+            $SUDO apt-get install -y curl ca-certificates
+          fi
+
+          URL="${GITEA_BASE_URL}/api/v1/repos/${{ github.repository }}/releases/tags/${TAG}"
+          CODE="$(curl -sS -o /dev/null -w "%{http_code}" -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" "$URL" || true)"
+
+          if [ "$CODE" = "200" ]; then
+            echo "Release already exists for tag ${TAG}; refusing to re-release."
+            exit 1
+          fi
+          if [ "$CODE" != "404" ]; then
+            echo "Unexpected response checking existing release (${CODE}) at ${URL}"
+            exit 1
+          fi
 
   android-build:
-    runs-on: ubuntu-latest
+    runs-on:
+      - mileograph
     needs: meta
     steps:
       - name: Checkout
@@ -70,30 +106,88 @@ jobs:
           echo "$ANDROID_SDK_ROOT/platform-tools" >> "$GITHUB_PATH"
           echo "$ANDROID_SDK_ROOT/build-tools/33.0.2" >> "$GITHUB_PATH"
 
-      - name: Setup Flutter
-        uses: subosito/flutter-action@v2
-        with:
-          channel: ${{ env.FLUTTER_CHANNEL }}
+      - name: Install Flutter SDK
+        run: |
+          set -euo pipefail
+          FLUTTER_HOME="$HOME/flutter"
+          if [ ! -x "$FLUTTER_HOME/bin/flutter" ]; then
+            rm -rf "$FLUTTER_HOME"
+            curl -fsSL -o /tmp/flutter.tar.xz "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${FLUTTER_VERSION}-stable.tar.xz"
+            tar -C "$HOME" -xf /tmp/flutter.tar.xz
+          fi
+          echo "$FLUTTER_HOME/bin" >> "$GITHUB_PATH"
+          "$FLUTTER_HOME/bin/flutter" --version
 
       - name: Allow all git directories (CI)
         run: git config --global --add safe.directory '*'
 
+      - name: Set pub cache path
+        run: echo "PUB_CACHE=${GITHUB_WORKSPACE}/.pub-cache" >> "$GITHUB_ENV"
+
       - name: Flutter dependencies
         run: flutter pub get
 
-      - name: Build APK (release)
+      - name: Prepare Android keystore (optional)
+        if: ${{ secrets.ANDROID_KEYSTORE_BASE64 != '' }}
         run: |
-          flutter build apk --release
-          cp build/app/outputs/flutter-apk/app-release.apk app-release.apk
+          echo "${{ secrets.ANDROID_KEYSTORE_BASE64 }}" | base64 -d > android-release-key.jks
+          echo "ANDROID_KEYSTORE_PATH=$PWD/android-release-key.jks" >> "$GITHUB_ENV"
+          echo "ANDROID_KEYSTORE_PASSWORD=${{ secrets.ANDROID_KEYSTORE_PASSWORD }}" >> "$GITHUB_ENV"
+          echo "ANDROID_KEY_ALIAS=${{ secrets.ANDROID_KEY_ALIAS }}" >> "$GITHUB_ENV"
+          echo "ANDROID_KEY_PASSWORD=${{ secrets.ANDROID_KEY_PASSWORD }}" >> "$GITHUB_ENV"
+
+      - name: Build Android App Bundle (release)
+        run: flutter build appbundle --release
+
+      - name: Download bundletool
+        run: |
+          BUNDLETOOL_VERSION=1.15.6
+          curl -fsSL -o bundletool.jar "https://github.com/google/bundletool/releases/download/${BUNDLETOOL_VERSION}/bundletool-all-${BUNDLETOOL_VERSION}.jar"
+
+      - name: Extract universal APK from bundle
+        env:
+          BASE_VERSION: ${{ needs.meta.outputs.base_version }}
+        run: |
+          set -euo pipefail
+
+          BUNDLE="build/app/outputs/bundle/release/app-release.aab"
+          OUTPUT_APKS="app-release.apks"
+          APK_NAME="mileograph-${BASE_VERSION}.apk"
+
+          if [ ! -f "$BUNDLE" ]; then
+            echo "Bundle not found at $BUNDLE"
+            exit 1
+          fi
+
+          SIGNING_ARGS=()
+          if [ -n "${ANDROID_KEYSTORE_PATH:-}" ] && [ -f "$ANDROID_KEYSTORE_PATH" ]; then
+            SIGNING_ARGS+=(--ks="$ANDROID_KEYSTORE_PATH")
+            SIGNING_ARGS+=(--ks-pass="pass:${ANDROID_KEYSTORE_PASSWORD}")
+            SIGNING_ARGS+=(--ks-key-alias="${ANDROID_KEY_ALIAS}")
+            KEY_PASS="${ANDROID_KEY_PASSWORD:-$ANDROID_KEYSTORE_PASSWORD}"
+            SIGNING_ARGS+=(--key-pass="pass:${KEY_PASS}")
+          else
+            echo "No release keystore provided; bundletool will sign with the debug keystore."
+          fi
+
+          java -jar bundletool.jar build-apks \
+            --bundle="$BUNDLE" \
+            --output="$OUTPUT_APKS" \
+            --mode=universal \
+            "${SIGNING_ARGS[@]}"
+
+          unzip -p "$OUTPUT_APKS" universal.apk > "$APK_NAME"
+          ls -lh "$APK_NAME"
 
       - name: Upload Android APK artifact
         uses: actions/upload-artifact@v3
         with:
           name: android-apk
-          path: app-release.apk
+          path: mileograph-${{ needs.meta.outputs.base_version }}.apk
 
   linux-build:
-    runs-on: ubuntu-latest
+    runs-on:
+      - mileograph
     needs: meta
     steps:
       - name: Checkout
@@ -107,16 +201,26 @@ jobs:
             SUDO=""
           fi
           $SUDO apt-get update
-          $SUDO apt-get install -y unzip xz-utils zip libstdc++6 libglu1-mesa clang cmake ninja-build pkg-config libgtk-3-dev liblzma-dev curl jq
+          $SUDO apt-get install -y unzip xz-utils zip libstdc++6 libglu1-mesa clang cmake ninja-build pkg-config libgtk-3-dev libsecret-1-dev liblzma-dev curl jq
 
-      - name: Setup Flutter
-        uses: subosito/flutter-action@v2
-        with:
-          channel: ${{ env.FLUTTER_CHANNEL }}
+      - name: Install Flutter SDK
+        run: |
+          set -euo pipefail
+          FLUTTER_HOME="$HOME/flutter"
+          if [ ! -x "$FLUTTER_HOME/bin/flutter" ]; then
+            rm -rf "$FLUTTER_HOME"
+            curl -fsSL -o /tmp/flutter.tar.xz "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${FLUTTER_VERSION}-stable.tar.xz"
+            tar -C "$HOME" -xf /tmp/flutter.tar.xz
+          fi
+          echo "$FLUTTER_HOME/bin" >> "$GITHUB_PATH"
+          "$FLUTTER_HOME/bin/flutter" --version
 
       - name: Allow all git directories (CI)
         run: git config --global --add safe.directory '*'
 
+      - name: Set pub cache path
+        run: echo "PUB_CACHE=${GITHUB_WORKSPACE}/.pub-cache" >> "$GITHUB_ENV"
+
       - name: Flutter dependencies
         run: flutter pub get
 
@@ -134,53 +238,23 @@ jobs:
           name: linux-bundle
           path: app-linux-x64.tar.gz
 
-  windows-build:
-    runs-on: windows-latest
-    needs: meta
-    # Job always runs; steps are conditional so it won't block anything when Windows is disabled.
-    steps:
-      - name: Checkout
-        if: ${{ env.BUILD_WINDOWS == 'true' }}
-        uses: actions/checkout@v4
-
-      - name: Setup Flutter
-        if: ${{ env.BUILD_WINDOWS == 'true' }}
-        uses: subosito/flutter-action@v2
-        with:
-          channel: ${{ env.FLUTTER_CHANNEL }}
-
-      - name: Allow all git directories (CI)
-        if: ${{ env.BUILD_WINDOWS == 'true' }}
-        run: git config --global --add safe.directory '*'
-
-      - name: Flutter dependencies
-        if: ${{ env.BUILD_WINDOWS == 'true' }}
-        run: flutter pub get
-
-      - name: Enable Windows desktop
-        if: ${{ env.BUILD_WINDOWS == 'true' }}
-        run: flutter config --enable-windows-desktop
-
-      - name: Build Windows binary (release)
-        if: ${{ env.BUILD_WINDOWS == 'true' }}
-        run: |
-          flutter build windows --release
-          powershell -Command "Compress-Archive -Path build/windows/x64/runner/Release/* -DestinationPath app-windows-x64.zip"
-
-      - name: Upload Windows artifact
-        if: ${{ env.BUILD_WINDOWS == 'true' }}
-        uses: actions/upload-artifact@v3
-        with:
-          name: windows-zip
-          path: app-windows-x64.zip
-
   release-dev:
-    runs-on: ubuntu-latest
+    runs-on:
+      - mileograph
     needs:
       - meta
       - android-build
       - linux-build
     steps:
+      - name: Install jq
+        run: |
+          if command -v sudo >/dev/null 2>&1; then
+            SUDO="sudo"
+          else
+            SUDO=""
+          fi
+          $SUDO apt-get update
+          $SUDO apt-get install -y jq
       - name: Download Android APK
         if: ${{ github.ref == 'refs/heads/dev' }}
         uses: actions/download-artifact@v3
@@ -188,54 +262,36 @@ jobs:
           name: android-apk
           path: artifacts
 
-      - name: Download Linux bundle
-        if: ${{ github.ref == 'refs/heads/dev' }}
-        uses: actions/download-artifact@v3
-        with:
-          name: linux-bundle
-          path: artifacts
-
-      - name: Download Windows bundle (optional)
-        if: ${{ github.ref == 'refs/heads/dev' && env.BUILD_WINDOWS == 'true' }}
-        uses: actions/download-artifact@v3
-        with:
-          name: windows-zip
-          path: artifacts
-
-      - name: Prepare artefacts and tag
+      - name: Prepare APK and tag
         if: ${{ github.ref == 'refs/heads/dev' }}
         id: bundle
         run: |
           BASE="${{ needs.meta.outputs.base_version }}"
-          TAG="v${BASE}-dev"
+          TAG="${{ needs.meta.outputs.release_tag }}"
 
-          mv artifacts/app-release.apk "artifacts/app-${BASE}-dev.apk"
-          mv artifacts/app-linux-x64.tar.gz "artifacts/app-linux-x64-${BASE}-dev.tar.gz"
-          if [ -f artifacts/app-windows-x64.zip ]; then
-            mv artifacts/app-windows-x64.zip "artifacts/app-windows-x64-${BASE}-dev.zip"
-          fi
+          mv "artifacts/mileograph-${BASE}.apk" "artifacts/mileograph-${BASE}-dev.apk"
 
           echo "tag=${TAG}" >> "$GITHUB_OUTPUT"
-          echo "files=artifacts/*" >> "$GITHUB_OUTPUT"
+          echo "apk=artifacts/mileograph-${BASE}-dev.apk" >> "$GITHUB_OUTPUT"
 
       - name: Create prerelease on Gitea
         if: ${{ github.ref == 'refs/heads/dev' }}
         uses: ncipollo/release-action@v1
         with:
-          tag: v${{ needs.meta.outputs.base_version }}-dev.${{ github.run_number }}
-          name: v${{ needs.meta.outputs.base_version }}-dev build ${{ github.run_number }}
+          tag: ${{ steps.bundle.outputs.tag }}
+          name: ${{ steps.bundle.outputs.tag }}
           prerelease: true
           commit: ${{ github.sha }}
           token: ${{ secrets.GITEA_TOKEN }}
           # NOTE: no `artifacts:` here
 
-      - name: Attach artefacts to Gitea release
+      - name: Attach APK to Gitea release
         if: ${{ github.ref == 'refs/heads/dev' }}
         run: |
           set -euo pipefail
 
-          BASE="${{ needs.meta.outputs.base_version }}"
-          TAG="v${BASE}-dev.${{ github.run_number }}"
+          TAG="${{ steps.bundle.outputs.tag }}"
+          APK="${{ steps.bundle.outputs.apk }}"
 
           # 1. Find release ID by tag
           RELEASE_JSON=$(curl -sS \
@@ -246,28 +302,34 @@ jobs:
 
           echo "Release ID: $RELEASE_ID"
 
-          # 2. Upload each artefact with multipart/form-data
-          for f in artifacts/*; do
-            [ -f "$f" ] || continue
-            NAME=$(basename "$f")
+          # 2. Upload APK with multipart/form-data
+          NAME=$(basename "$APK")
           echo "Uploading $NAME"
 
           curl -sS -X POST \
             -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
-              -F "attachment=@${f}" \
+            -F "attachment=@${APK}" \
             -F "name=${NAME}" \
             "${GITEA_BASE_URL}/api/v1/repos/${{ github.repository }}/releases/${RELEASE_ID}/assets" \
             >/dev/null
-          done
-
 
   release-master:
-    runs-on: ubuntu-latest
+    runs-on:
+      - mileograph
     needs:
       - meta
       - android-build
       - linux-build
     steps:
+      - name: Install jq
+        run: |
+          if command -v sudo >/dev/null 2>&1; then
+            SUDO="sudo"
+          else
+            SUDO=""
+          fi
+          $SUDO apt-get update
+          $SUDO apt-get install -y jq
       - name: Download Android APK
         if: ${{ github.ref == 'refs/heads/master' }}
         uses: actions/download-artifact@v3
@@ -275,35 +337,15 @@ jobs:
           name: android-apk
           path: artifacts
 
-      - name: Download Linux bundle
-        if: ${{ github.ref == 'refs/heads/master' }}
-        uses: actions/download-artifact@v3
-        with:
-          name: linux-bundle
-          path: artifacts
-
-      - name: Download Windows bundle (optional)
-        if: ${{ github.ref == 'refs/heads/master' && env.BUILD_WINDOWS == 'true' }}
-        uses: actions/download-artifact@v3
-        with:
-          name: windows-zip
-          path: artifacts
-
-      - name: Prepare artefacts and tag
+      - name: Prepare APK and tag
         if: ${{ github.ref == 'refs/heads/master' }}
         id: bundle
         run: |
           BASE="${{ needs.meta.outputs.base_version }}"
-          TAG="v${BASE}"
-
-          mv artifacts/app-release.apk "artifacts/app-${BASE}.apk"
-          mv artifacts/app-linux-x64.tar.gz "artifacts/app-linux-x64-${BASE}.tar.gz"
-          if [ -f artifacts/app-windows-x64.zip ]; then
-            mv artifacts/app-windows-x64.zip "artifacts/app-windows-x64-${BASE}.zip"
-          fi
+          TAG="${{ needs.meta.outputs.release_tag }}"
 
           echo "tag=${TAG}" >> "$GITHUB_OUTPUT"
-          echo "files=artifacts/*" >> "$GITHUB_OUTPUT"
+          echo "apk=artifacts/mileograph-${BASE}.apk" >> "$GITHUB_OUTPUT"
 
       - name: Create release on Gitea
         if: ${{ github.ref == 'refs/heads/master' }}
@@ -313,4 +355,32 @@ jobs:
           name: ${{ steps.bundle.outputs.tag }}
           prerelease: false
           token: ${{ secrets.GITEA_TOKEN }}
-          artifacts: ${{ steps.bundle.outputs.files }}
+          commit: ${{ github.sha }}
+
+      - name: Attach APK to Gitea release
+        if: ${{ github.ref == 'refs/heads/master' }}
+        run: |
+          set -euo pipefail
+
+          TAG="${{ steps.bundle.outputs.tag }}"
+          APK="${{ steps.bundle.outputs.apk }}"
+
+          # 1. Find release ID by tag
+          RELEASE_JSON=$(curl -sS \
+            -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
+            "${GITEA_BASE_URL}/api/v1/repos/${{ github.repository }}/releases/tags/${TAG}")
+
+          RELEASE_ID=$(echo "$RELEASE_JSON" | jq -r '.id')
+
+          echo "Release ID: $RELEASE_ID"
+
+          # 2. Upload APK with multipart/form-data
+          NAME=$(basename "$APK")
+          echo "Uploading $NAME"
+
+          curl -sS -X POST \
+            -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
+            -F "attachment=@${APK}" \
+            -F "name=${NAME}" \
+            "${GITEA_BASE_URL}/api/v1/repos/${{ github.repository }}/releases/${RELEASE_ID}/assets" \
+            >/dev/null

.gitignore

@@ -43,3 +43,5 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+
+api_return_examples.txt

android/app/build.gradle.kts

@@ -1,3 +1,5 @@
+import java.util.Properties
+
 plugins {
     id("com.android.application")
     id("kotlin-android")
@@ -5,6 +7,28 @@ plugins {
     id("dev.flutter.flutter-gradle-plugin")
 }
 
+val keystoreProperties = Properties()
+val keystorePropertiesFile = rootProject.file("key.properties")
+if (keystorePropertiesFile.exists()) {
+    keystorePropertiesFile.inputStream().use { keystoreProperties.load(it) }
+}
+
+val releaseStoreFile = System.getenv("ANDROID_KEYSTORE_PATH")
+    ?: keystoreProperties.getProperty("storeFile")
+val releaseStorePassword = System.getenv("ANDROID_KEYSTORE_PASSWORD")
+    ?: keystoreProperties.getProperty("storePassword")
+val releaseKeyAlias = System.getenv("ANDROID_KEY_ALIAS")
+    ?: keystoreProperties.getProperty("keyAlias")
+val releaseKeyPassword = System.getenv("ANDROID_KEY_PASSWORD")
+    ?: keystoreProperties.getProperty("keyPassword")
+
+val hasReleaseKeystore = listOf(
+    releaseStoreFile,
+    releaseStorePassword,
+    releaseKeyAlias,
+    releaseKeyPassword
+).all { !it.isNullOrBlank() }
+
 android {
     namespace = "com.example.mileograph_flutter"
     compileSdk = flutter.compileSdkVersion
@@ -30,11 +54,21 @@ android {
         versionName = flutter.versionName
     }
 
+    signingConfigs {
+        if (hasReleaseKeystore) {
+            create("release") {
+                storeFile = file(releaseStoreFile!!)
+                storePassword = releaseStorePassword
+                keyAlias = releaseKeyAlias!!
+                keyPassword = releaseKeyPassword
+            }
+        }
+    }
+
     buildTypes {
         release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig = signingConfigs.getByName("debug")
+            // Use a real release keystore when provided; fall back to debug keys otherwise.
+            signingConfig = signingConfigs.getByName(if (hasReleaseKeystore) "release" else "debug")
         }
     }
 }

android/app/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET"/>
     <application
-        android:label="mileograph_flutter"
+        android:label="Mileograph"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <activity

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@color/ic_launcher_background"/>
+  <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

android/app/src/main/res/values/colors.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#ffffff</color>
+</resources>

ios/Runner.xcodeproj/project.pbxproj

@@ -427,7 +427,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -484,7 +484,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";

lib/components/calculator/calculator.dart

@@ -1,9 +1,10 @@
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 import 'package:provider/provider.dart';
 import 'package:mileograph_flutter/objects/objects.dart';
-import 'package:mileograph_flutter/services/apiService.dart';
-import 'package:mileograph_flutter/services/dataService.dart';
-import './routeSummaryWidget.dart';
+import 'package:mileograph_flutter/services/api_service.dart';
+import 'package:mileograph_flutter/services/data_service.dart';
+import './route_summary_widget.dart';
 
 class StationAutocomplete extends StatefulWidget {
   const StationAutocomplete({
@@ -97,10 +98,16 @@ class _StationAutocompleteState extends State<StationAutocomplete> {
 }
 
 class RouteCalculator extends StatefulWidget {
-  const RouteCalculator({super.key, this.onDistanceComputed, this.onApplyRoute});
+  const RouteCalculator({
+    super.key,
+    this.onDistanceComputed,
+    this.onApplyRoute,
+    this.initialStations,
+  });
 
   final ValueChanged<double>? onDistanceComputed;
   final ValueChanged<RouteResult>? onApplyRoute;
+  final List<String>? initialStations;
 
   @override
   State<RouteCalculator> createState() => _RouteCalculatorState();
@@ -113,8 +120,6 @@ class _RouteCalculatorState extends State<RouteCalculator> {
   RouteResult? get result => _routeResult;
   String? _errorMessage;
 
-  bool _showDetails = false;
-
   bool _fetched = false;
 
   @override
@@ -122,6 +127,9 @@ class _RouteCalculatorState extends State<RouteCalculator> {
     super.didChangeDependencies();
     if (!_fetched) {
       _fetched = true;
+      if (widget.initialStations != null && widget.initialStations!.isNotEmpty) {
+        context.read<DataService>().stations = List.from(widget.initialStations!);
+      }
       WidgetsBinding.instance.addPostFrameCallback((_) async {
         final data = context.read<DataService>();
         final result = await data.fetchStations();
@@ -179,13 +187,6 @@ class _RouteCalculatorState extends State<RouteCalculator> {
   @override
   Widget build(BuildContext context) {
     final data = context.watch<DataService>();
-    if (_showDetails && _routeResult != null) {
-      return RouteDetailsView(
-        route: _routeResult!.calculatedRoute,
-        costs: _routeResult!.costs,
-        onBack: () => setState(() => _showDetails = false),
-      );
-    }
     return Column(
       children: [
         Expanded(
@@ -254,7 +255,11 @@ class _RouteCalculatorState extends State<RouteCalculator> {
         else if (_routeResult != null) ...[
           RouteSummaryWidget(
             distance: _routeResult!.distance,
-            onDetailsPressed: () => setState(() => _showDetails = true),
+            onDetailsPressed: () {
+              final result = _routeResult;
+              if (result == null) return;
+              context.push('/calculator/details', extra: result);
+            },
           ),
           if (widget.onApplyRoute != null)
             Padding(

lib/components/dashboard/leaderboard_panel.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:mileograph_flutter/services/dataService.dart';
+import 'package:mileograph_flutter/services/data_service.dart';
 
 import 'package:provider/provider.dart';
 

lib/components/dashboard/top_traction_panel.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:mileograph_flutter/services/dataService.dart';
+import 'package:mileograph_flutter/services/data_service.dart';
 
 import 'package:provider/provider.dart';
 

lib/components/login/login.dart

@@ -1,10 +1,37 @@
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 import 'package:mileograph_flutter/services/authservice.dart';
 import 'package:provider/provider.dart';
 
-class LoginScreen extends StatelessWidget {
+class LoginScreen extends StatefulWidget {
   const LoginScreen({super.key});
 
+  @override
+  State<LoginScreen> createState() => _LoginScreenState();
+}
+
+class _LoginScreenState extends State<LoginScreen> {
+  bool _checkingSession = true;
+
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addPostFrameCallback((_) => _checkExistingSession());
+  }
+
+  Future<void> _checkExistingSession() async {
+    final auth = context.read<AuthService>();
+    try {
+      final valid = await auth.validateStoredToken();
+      if (!valid) return;
+      await auth.tryRestoreSession();
+      if (!mounted) return;
+      context.go('/');
+    } finally {
+      if (mounted) setState(() => _checkingSession = false);
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -24,7 +51,7 @@ class LoginScreen extends StatelessWidget {
                         color: Theme.of(context).textTheme.bodyLarge?.color,
                       ),
                     ),
-                    TextSpan(
+                    const TextSpan(
                       text: "O",
                       style: TextStyle(color: Colors.red),
                     ),
@@ -35,7 +62,7 @@ class LoginScreen extends StatelessWidget {
                       ),
                     ),
                   ],
-                  style: TextStyle(
+                  style: const TextStyle(
                     decoration: TextDecoration.none,
                     color: Colors.white,
                     fontFamily: "Tomatoes",
@@ -43,8 +70,17 @@ class LoginScreen extends StatelessWidget {
                   ),
                 ),
               ),
+              if (_checkingSession)
+                const Padding(
+                  padding: EdgeInsets.only(top: 12),
+                  child: SizedBox(
+                    height: 24,
+                    width: 24,
+                    child: CircularProgressIndicator(strokeWidth: 2),
+                  ),
+                ),
               const SizedBox(height: 50),
-            LoginPanel(),
+              const LoginPanel(),
             ],
           ),
         ),

lib/components/pages/calculator_details.dart

@@ -0,0 +1,47 @@
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:mileograph_flutter/components/calculator/route_summary_widget.dart';
+import 'package:mileograph_flutter/objects/objects.dart';
+
+class CalculatorDetailsPage extends StatelessWidget {
+  const CalculatorDetailsPage({
+    super.key,
+    required this.result,
+  });
+
+  final Object? result;
+
+  @override
+  Widget build(BuildContext context) {
+    final parsed = result is RouteResult ? result as RouteResult : null;
+    if (parsed == null) {
+      return Padding(
+        padding: const EdgeInsets.all(16.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            TextButton.icon(
+              onPressed: () => context.pop(),
+              icon: const Icon(Icons.arrow_back),
+              label: const Text('Back'),
+            ),
+            const SizedBox(height: 12),
+            const Text(
+              'No route details available.',
+            ),
+          ],
+        ),
+      );
+    }
+
+    return Padding(
+      padding: const EdgeInsets.all(16.0),
+      child: RouteDetailsView(
+        route: parsed.calculatedRoute,
+        costs: parsed.costs,
+        onBack: () => context.pop(),
+      ),
+    );
+  }
+}
+

lib/components/pages/dashboard.dart

@@ -1,21 +1,30 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
-import 'package:mileograph_flutter/components/dashboard/leaderboardPanel.dart';
-import 'package:mileograph_flutter/components/dashboard/topTractionPanel.dart';
+import 'package:mileograph_flutter/components/dashboard/leaderboard_panel.dart';
+import 'package:mileograph_flutter/components/dashboard/top_traction_panel.dart';
 import 'package:mileograph_flutter/objects/objects.dart';
 import 'package:mileograph_flutter/services/authservice.dart';
-import 'package:mileograph_flutter/services/dataService.dart';
+import 'package:mileograph_flutter/services/data_service.dart';
 import 'package:provider/provider.dart';
 
-class Dashboard extends StatelessWidget {
+class Dashboard extends StatefulWidget {
   const Dashboard({super.key});
 
+  @override
+  State<Dashboard> createState() => _DashboardState();
+}
+
+class _DashboardState extends State<Dashboard> {
+  bool _showAllOnThisDay = false;
+
   @override
   Widget build(BuildContext context) {
     final data = context.watch<DataService>();
     final auth = context.watch<AuthService>();
     final stats = data.homepageStats;
 
+    final isInitialLoading = data.isHomepageLoading || stats == null;
+
     return RefreshIndicator(
       onRefresh: () async {
         await data.fetchHomepageStats();
@@ -34,16 +43,14 @@ class Dashboard extends StatelessWidget {
             currentYearMileage: data.getMileageForCurrentYear(),
             trips: data.trips.length,
           );
-          return ListView(
+          return Stack(
+            children: [
+              ListView(
                 padding: const EdgeInsets.all(16),
                 children: [
                   _buildHeader(context, auth, stats, data.isHomepageLoading),
                   const SizedBox(height: 12),
-              Wrap(
-                spacing: 12,
-                runSpacing: 12,
-                children: metricChips,
-              ),
+                  Wrap(spacing: 12, runSpacing: 12, children: metricChips),
                   const SizedBox(height: 16),
                   isWide
                       ? Row(
@@ -65,16 +72,40 @@ class Dashboard extends StatelessWidget {
                           ],
                         ),
                 ],
+              ),
+              if (isInitialLoading)
+                Positioned.fill(
+                  child: Container(
+                    color: Theme.of(
+                      context,
+                    ).colorScheme.surface.withValues(alpha: 0.7),
+                    child: const Center(
+                      child: Column(
+                        mainAxisSize: MainAxisSize.min,
+                        children: [
+                          CircularProgressIndicator(),
+                          SizedBox(height: 12),
+                          Text('Loading dashboard data...'),
+                        ],
+                      ),
+                    ),
+                  ),
+                ),
+            ],
           );
         },
       ),
     );
   }
 
-  Widget _buildHeader(BuildContext context, AuthService auth,
-      HomepageStats? stats, bool loading) {
+  Widget _buildHeader(
+    BuildContext context,
+    AuthService auth,
+    HomepageStats? stats,
+    bool loading,
+  ) {
     final greetingName =
-        stats?.user?.full_name ?? auth.fullName ?? auth.username ?? 'there';
+        stats?.user?.fullName ?? auth.fullName ?? auth.username ?? 'there';
     return Row(
       mainAxisAlignment: MainAxisAlignment.spaceBetween,
       crossAxisAlignment: CrossAxisAlignment.start,
@@ -82,10 +113,7 @@ class Dashboard extends StatelessWidget {
         Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            Text(
-              'Dashboard',
-              style: Theme.of(context).textTheme.labelMedium,
-            ),
+            Text('Dashboard', style: Theme.of(context).textTheme.labelMedium),
             const SizedBox(height: 2),
             Text(
               'Welcome back, $greetingName',
@@ -93,7 +121,8 @@ class Dashboard extends StatelessWidget {
             ),
           ],
         ),
-        if (loading) const Padding(
+        if (loading)
+          const Padding(
             padding: EdgeInsets.only(right: 8.0),
             child: SizedBox(
               height: 24,
@@ -121,11 +150,13 @@ class Dashboard extends StatelessWidget {
             crossAxisAlignment: CrossAxisAlignment.start,
             mainAxisSize: MainAxisSize.min,
             children: [
-              Text(label.toUpperCase(),
+              Text(
+                label.toUpperCase(),
                 style: textTheme.labelSmall?.copyWith(
                   letterSpacing: 0.7,
-                    color: textTheme.bodySmall?.color?.withOpacity(0.7),
-                  )),
+                  color: textTheme.bodySmall?.color?.withValues(alpha: 0.7),
+                ),
+              ),
               const SizedBox(height: 4),
               Text(
                 value,
@@ -153,6 +184,18 @@ class Dashboard extends StatelessWidget {
         _buildCard(
           context,
           title: 'On this day',
+          action:
+              data.onThisDay
+                      .where((leg) => leg.beginTime.year != DateTime.now().year)
+                      .length >
+                  5
+              ? TextButton(
+                  onPressed: () => setState(() {
+                    _showAllOnThisDay = !_showAllOnThisDay;
+                  }),
+                  child: Text(_showAllOnThisDay ? 'Show less' : 'Show more'),
+                )
+              : null,
           trailing: data.isOnThisDayLoading
               ? const SizedBox(
                   height: 18,
@@ -163,6 +206,7 @@ class Dashboard extends StatelessWidget {
           child: _buildLegList(
             context,
             data.onThisDay,
+            showAll: _showAllOnThisDay,
             emptyMessage: 'No historical moves for today yet.',
           ),
         ),
@@ -203,10 +247,9 @@ class Dashboard extends StatelessWidget {
               children: [
                 Text(
                   title,
-                  style: Theme.of(context)
-                      .textTheme
-                      .titleMedium
-                      ?.copyWith(fontWeight: FontWeight.w700),
+                  style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                    fontWeight: FontWeight.w700,
+                  ),
                 ),
                 Row(
                   mainAxisSize: MainAxisSize.min,
@@ -232,15 +275,17 @@ class Dashboard extends StatelessWidget {
     BuildContext context,
     List<Leg> legs, {
     required String emptyMessage,
+    bool showAll = false,
   }) {
-    if (legs.isEmpty) {
-      return Text(
-        emptyMessage,
-        style: Theme.of(context).textTheme.bodyMedium,
-      );
+    final filtered = legs
+        .where((leg) => leg.beginTime.year != DateTime.now().year)
+        .toList();
+    if (filtered.isEmpty) {
+      return Text(emptyMessage, style: Theme.of(context).textTheme.bodyMedium);
     }
+    final toShow = showAll ? filtered : filtered.take(5).toList();
     return Column(
-      children: legs.take(5).map((leg) {
+      children: toShow.map((leg) {
         return ListTile(
           dense: true,
           contentPadding: EdgeInsets.zero,
@@ -257,10 +302,9 @@ class Dashboard extends StatelessWidget {
               if (leg.headcode.isNotEmpty)
                 Text(
                   leg.headcode,
-                  style: Theme.of(context)
-                      .textTheme
-                      .labelSmall
-                      ?.copyWith(color: Theme.of(context).hintColor),
+                  style: Theme.of(context).textTheme.labelSmall?.copyWith(
+                    color: Theme.of(context).hintColor,
+                  ),
                 ),
             ],
           ),
@@ -286,7 +330,11 @@ class Dashboard extends StatelessWidget {
   }
 
   Widget _buildTripsCard(BuildContext context, DataService data) {
-    final trips = data.trips;
+    final tripsUnsorted = data.trips;
+    List trips = [];
+    if (tripsUnsorted.isNotEmpty) {
+      trips = [...tripsUnsorted]..sort((a, b) => b.tripId.compareTo(a.tripId));
+    }
     return _buildCard(
       context,
       title: 'Trips',

lib/components/pages/legs.dart

@@ -1,5 +1,9 @@
+import 'dart:convert';
+
 import 'package:flutter/material.dart';
-import 'package:mileograph_flutter/services/dataService.dart';
+import 'package:go_router/go_router.dart';
+import 'package:mileograph_flutter/objects/objects.dart';
+import 'package:mileograph_flutter/services/data_service.dart';
 import 'package:provider/provider.dart';
 
 class LegsPage extends StatefulWidget {
@@ -155,25 +159,6 @@ class _LegsPageState extends State<LegsPage> {
                     runSpacing: 12,
                     crossAxisAlignment: WrapCrossAlignment.center,
                     children: [
-                      SegmentedButton<int>(
-                        segments: const [
-                          ButtonSegment(
-                            value: 0,
-                            icon: Icon(Icons.south),
-                            label: Text('Newest first'),
-                          ),
-                          ButtonSegment(
-                            value: 1,
-                            icon: Icon(Icons.north),
-                            label: Text('Oldest first'),
-                          ),
-                        ],
-                        selected: {_sortDirection},
-                        onSelectionChanged: (selection) {
-                          setState(() => _sortDirection = selection.first);
-                          _refreshLegs();
-                        },
-                      ),
                       FilledButton.tonalIcon(
                         onPressed: () => _pickDate(start: true),
                         icon: const Icon(Icons.calendar_month),
@@ -229,37 +214,7 @@ class _LegsPageState extends State<LegsPage> {
           else
             Column(
               children: [
-                ...legs.map((leg) => Card(
-                      child: ListTile(
-                        leading: const Icon(Icons.train),
-                        title: Text('${leg.start} → ${leg.end}'),
-                        subtitle: Column(
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          children: [
-                            Text(_formatDateTime(leg.beginTime)),
-                            if (leg.headcode.isNotEmpty)
-                              Text('Headcode: ${leg.headcode}'),
-                            if (leg.route.isNotEmpty)
-                              Text(
-                                leg.route,
-                                maxLines: 1,
-                                overflow: TextOverflow.ellipsis,
-                              ),
-                          ],
-                        ),
-                        trailing: Column(
-                          mainAxisAlignment: MainAxisAlignment.center,
-                          children: [
-                            Text('${leg.mileage.toStringAsFixed(1)} mi'),
-                            Text(
-                              leg.network,
-                              style: Theme.of(context).textTheme.labelSmall,
-                            ),
-                          ],
-                        ),
-                        isThreeLine: true,
-                      ),
-                    )),
+                ...legs.map((leg) => _buildLegCard(context, leg)),
                 const SizedBox(height: 8),
                 if (data.legsHasMore || data.isLegsLoading)
                   Align(
@@ -297,4 +252,153 @@ class _LegsPageState extends State<LegsPage> {
         '${date.hour.toString().padLeft(2, '0')}:${date.minute.toString().padLeft(2, '0')}';
     return '$dateStr · $timeStr';
   }
+
+  Widget _buildLegCard(BuildContext context, Leg leg) {
+    final routeSegments = _parseRouteSegments(leg.route);
+    final textTheme = Theme.of(context).textTheme;
+    return Card(
+      child: ExpansionTile(
+        tilePadding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
+        leading: const Icon(Icons.train),
+        title: Text('${leg.start} → ${leg.end}'),
+        subtitle: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(_formatDateTime(leg.beginTime)),
+            if (leg.headcode.isNotEmpty)
+              Text(
+                'Headcode: ${leg.headcode}',
+                style: textTheme.labelSmall,
+              ),
+            if (leg.network.isNotEmpty)
+              Text(
+                leg.network,
+                style: textTheme.labelSmall,
+              ),
+          ],
+        ),
+        trailing: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            IconButton(
+              tooltip: 'Edit entry',
+              icon: const Icon(Icons.edit),
+              onPressed: () => context.push('/legs/edit/${leg.id}'),
+            ),
+            Text(
+              '${leg.mileage.toStringAsFixed(1)} mi',
+              style:
+                  textTheme.labelLarge?.copyWith(fontWeight: FontWeight.w700),
+            ),
+            if (leg.tripId != 0)
+              Text(
+                'Trip #${leg.tripId}',
+                style: textTheme.labelSmall,
+              ),
+          ],
+        ),
+        children: [
+          Padding(
+            padding: const EdgeInsets.fromLTRB(16, 0, 16, 12),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                if (leg.notes.isNotEmpty) ...[
+                  Text('Notes', style: textTheme.titleSmall),
+                  const SizedBox(height: 4),
+                  Text(leg.notes),
+                  const SizedBox(height: 12),
+                ],
+                if (leg.locos.isNotEmpty) ...[
+                  Text('Locos', style: textTheme.titleSmall),
+                  const SizedBox(height: 6),
+                  Wrap(
+                    spacing: 8,
+                    runSpacing: 8,
+                    children: _buildLocoChips(context, leg),
+                  ),
+                  const SizedBox(height: 12),
+                ],
+                if (routeSegments.isNotEmpty) ...[
+                  Text('Route', style: textTheme.titleSmall),
+                  const SizedBox(height: 6),
+                  _buildRouteList(routeSegments),
+                ],
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  List<Widget> _buildLocoChips(BuildContext context, Leg leg) {
+    final theme = Theme.of(context);
+    return leg.locos
+        .map(
+          (loco) => Chip(
+            label: Text('${loco.locoClass} ${loco.number}'),
+            avatar: const Icon(Icons.directions_railway, size: 16),
+            backgroundColor: theme.colorScheme.surfaceContainerHighest,
+          ),
+        )
+        .toList();
+  }
+
+  Widget _buildRouteList(List<String> segments) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: segments
+          .map(
+            (segment) => Padding(
+              padding: const EdgeInsets.symmetric(vertical: 4.0),
+              child: Row(
+                children: [
+                  const Icon(Icons.circle, size: 10),
+                  const SizedBox(width: 8),
+                  Expanded(child: Text(segment)),
+                ],
+              ),
+            ),
+          )
+          .toList(),
+    );
+  }
+
+  List<String> _parseRouteSegments(String route) {
+    final trimmed = route.trim();
+    if (trimmed.isEmpty) return [];
+    try {
+      final decoded = jsonDecode(trimmed);
+      if (decoded is List) {
+        return decoded.map((e) => e.toString()).toList();
+      }
+    } catch (_) {
+      // ignore and try alternative parsing
+    }
+    if (trimmed.startsWith('[') && trimmed.endsWith(']')) {
+      try {
+        final replaced = trimmed.replaceAll("'", '"');
+        final decoded = jsonDecode(replaced);
+        if (decoded is List) {
+          return decoded.map((e) => e.toString()).toList();
+        }
+      } catch (_) {}
+    }
+    if (trimmed.contains('->')) {
+      return trimmed
+          .split('->')
+          .map((e) => e.trim())
+          .where((e) => e.isNotEmpty)
+          .toList();
+    }
+    if (trimmed.contains(',')) {
+      return trimmed
+          .split(',')
+          .map((e) => e.trim())
+          .where((e) => e.isNotEmpty)
+          .toList();
+    }
+    return [trimmed];
+  }
 }

lib/components/pages/loco_timeline.dart

@@ -0,0 +1,408 @@
+import 'dart:math' as math;
+
+import 'package:flutter/material.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/services.dart';
+import 'package:intl/intl.dart';
+import 'package:mileograph_flutter/objects/objects.dart';
+import 'package:mileograph_flutter/services/data_service.dart';
+import 'package:provider/provider.dart';
+
+part 'loco_timeline/timeline_grid.dart';
+part 'loco_timeline/event_editor.dart';
+
+class LocoTimelinePage extends StatefulWidget {
+  const LocoTimelinePage({
+    super.key,
+    required this.locoId,
+    required this.locoLabel,
+  });
+
+  final int locoId;
+  final String locoLabel;
+
+  @override
+  State<LocoTimelinePage> createState() => _LocoTimelinePageState();
+}
+
+class _LocoTimelinePageState extends State<LocoTimelinePage> {
+  final List<_EventDraft> _draftEvents = [];
+  bool _isSaving = false;
+  bool _isDeleting = false;
+
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addPostFrameCallback((_) => _load());
+  }
+
+  @override
+  void dispose() {
+    _disposeDrafts(_draftEvents);
+    super.dispose();
+  }
+
+  Future<void> _load() {
+    final data = context.read<DataService>();
+    data.fetchEventFields();
+    return data.fetchLocoTimeline(widget.locoId);
+  }
+
+  void _addDraftEvent() {
+    setState(() {
+      _draftEvents.add(_EventDraft());
+    });
+  }
+
+  String? _eventDateForEntry(LocoAttrVersion entry) {
+    final masked = entry.maskedValidFrom?.trim();
+    if (masked != null && masked.isNotEmpty) return masked;
+    final from = entry.validFrom ?? entry.txnFrom;
+    if (from == null) return null;
+    return DateFormat('yyyy-MM-dd').format(from);
+  }
+
+  EventField? _fieldForAttr(String attrCode, List<EventField> fields) {
+    final normalized = attrCode.trim().toLowerCase();
+    for (final field in fields) {
+      if (field.name.trim().toLowerCase() == normalized) return field;
+    }
+    return null;
+  }
+
+  dynamic _valueForEntry(LocoAttrVersion entry) {
+    if (entry.valueInt != null) return entry.valueInt;
+    if (entry.valueBool != null) return entry.valueBool;
+    if (entry.valueEnum != null && entry.valueEnum!.isNotEmpty) {
+      return entry.valueEnum;
+    }
+    if (entry.valueStr != null && entry.valueStr!.isNotEmpty) {
+      return entry.valueStr;
+    }
+    if (entry.valueDate != null) {
+      return DateFormat('yyyy-MM-dd').format(entry.valueDate!);
+    }
+    if (entry.valueNorm != null && entry.valueNorm.toString().isNotEmpty) {
+      return entry.valueNorm;
+    }
+    final label = entry.valueLabel;
+    return label == '—' ? '' : label;
+  }
+
+  void _prefillDraftFromEntry(LocoAttrVersion entry, List<EventField> fields) {
+    final dateStr = _eventDateForEntry(entry);
+    if (dateStr == null || dateStr.isEmpty) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(content: Text('Cannot edit: timeline block date unknown.')),
+      );
+      return;
+    }
+    final field = _fieldForAttr(entry.attrCode, fields);
+    if (field == null) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(
+          content: Text(
+            'Cannot edit: no event field found for ${_formatAttrLabel(entry.attrCode)}.',
+          ),
+        ),
+      );
+      return;
+    }
+
+    final draft = _EventDraft();
+    draft.dateController.text = dateStr;
+    draft.detailsController.text = '';
+    draft.details = '';
+    draft.fields.add(
+      _FieldEntry(field: field)
+        ..value = _valueForEntry(entry),
+    );
+
+    setState(() {
+      _draftEvents.add(draft);
+    });
+  }
+
+  Future<void> _deleteEntry(LocoAttrVersion entry) async {
+    if (_isDeleting) return;
+    final blockId = entry.versionId;
+    if (blockId == null) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(content: Text('Cannot delete: timeline block has no ID.')),
+      );
+      return;
+    }
+
+    final data = context.read<DataService>();
+    final messenger = ScaffoldMessenger.of(context);
+
+    final dateStr = _eventDateForEntry(entry);
+    final ok = await showDialog<bool>(
+      context: context,
+      builder: (context) {
+        return AlertDialog(
+          title: const Text('Delete timeline block?'),
+          content: Text(
+            dateStr == null || dateStr.isEmpty
+                ? 'This will delete the selected block for ${_formatAttrLabel(entry.attrCode)}.'
+                : 'This will delete the block for ${_formatAttrLabel(entry.attrCode)} starting at $dateStr.',
+          ),
+          actions: [
+            TextButton(
+              onPressed: () => Navigator.of(context).pop(false),
+              child: const Text('Cancel'),
+            ),
+            FilledButton(
+              onPressed: () => Navigator.of(context).pop(true),
+              child: const Text('Delete'),
+            ),
+          ],
+        );
+      },
+    );
+    if (ok != true) return;
+    if (!mounted) return;
+
+    setState(() {
+      _isDeleting = true;
+    });
+    try {
+      await data.deleteTimelineBlock(
+        blockId: blockId,
+      );
+      await _load();
+      if (mounted) {
+        messenger.showSnackBar(
+          const SnackBar(content: Text('Timeline block deleted')),
+        );
+      }
+    } catch (e) {
+      if (mounted) {
+        messenger.showSnackBar(
+          SnackBar(content: Text('Failed to delete timeline block: $e')),
+        );
+      }
+    } finally {
+      if (mounted) {
+        setState(() {
+          _isDeleting = false;
+        });
+      }
+    }
+  }
+
+  void _removeDraftAt(int index) {
+    if (index < 0 || index >= _draftEvents.length) return;
+    final draft = _draftEvents.removeAt(index);
+    _disposeDraft(draft);
+    setState(() {});
+  }
+
+  void _disposeDraft(_EventDraft draft) {
+    draft.dateController.dispose();
+    draft.detailsController.dispose();
+  }
+
+  void _disposeDrafts(List<_EventDraft> drafts) {
+    for (final draft in drafts) {
+      _disposeDraft(draft);
+    }
+  }
+
+  Future<void> _saveEvents() async {
+    if (_isSaving) return;
+    if (!_canSaveDrafts()) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(content: Text('Please fix validation issues before saving.')),
+      );
+      return;
+    }
+    final data = context.read<DataService>();
+    setState(() {
+      _isSaving = true;
+    });
+    try {
+      final invalid = <String>[];
+      for (final draft in _draftEvents) {
+        final dateStr = draft.dateController.text.trim();
+        if (!_isValidDateString(dateStr)) {
+          invalid.add('Date is invalid (${dateStr.isEmpty ? 'empty' : dateStr})');
+          continue;
+        }
+        if (draft.fields.isEmpty) {
+          invalid.add('Add at least one field for each event');
+          continue;
+        }
+        final values = <String, dynamic>{};
+        for (final field in draft.fields) {
+          final val = field.value;
+          final isBlankString = val is String && val.trim().isEmpty;
+          if (val == null || isBlankString) {
+            invalid.add('Field ${field.field.display} is empty');
+            break;
+          }
+          values[field.field.name] = val;
+        }
+        if (invalid.isNotEmpty) continue;
+        if (values.isEmpty) {
+          invalid.add('Add at least one value');
+          continue;
+        }
+        await data.createLocoEvent(
+          locoId: widget.locoId,
+          eventDate: dateStr,
+          values: values,
+          details: draft.details,
+        );
+      }
+      if (invalid.isNotEmpty) {
+        if (mounted) {
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(content: Text(invalid.first)),
+          );
+        }
+        return;
+      }
+      _disposeDrafts(_draftEvents);
+      _draftEvents.clear();
+      await _load();
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          const SnackBar(content: Text('Events saved')),
+        );
+      }
+    } catch (e) {
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Failed to save events: $e')),
+        );
+      }
+    } finally {
+      if (mounted) {
+        setState(() {
+          _isSaving = false;
+        });
+      }
+    }
+  }
+
+  bool _isValidDateString(String input) {
+    final trimmed = input.trim();
+    final regex = RegExp(r'^\d{4}-(\d{2}|xx|XX)-(\d{2}|xx|XX)$');
+    if (!regex.hasMatch(trimmed)) return false;
+    final parts = trimmed.split('-');
+    final monthPart = parts[1];
+    final dayPart = parts[2];
+    final monthUnknown = monthPart.toLowerCase() == 'xx';
+    final dayUnknown = dayPart.toLowerCase() == 'xx';
+    if (monthUnknown && !dayUnknown) return false;
+    if (!monthUnknown) {
+      final month = int.tryParse(monthPart);
+      if (month == null || month < 1 || month > 12) return false;
+    }
+    if (!dayUnknown) {
+      final day = int.tryParse(dayPart);
+      if (day == null || day < 1 || day > 31) return false;
+    }
+    return true;
+  }
+
+  bool _draftIsValid(_EventDraft draft) {
+    final dateStr = draft.dateController.text.trim();
+    if (!_isValidDateString(dateStr)) return false;
+    if (draft.fields.isEmpty) return false;
+    for (final field in draft.fields) {
+      final val = field.value;
+      if (val == null) return false;
+      if (val is String && val.trim().isEmpty) return false;
+    }
+    return true;
+  }
+
+  bool _canSaveDrafts() {
+    if (_draftEvents.isEmpty) return false;
+    return _draftEvents.every(_draftIsValid);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final data = context.watch<DataService>();
+    final timeline = data.timelineForLoco(widget.locoId);
+    final isLoading = data.isLocoTimelineLoading(widget.locoId);
+
+    return Scaffold(
+      appBar: AppBar(
+        leading: IconButton(
+          icon: const Icon(Icons.arrow_back),
+          onPressed: () => Navigator.of(context).maybePop(),
+        ),
+        title: Text('Timeline · ${widget.locoLabel}'),
+      ),
+      body: RefreshIndicator(
+        onRefresh: _load,
+        child: LayoutBuilder(
+          builder: (context, constraints) {
+            if (isLoading && timeline.isEmpty) {
+              return const Center(child: CircularProgressIndicator());
+            }
+            if (timeline.isEmpty) {
+              return Padding(
+                padding: const EdgeInsets.all(16.0),
+                child: Card(
+                  child: Padding(
+                    padding: const EdgeInsets.all(16.0),
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Text(
+                          'No timeline data yet',
+                          style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                                fontWeight: FontWeight.w700,
+                              ),
+                        ),
+                        const SizedBox(height: 8),
+                        const Text(
+                          'This locomotive does not have any attribute history to show right now.',
+                        ),
+                        const SizedBox(height: 12),
+                        OutlinedButton.icon(
+                          onPressed: _load,
+                          icon: const Icon(Icons.refresh),
+                          label: const Text('Try again'),
+                        ),
+                      ],
+                    ),
+                  ),
+                ),
+              );
+            }
+            return ListView(
+              padding: const EdgeInsets.all(16),
+              children: [
+                _TimelineGrid(
+                  entries: timeline,
+                  onEditEntry: (entry) => _prefillDraftFromEntry(
+                    entry,
+                    data.eventFields,
+                  ),
+                  onDeleteEntry: _deleteEntry,
+                ),
+                const SizedBox(height: 16),
+                _EventEditor(
+                  eventFields: data.eventFields,
+                  drafts: _draftEvents,
+                  onAddEvent: _addDraftEvent,
+                  onChange: () => setState(() {}),
+                  onSave: _saveEvents,
+                  onRemoveDraft: _removeDraftAt,
+                  isSaving: _isSaving,
+                  canSave: _canSaveDrafts(),
+                ),
+              ],
+            );
+          },
+        ),
+      ),
+    );
+  }
+}

lib/components/pages/loco_timeline/event_editor.dart

@@ -0,0 +1,331 @@
+part of 'package:mileograph_flutter/components/pages/loco_timeline.dart';
+
+class _EventEditor extends StatelessWidget {
+  const _EventEditor({
+    required this.eventFields,
+    required this.drafts,
+    required this.onAddEvent,
+    required this.onChange,
+    required this.onSave,
+    required this.onRemoveDraft,
+    required this.isSaving,
+    required this.canSave,
+  });
+
+  final List<EventField> eventFields;
+  final List<_EventDraft> drafts;
+  final VoidCallback onAddEvent;
+  final VoidCallback onChange;
+  final Future<void> Function() onSave;
+  final void Function(int index) onRemoveDraft;
+  final bool isSaving;
+  final bool canSave;
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: [
+            Text(
+              'Add events',
+              style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                    fontWeight: FontWeight.w700,
+                  ),
+            ),
+            Row(
+              children: [
+                OutlinedButton.icon(
+                  onPressed: onAddEvent,
+                  icon: const Icon(Icons.add),
+                  label: const Text('New event'),
+                ),
+                const SizedBox(width: 8),
+                FilledButton.icon(
+                  onPressed: (!canSave || isSaving) ? null : onSave,
+                  icon: isSaving
+                      ? const SizedBox(
+                          height: 14,
+                          width: 14,
+                          child: CircularProgressIndicator(strokeWidth: 2),
+                        )
+                      : const Icon(Icons.save),
+                  label: Text(isSaving ? 'Saving...' : 'Save all'),
+                ),
+              ],
+            ),
+          ],
+        ),
+        const SizedBox(height: 12),
+        if (drafts.isEmpty)
+          const Text('No events yet. Add one to propose new values.')
+        else
+          ...drafts.asMap().entries.map(
+            (entry) {
+              final idx = entry.key;
+              final draft = entry.value;
+              return Padding(
+                padding: const EdgeInsets.only(bottom: 12.0),
+                child: Card(
+                  child: Padding(
+                    padding: const EdgeInsets.all(12.0),
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Row(
+                          children: [
+                            Text(
+                              'Event ${idx + 1}',
+                              style: Theme.of(context).textTheme.titleMedium,
+                            ),
+                            const Spacer(),
+                            IconButton(
+                              tooltip: 'Remove',
+                              onPressed: () => onRemoveDraft(idx),
+                              icon: const Icon(Icons.delete_outline),
+                            ),
+                          ],
+                        ),
+                        const SizedBox(height: 8),
+                        Row(
+                          children: [
+                            Expanded(
+                              child: TextField(
+                                controller: draft.dateController,
+                                onChanged: (_) => onChange(),
+                                decoration: const InputDecoration(
+                                  labelText: 'Date (YYYY-MM-DD, MM/DD can be XX)',
+                                  border: OutlineInputBorder(),
+                                ),
+                              ),
+                            ),
+                            IconButton(
+                              tooltip: 'Pick date',
+                              onPressed: () async {
+                                final now = DateTime.now();
+                                final picked = await showDatePicker(
+                                  context: context,
+                                  initialDate: draft.date ?? now,
+                                  firstDate: DateTime(1900),
+                                  lastDate: DateTime(now.year + 10),
+                                );
+                                if (picked != null) {
+                                  draft.date = picked;
+                                  draft.dateController.text =
+                                      DateFormat('yyyy-MM-dd').format(picked);
+                                  onChange();
+                                }
+                              },
+                              icon: const Icon(Icons.calendar_month),
+                            ),
+                          ],
+                        ),
+                        const SizedBox(height: 8),
+                        _FieldList(
+                          draft: draft,
+                          eventFields: eventFields,
+                          onChange: onChange,
+                        ),
+                        const SizedBox(height: 12),
+                        TextField(
+                          controller: draft.detailsController,
+                          onChanged: (val) {
+                            draft.details = val;
+                            onChange();
+                          },
+                          decoration: const InputDecoration(
+                            labelText: 'Commit message / details',
+                            border: OutlineInputBorder(),
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                ),
+              );
+            },
+          ),
+      ],
+    );
+  }
+}
+
+class _FieldList extends StatelessWidget {
+  const _FieldList({
+    required this.draft,
+    required this.eventFields,
+    required this.onChange,
+  });
+
+  final _EventDraft draft;
+  final List<EventField> eventFields;
+  final VoidCallback onChange;
+
+  @override
+  Widget build(BuildContext context) {
+    final usedNames = draft.fields.map((f) => f.field.name).toSet();
+    final availableFields =
+        eventFields.where((f) => !usedNames.contains(f.name)).toList();
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Row(
+          children: [
+            Text(
+              'Fields',
+              style: Theme.of(context).textTheme.titleSmall,
+            ),
+            const Spacer(),
+            DropdownButton<EventField>(
+              hint: const Text('Add field'),
+              value: null,
+              onChanged: (field) {
+                if (field == null) return;
+                draft.fields.add(_FieldEntry(field: field));
+                onChange();
+              },
+              items: availableFields
+                  .map(
+                    (f) => DropdownMenuItem(
+                      value: f,
+                      child: Text(f.display),
+                    ),
+                  )
+                  .toList(),
+            ),
+          ],
+        ),
+        const SizedBox(height: 8),
+        if (draft.fields.isEmpty)
+          const Text('No fields added yet.')
+        else
+          ...draft.fields.asMap().entries.map(
+            (entry) {
+              final idx = entry.key;
+              final field = entry.value;
+              return Padding(
+                padding: const EdgeInsets.symmetric(vertical: 6.0),
+                child: Row(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Expanded(
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Text(
+                            field.field.display,
+                            style: Theme.of(context)
+                                .textTheme
+                                .labelLarge
+                                ?.copyWith(fontWeight: FontWeight.w700),
+                          ),
+                          const SizedBox(height: 4),
+                          _FieldInput(
+                            field: field.field,
+                            value: field.value,
+                            onChanged: (val) {
+                              field.value = val;
+                              onChange();
+                            },
+                          ),
+                        ],
+                      ),
+                    ),
+                    IconButton(
+                      onPressed: () {
+                        draft.fields.removeAt(idx);
+                        onChange();
+                      },
+                      icon: const Icon(Icons.close),
+                    ),
+                  ],
+                ),
+              );
+            },
+          ),
+      ],
+    );
+  }
+}
+
+class _FieldInput extends StatelessWidget {
+  const _FieldInput({
+    required this.field,
+    required this.value,
+    required this.onChanged,
+  });
+
+  final EventField field;
+  final dynamic value;
+  final ValueChanged<dynamic> onChanged;
+
+  @override
+  Widget build(BuildContext context) {
+    if (field.enumValues != null && field.enumValues!.isNotEmpty) {
+      final options = field.enumValues!;
+      return DropdownButtonFormField<String>(
+        value: value is String && options.contains(value) ? value : null,
+        decoration: const InputDecoration(border: OutlineInputBorder()),
+        items: options
+            .map((v) => DropdownMenuItem<String>(value: v, child: Text(v)))
+            .toList(),
+        onChanged: (val) => onChanged(val),
+        hint: const Text('Select value'),
+      );
+    }
+
+    final type = field.type?.toLowerCase();
+    if (type == 'bool' || type == 'boolean') {
+      final bool? current =
+          value is bool ? value : (value is String ? value == 'true' : null);
+      return DropdownButtonFormField<bool>(
+        value: current,
+        decoration: const InputDecoration(border: OutlineInputBorder()),
+        items: const [
+          DropdownMenuItem(value: true, child: Text('Yes')),
+          DropdownMenuItem(value: false, child: Text('No')),
+        ],
+        onChanged: (val) => onChanged(val),
+        hint: const Text('Select'),
+      );
+    }
+
+    final isNumber = type == 'int' || type == 'integer';
+    return TextFormField(
+      initialValue: value?.toString(),
+      onChanged: (val) {
+        if (isNumber) {
+          final parsed = int.tryParse(val);
+          onChanged(parsed);
+        } else {
+          onChanged(val);
+        }
+      },
+      decoration: const InputDecoration(
+        border: OutlineInputBorder(),
+        hintText: 'Enter value',
+      ),
+      keyboardType: isNumber ? TextInputType.number : TextInputType.text,
+    );
+  }
+}
+
+class _EventDraft {
+  DateTime? date;
+  String details = '';
+  final TextEditingController detailsController = TextEditingController();
+  final TextEditingController dateController = TextEditingController();
+  final List<_FieldEntry> fields = [];
+
+  _EventDraft();
+}
+
+class _FieldEntry {
+  final EventField field;
+  dynamic value;
+
+  _FieldEntry({required this.field});
+}

lib/components/pages/loco_timeline/timeline_grid.dart

@@ -0,0 +1,784 @@
+part of 'package:mileograph_flutter/components/pages/loco_timeline.dart';
+
+final DateFormat _dateFormat = DateFormat('yyyy-MM-dd');
+
+class _TimelineGrid extends StatefulWidget {
+  const _TimelineGrid({
+    required this.entries,
+    this.onEditEntry,
+    this.onDeleteEntry,
+  });
+
+  final List<LocoAttrVersion> entries;
+  final void Function(LocoAttrVersion entry)? onEditEntry;
+  final void Function(LocoAttrVersion entry)? onDeleteEntry;
+
+  @override
+  State<_TimelineGrid> createState() => _TimelineGridState();
+}
+
+class _TimelineGridState extends State<_TimelineGrid> {
+  final ScrollController _horizontalController = ScrollController();
+  final ScrollController _rightVerticalController = ScrollController();
+  final ScrollController _leftVerticalController = ScrollController();
+  bool _isSyncingScroll = false;
+  double _scrollOffset = 0;
+
+  @override
+  void initState() {
+    super.initState();
+    _rightVerticalController.addListener(_syncVerticalScroll);
+    _horizontalController.addListener(_onHorizontalScroll);
+  }
+
+  @override
+  void dispose() {
+    _rightVerticalController.removeListener(_syncVerticalScroll);
+    _horizontalController.removeListener(_onHorizontalScroll);
+    _horizontalController.dispose();
+    _rightVerticalController.dispose();
+    _leftVerticalController.dispose();
+    super.dispose();
+  }
+
+  void _syncVerticalScroll() {
+    if (_isSyncingScroll) return;
+    if (!_leftVerticalController.hasClients ||
+        !_rightVerticalController.hasClients) {
+      return;
+    }
+    _isSyncingScroll = true;
+    _leftVerticalController.jumpTo(
+      _rightVerticalController.offset.clamp(
+        0.0,
+        _leftVerticalController.position.maxScrollExtent,
+      ),
+    );
+    _isSyncingScroll = false;
+  }
+
+  void _onHorizontalScroll() {
+    if (!mounted) return;
+    setState(() {
+      _scrollOffset = _horizontalController.offset;
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final filteredEntries = widget.entries.where((e) {
+      final code = e.attrCode.toLowerCase();
+      return !{
+        'operational',
+        'gettable',
+        'build_prec',
+        'build_year',
+        'build_month',
+        'build_day',
+      }.contains(code);
+    }).toList();
+    final model = _TimelineModel.fromEntries(filteredEntries);
+    final axisSegments = model.axisSegments;
+    const labelWidth = 110.0;
+    const rowHeight = 52.0;
+    const double axisHeight = 48;
+    final rows = model.attrRows.entries.toList();
+    final totalRowsHeight = rows.length * rowHeight;
+    final axisWidth = math.max(model.axisTotalWidth, 120.0);
+    final double viewHeight = totalRowsHeight + axisHeight + 8;
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        SizedBox(
+          height: viewHeight,
+          child: Row(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              SizedBox(
+                width: labelWidth,
+                child: Column(
+                  children: [
+                    SizedBox(
+                      height: axisHeight,
+                      child: Align(
+                        alignment: Alignment.centerLeft,
+                        child: Text(
+                          'Attribute',
+                          style: Theme.of(context).textTheme.labelLarge?.copyWith(
+                                fontWeight: FontWeight.w700,
+                              ),
+                        ),
+                      ),
+                    ),
+                    Expanded(
+                      child: Scrollbar(
+                        controller: _leftVerticalController,
+                        thumbVisibility: true,
+                        child: ListView.builder(
+                          controller: _leftVerticalController,
+                          physics: const NeverScrollableScrollPhysics(),
+                          itemExtent: rowHeight,
+                          itemCount: rows.length,
+                          itemBuilder: (_, index) {
+                            final label = _formatAttrLabel(rows[index].key);
+                            return Container(
+                              alignment: Alignment.centerLeft,
+                              padding: const EdgeInsets.symmetric(
+                                horizontal: 10,
+                              ),
+                              decoration: BoxDecoration(
+                                color: Theme.of(context)
+                                    .colorScheme
+                                    .surfaceContainerHighest,
+                                border: Border(
+                                  bottom: BorderSide(
+                                    color:
+                                        Theme.of(context).colorScheme.outlineVariant,
+                                  ),
+                                ),
+                              ),
+                              child: Text(
+                                label,
+                                style: Theme.of(context)
+                                    .textTheme
+                                    .labelLarge
+                                    ?.copyWith(fontWeight: FontWeight.w700),
+                              ),
+                            );
+                          },
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+              const SizedBox(width: 8),
+              Expanded(
+                child: Scrollbar(
+                  controller: _horizontalController,
+                  thumbVisibility: true,
+                  child: SingleChildScrollView(
+                    controller: _horizontalController,
+                    scrollDirection: Axis.horizontal,
+                    child: SizedBox(
+                      width: axisWidth,
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          _AxisRow(
+                            segments: axisSegments,
+                            totalWidth: axisWidth,
+                            endLabel: model.endLabel,
+                          ),
+                          const SizedBox(height: 8),
+                          Expanded(
+                            child: ListView.builder(
+                              controller: _rightVerticalController,
+                              itemExtent: rowHeight,
+                              itemCount: rows.length,
+                              itemBuilder: (_, index) {
+                                final blocks = rows[index].value;
+                                return Padding(
+                                  padding:
+                                      const EdgeInsets.symmetric(vertical: 2.0),
+                                  child: _AttrRow(
+                                    rowHeight: rowHeight,
+                                    blocks: blocks,
+                                    model: model,
+                                    scrollOffset: _scrollOffset,
+                                    viewportWidth: axisWidth,
+                                    onEditEntry: widget.onEditEntry,
+                                    onDeleteEntry: widget.onDeleteEntry,
+                                  ),
+                                );
+                              },
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+class _AxisRow extends StatelessWidget {
+  const _AxisRow({
+    required this.segments,
+    required this.endLabel,
+    required this.totalWidth,
+  });
+
+  final List<_AxisSegment> segments;
+  final String endLabel;
+  final double totalWidth;
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    const double axisHeight = 48;
+    return SizedBox(
+      width: totalWidth,
+      height: axisHeight,
+      child: Stack(
+        children: [
+          for (int i = 0; i < segments.length; i++) ...[
+            Positioned(
+              left: segments[i].offset,
+              width: segments[i].width,
+              top: 0,
+              bottom: 0,
+              child: Align(
+                alignment: Alignment.centerLeft,
+                child: Text(
+                  segments[i].label,
+                  overflow: TextOverflow.ellipsis,
+                  maxLines: 1,
+                  style: theme.textTheme.labelSmall,
+                ),
+              ),
+            ),
+          ],
+          Positioned(
+            right: 0,
+            top: 0,
+            bottom: 0,
+            child: Align(
+              alignment: Alignment.centerRight,
+              child: Text(
+                endLabel,
+                overflow: TextOverflow.ellipsis,
+                maxLines: 1,
+                style: theme.textTheme.labelSmall,
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _AttrRow extends StatelessWidget {
+  const _AttrRow({
+    required this.rowHeight,
+    required this.blocks,
+    required this.model,
+    required this.scrollOffset,
+    required this.viewportWidth,
+    this.onEditEntry,
+    this.onDeleteEntry,
+  });
+
+  final double rowHeight;
+  final List<_ValueBlock> blocks;
+  final _TimelineModel model;
+  final double scrollOffset;
+  final double viewportWidth;
+  final void Function(LocoAttrVersion entry)? onEditEntry;
+  final void Function(LocoAttrVersion entry)? onDeleteEntry;
+
+  @override
+  Widget build(BuildContext context) {
+    final width = math.max(model.axisTotalWidth, 120.0);
+    final activeBlock = _activeBlock(blocks, scrollOffset);
+    final double stickyWidth = activeBlock == null
+        ? 0
+        : (activeBlock.right - scrollOffset).clamp(20.0, viewportWidth);
+
+    return SizedBox(
+      width: width,
+      height: rowHeight,
+      child: Stack(
+        clipBehavior: Clip.hardEdge,
+        children: [
+          for (final block in blocks)
+            Positioned(
+              left: block.left,
+              width: block.width,
+              top: 0,
+              bottom: 0,
+              child: _ValueBlockMenu(
+                block: block,
+                onEditEntry: onEditEntry,
+                onDeleteEntry: onDeleteEntry,
+              ),
+            ),
+          if (activeBlock != null)
+            Positioned(
+              left: scrollOffset,
+              width: stickyWidth,
+              top: 0,
+              bottom: 0,
+              child: IgnorePointer(
+                child: ClipRect(
+                  child: _ValueBlockView(
+                    block: activeBlock.copyWith(
+                      left: scrollOffset,
+                      width: stickyWidth,
+                    ),
+                    clipLeftEdge: scrollOffset > activeBlock.left + 0.1,
+                  ),
+                ),
+              ),
+            ),
+        ],
+      ),
+    );
+  }
+
+  _ValueBlock? _activeBlock(List<_ValueBlock> blocks, double offset) {
+    for (final block in blocks) {
+      if (offset >= block.left && offset < block.right) return block;
+    }
+    return null;
+  }
+}
+
+class _ValueBlockView extends StatelessWidget {
+  const _ValueBlockView({
+    required this.block,
+    this.clipLeftEdge = false,
+  });
+
+  final _ValueBlock block;
+  final bool clipLeftEdge;
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final color = block.cell.color.withValues(alpha: 0.9);
+    final textColor = ThemeData.estimateBrightnessForColor(color) ==
+            Brightness.dark
+        ? Colors.white
+        : Colors.black87;
+
+    final radius = BorderRadius.only(
+      topLeft: Radius.circular(clipLeftEdge ? 0 : 12),
+      bottomLeft: Radius.circular(clipLeftEdge ? 0 : 12),
+      topRight: const Radius.circular(12),
+      bottomRight: const Radius.circular(12),
+    );
+
+    return ClipRRect(
+      borderRadius: radius,
+      child: Container(
+        padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 8),
+        decoration: BoxDecoration(
+          color: block.cell.value.isEmpty
+              ? theme.colorScheme.surfaceContainerHighest
+              : color,
+          borderRadius: BorderRadius.zero,
+          border: Border.all(color: theme.colorScheme.outlineVariant),
+        ),
+        child: block.cell.value.isEmpty
+            ? const SizedBox.shrink()
+            : FittedBox(
+                alignment: Alignment.topLeft,
+                fit: BoxFit.scaleDown,
+                child: ConstrainedBox(
+                  constraints: const BoxConstraints(minWidth: 1, minHeight: 1),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: [
+                      Text(
+                        block.cell.value,
+                        maxLines: 1,
+                        overflow: TextOverflow.ellipsis,
+                        style: theme.textTheme.bodyMedium?.copyWith(
+                              fontWeight: FontWeight.w700,
+                              color: textColor,
+                            ) ??
+                            TextStyle(
+                              fontWeight: FontWeight.w700,
+                              color: textColor,
+                            ),
+                      ),
+                      const SizedBox(height: 4),
+                      Text(
+                        block.cell.rangeLabel,
+                        maxLines: 1,
+                        overflow: TextOverflow.ellipsis,
+                        style: theme.textTheme.labelSmall?.copyWith(
+                              color: textColor.withValues(alpha: 0.9),
+                            ) ??
+                            TextStyle(color: textColor.withValues(alpha: 0.9)),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+      ),
+    );
+  }
+}
+
+enum _TimelineBlockAction { edit, delete }
+
+class _ValueBlockMenu extends StatelessWidget {
+  const _ValueBlockMenu({
+    required this.block,
+    this.onEditEntry,
+    this.onDeleteEntry,
+  });
+
+  final _ValueBlock block;
+  final void Function(LocoAttrVersion entry)? onEditEntry;
+  final void Function(LocoAttrVersion entry)? onDeleteEntry;
+
+  bool get _hasActions => onEditEntry != null || onDeleteEntry != null;
+
+  @override
+  Widget build(BuildContext context) {
+    if (!_hasActions || block.entry == null) {
+      return _ValueBlockView(block: block);
+    }
+
+    return GestureDetector(
+      behavior: HitTestBehavior.opaque,
+      onLongPressStart: (details) async {
+        final overlay = Overlay.of(context);
+        final renderBox = overlay.context.findRenderObject() as RenderBox?;
+        if (renderBox == null) return;
+        if (defaultTargetPlatform == TargetPlatform.android) {
+          HapticFeedback.lightImpact();
+        }
+        final anchor = details.globalPosition + const Offset(0, -8);
+        final position = RelativeRect.fromRect(
+          Rect.fromLTWH(
+            anchor.dx,
+            anchor.dy,
+            1,
+            1,
+          ),
+          Offset.zero & renderBox.size,
+        );
+
+        final action = await showMenu<_TimelineBlockAction>(
+          context: context,
+          position: position,
+          items: [
+            if (onEditEntry != null)
+              const PopupMenuItem(
+                value: _TimelineBlockAction.edit,
+                child: Text('Edit'),
+              ),
+            if (onDeleteEntry != null)
+              const PopupMenuItem(
+                value: _TimelineBlockAction.delete,
+                child: Text('Delete'),
+              ),
+          ],
+        );
+
+        final entry = block.entry;
+        if (action == null || entry == null) return;
+        switch (action) {
+          case _TimelineBlockAction.edit:
+            onEditEntry?.call(entry);
+            break;
+          case _TimelineBlockAction.delete:
+            onDeleteEntry?.call(entry);
+            break;
+        }
+      },
+      child: _ValueBlockView(block: block),
+    );
+  }
+}
+
+String? _formatDate(DateTime? date) {
+  if (date == null) return null;
+  return _dateFormat.format(date);
+}
+
+String _formatAttrLabel(String code) {
+  if (code.isEmpty) return 'Attribute';
+  final parts = code.split('_').where((p) => p.isNotEmpty).toList();
+  if (parts.isEmpty) return code;
+  return parts
+      .map((part) => part.length == 1
+          ? part.toUpperCase()
+          : part[0].toUpperCase() + part.substring(1))
+      .join(' ');
+}
+
+DateTime? _parseDateString(String? value) {
+  if (value == null || value.isEmpty) return null;
+  return DateTime.tryParse(value);
+}
+
+DateTime? _effectiveStart(LocoAttrVersion entry) {
+  return entry.validFrom ??
+      _parseDateString(entry.maskedValidFrom) ??
+      entry.txnFrom;
+}
+
+DateTime _safeEnd(DateTime start, DateTime? end) {
+  if (end == null || !end.isAfter(start)) {
+    return start.add(const Duration(days: 1));
+  }
+  return end;
+}
+
+class _TimelineModel {
+  final List<_AxisSegment> axisSegments;
+  final Map<String, List<_ValueBlock>> attrRows;
+  final String endLabel;
+  final List<DateTime> boundaries;
+  final double axisTotalWidth;
+
+  _TimelineModel({
+    required this.axisSegments,
+    required this.attrRows,
+    required this.endLabel,
+    required this.boundaries,
+    required this.axisTotalWidth,
+  });
+
+  factory _TimelineModel.fromEntries(List<LocoAttrVersion> entries) {
+    final grouped = <String, List<LocoAttrVersion>>{};
+    for (final entry in entries) {
+      grouped.putIfAbsent(entry.attrCode, () => []).add(entry);
+    }
+    final now = DateTime.now();
+    DateTime? minStart;
+    DateTime? maxEnd;
+    final attrSegments = <String, List<_ValueSegment>>{};
+
+    grouped.forEach((attr, items) {
+      items.sort(
+        (a, b) => (_effectiveStart(a) ?? now)
+            .compareTo(_effectiveStart(b) ?? now),
+      );
+      final segments = <_ValueSegment>[];
+      for (int i = 0; i < items.length; i++) {
+        final entry = items[i];
+        final start = _effectiveStart(entry) ?? now;
+        final nextStart = i < items.length - 1
+            ? _effectiveStart(items[i + 1])
+            : null;
+        final rawEnd = entry.validTo ?? nextStart ?? now;
+        final end = _safeEnd(start, rawEnd);
+        segments.add(
+          _ValueSegment(
+            start: start,
+            end: end,
+            value: entry.valueLabel,
+            entry: entry,
+          ),
+        );
+        minStart = minStart == null || start.isBefore(minStart!)
+            ? start
+            : minStart;
+        maxEnd = maxEnd == null || end.isAfter(maxEnd!) ? end : maxEnd;
+      }
+      attrSegments[attr] = segments;
+    });
+
+    minStart ??= now.subtract(const Duration(days: 1));
+    final effectiveMaxEnd = maxEnd ?? now;
+
+    final boundaryDates = <DateTime>{};
+    for (final segments in attrSegments.values) {
+      for (final seg in segments) {
+        boundaryDates.add(seg.start);
+        boundaryDates.add(seg.end);
+      }
+    }
+    boundaryDates.add(effectiveMaxEnd);
+    var boundaries = boundaryDates.toList()..sort();
+    if (boundaries.length < 2) {
+      boundaries = [minStart!, effectiveMaxEnd];
+    }
+
+    final axisSegments = <_AxisSegment>[];
+    const double yearWidth = 240.0;
+    for (int i = 0; i < boundaries.length - 1; i++) {
+      final start = boundaries[i];
+      final end = boundaries[i + 1];
+      const width = yearWidth;
+      final double offset = axisSegments.isEmpty
+          ? 0.0
+          : axisSegments.last.offset + axisSegments.last.width;
+      axisSegments.add(
+        _AxisSegment(
+          start: start,
+          end: end,
+          width: width,
+          offset: offset,
+          label: _formatDate(start) ?? '',
+        ),
+      );
+    }
+    final axisTotalWidth =
+        axisSegments.fold<double>(0, (sum, seg) => sum + seg.width);
+
+    final attrRows = <String, List<_ValueBlock>>{};
+    for (final entry in attrSegments.entries) {
+      final blocks = <_ValueBlock>[];
+      for (final seg in entry.value) {
+        final left = _positionForDate(seg.start, boundaries, axisSegments);
+        final right = _positionForDate(seg.end, boundaries, axisSegments);
+        final span = right - left;
+        final width = span < 2.0 ? 2.0 : span;
+        blocks.add(
+          _ValueBlock(
+            left: left,
+            width: width,
+            cell: _RowCell.fromSegment(seg),
+            entry: seg.entry,
+          ),
+        );
+      }
+      attrRows[entry.key] = blocks;
+    }
+
+    final endLabel = _formatDate(effectiveMaxEnd) ?? 'Now';
+    return _TimelineModel(
+      axisSegments: axisSegments,
+      attrRows: attrRows,
+      endLabel: endLabel,
+      boundaries: boundaries,
+      axisTotalWidth: axisTotalWidth,
+    );
+  }
+
+  static double _positionForDate(
+    DateTime date,
+    List<DateTime> boundaries,
+    List<_AxisSegment> segments,
+  ) {
+    for (int i = 0; i < boundaries.length - 1; i++) {
+      final start = boundaries[i];
+      final end = boundaries[i + 1];
+      if (!date.isAfter(end)) {
+        final seg = segments[i];
+        final span = end.difference(start).inMilliseconds;
+        final elapsed = date.difference(start).inMilliseconds.clamp(0, span);
+        if (span <= 0) return seg.offset;
+        final fraction = elapsed / span;
+        return seg.offset + (seg.width * fraction);
+      }
+    }
+    return segments.isNotEmpty
+        ? segments.last.offset + segments.last.width
+        : 0.0;
+  }
+}
+
+class _AxisSegment {
+  final DateTime start;
+  final DateTime end;
+  final double width;
+  final double offset;
+  final String label;
+
+  _AxisSegment({
+    required this.start,
+    required this.end,
+    required this.width,
+    required this.offset,
+    required this.label,
+  });
+}
+
+class _ValueSegment {
+  final DateTime start;
+  final DateTime end;
+  final String value;
+  final LocoAttrVersion? entry;
+
+  _ValueSegment({
+    required this.start,
+    required this.end,
+    required this.value,
+    this.entry,
+  });
+
+  bool overlaps(DateTime s, DateTime e) {
+    return start.isBefore(e) && end.isAfter(s);
+  }
+
+  _ValueSegment copyWith({DateTime? start, DateTime? end, String? value}) {
+    return _ValueSegment(
+      start: start ?? this.start,
+      end: end ?? this.end,
+      value: value ?? this.value,
+      entry: entry,
+    );
+  }
+}
+
+class _RowCell {
+  final String value;
+  final String rangeLabel;
+  final Color color;
+
+  const _RowCell({
+    required this.value,
+    required this.rangeLabel,
+    required this.color,
+  });
+
+  factory _RowCell.fromSegment(_ValueSegment seg) {
+    if (seg.value.isEmpty) {
+      return const _RowCell(
+        value: '',
+        rangeLabel: '',
+        color: Colors.transparent,
+      );
+    }
+    final displayStart = _formatDate(seg.start) ?? '';
+    return _RowCell(
+      value: seg.value,
+      rangeLabel: displayStart,
+      color: _colorForValue(seg.value),
+    );
+  }
+}
+
+class _ValueBlock {
+  final double left;
+  final double width;
+  final _RowCell cell;
+  final LocoAttrVersion? entry;
+
+  const _ValueBlock({
+    required this.left,
+    required this.width,
+    required this.cell,
+    required this.entry,
+  });
+
+  double get right => left + width;
+
+  _ValueBlock copyWith({
+    double? left,
+    double? width,
+    _RowCell? cell,
+    LocoAttrVersion? entry,
+  }) {
+    return _ValueBlock(
+      left: left ?? this.left,
+      width: width ?? this.width,
+      cell: cell ?? this.cell,
+      entry: entry ?? this.entry,
+    );
+  }
+}
+
+Color _colorForValue(String value) {
+  final hue = (value.hashCode % 360).toDouble();
+  final hsl = HSLColor.fromAHSL(1, hue, 0.55, 0.55);
+  return hsl.toColor();
+}

lib/components/pages/new_traction.dart

@@ -0,0 +1,616 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+import 'package:mileograph_flutter/services/data_service.dart';
+
+enum _SpeedUnit { kph, mph }
+
+class NewTractionPage extends StatefulWidget {
+  const NewTractionPage({super.key});
+
+  @override
+  State<NewTractionPage> createState() => _NewTractionPageState();
+}
+
+class _NewTractionPageState extends State<NewTractionPage> {
+  final _formKey = GlobalKey<FormState>();
+  late final Map<String, TextEditingController> _controllers;
+  bool _preserved = false;
+  bool _remoteControl = false;
+  bool _cabAirConditioning = false;
+  bool _cabDoorControl = false;
+  bool _submitting = false;
+  _SpeedUnit _speedUnit = _SpeedUnit.kph;
+  String _status = 'unknown';
+  String _domain = 'unknown';
+  String _type = 'O';
+
+  static const _typeOptions = ['D', 'E', 'U', 'S', 'DMU', 'EMU', 'SMU', 'O'];
+
+  static const _domainOptions = [
+    'mainline',
+    'heritage',
+    'industrial',
+    'museum',
+    'private',
+    'unknown',
+  ];
+
+  static const _statusOptions = [
+    'active',
+    'stored',
+    'overhaul',
+    'withdrawn',
+    'preserved',
+    'scrapped',
+    'unknown',
+  ];
+
+  @override
+  void initState() {
+    super.initState();
+    _controllers = {
+      'number': TextEditingController(),
+      'evn': TextEditingController(),
+      'name': TextEditingController(),
+      'class': TextEditingController(),
+      'operator': TextEditingController(),
+      'notes': TextEditingController(),
+      'livery': TextEditingController(),
+      'location': TextEditingController(),
+      'owner': TextEditingController(),
+      'power_unit': TextEditingController(),
+      'headlights': TextEditingController(),
+      'pantograph': TextEditingController(),
+      'misc': TextEditingController(),
+      'coupling': TextEditingController(),
+      'axle_arrangement': TextEditingController(),
+      'track_gauge': TextEditingController(),
+      'loco_braking': TextEditingController(),
+      'train_braking': TextEditingController(),
+      'max_speed': TextEditingController(),
+      'buffer_type': TextEditingController(),
+      'drawgear_strength': TextEditingController(),
+      'train_heating': TextEditingController(),
+      'route_restriction': TextEditingController(),
+      'safety_systems': TextEditingController(),
+      'width': TextEditingController(),
+      'height': TextEditingController(),
+      'length': TextEditingController(),
+      'weight': TextEditingController(),
+      'power': TextEditingController(),
+      'tractive_effort': TextEditingController(),
+      'electrical_voltage': TextEditingController(),
+      'traction_motors': TextEditingController(),
+      'build_date': TextEditingController(),
+    };
+  }
+
+  @override
+  void dispose() {
+    for (final controller in _controllers.values) {
+      controller.dispose();
+    }
+    super.dispose();
+  }
+
+  String _value(String key, {String fallback = ''}) {
+    final text = _controllers[key]?.text.trim() ?? '';
+    if (text.isEmpty) return fallback;
+    return text;
+  }
+
+  String? _textOrNull(String key) {
+    final text = _controllers[key]?.text.trim() ?? '';
+    if (text.isEmpty) return null;
+    return text;
+  }
+
+  num? _parseNumber(String key) {
+    final raw = _controllers[key]?.text.trim();
+    if (raw == null || raw.isEmpty) return null;
+    final parsed = double.tryParse(raw);
+    if (parsed == null) return null;
+    return parsed % 1 == 0 ? parsed.toInt() : parsed;
+  }
+
+  bool get _statusIsActive => _status.toLowerCase() == 'active';
+
+  String? _validateBuildDate(String? input) {
+    final value = (input ?? '').trim();
+    if (value.isEmpty) return null;
+
+    final regex = RegExp(
+      r'^(\d{2})(\d{2}|[Xx]{2})-((0[1-9]|1[0-2])|[Xx]{2})-((0[1-9]|[12]\d|3[01])|[Xx]{2})$',
+    );
+    final match = regex.firstMatch(value);
+    if (match == null) {
+      return 'Use YYYY-MM-DD; allow XX for unknown DD/YY';
+    }
+
+    final year = match.group(1)! + match.group(2)!;
+    final monthPart = match.group(3)!;
+    final dayPart = match.group(4)!;
+    final monthUnknown = monthPart.toLowerCase() == 'xx';
+    final dayUnknown = dayPart.toLowerCase() == 'xx';
+
+    if (monthUnknown && !dayUnknown) {
+      return 'If month is XX, day must be XX';
+    }
+
+    // Validate actual calendar date when fully specified and year is numeric.
+    final yearHasUnknown = year.toLowerCase().contains('x');
+    if (!monthUnknown && !dayUnknown && !yearHasUnknown) {
+      final month = int.parse(monthPart);
+      final day = int.parse(dayPart);
+      final yearInt = int.parse(year);
+      try {
+        final dt = DateTime(yearInt, month, day);
+        if (dt.year != yearInt || dt.month != month || dt.day != day) {
+          return 'Enter a valid calendar date';
+        }
+      } catch (_) {
+        return 'Enter a valid calendar date';
+      }
+    }
+
+    return null;
+  }
+
+  double? _maxSpeedInKph() {
+    final raw = _controllers['max_speed']?.text.trim();
+    if (raw == null || raw.isEmpty) return null;
+    final parsed = double.tryParse(raw);
+    if (parsed == null) return null;
+    if (_speedUnit == _SpeedUnit.kph) return parsed;
+    return parsed * 1.60934;
+  }
+
+  Map<String, dynamic> _buildPayload() {
+    final isActive = _statusIsActive;
+    final payload = <String, dynamic>{
+      'number': _value('number'),
+      'class': _value('class'),
+      'type': _type,
+      'status': _status,
+      'operational': isActive,
+      'gettable': isActive,
+      'preserved': _preserved,
+      'remote_control': _remoteControl,
+      'cab_air_conditioning': _cabAirConditioning,
+      'cab_door_control': _cabDoorControl,
+    };
+
+    void addIfPresent(String key, dynamic value) {
+      if (value == null) return;
+      if (value is String && value.trim().isEmpty) return;
+      payload[key] = value;
+    }
+
+    addIfPresent('evn', _textOrNull('evn'));
+    addIfPresent('name', _textOrNull('name'));
+    addIfPresent('operator', _textOrNull('operator'));
+    addIfPresent('notes', _textOrNull('notes'));
+    addIfPresent('domain', _domain);
+    addIfPresent('livery', _textOrNull('livery'));
+    addIfPresent('owner', _textOrNull('owner'));
+    addIfPresent('location', _textOrNull('location'));
+    addIfPresent('power_unit', _textOrNull('power_unit'));
+    addIfPresent('headlights', _textOrNull('headlights'));
+    addIfPresent('pantograph', _textOrNull('pantograph'));
+    addIfPresent('misc', _textOrNull('misc'));
+    addIfPresent('coupling', _textOrNull('coupling'));
+    addIfPresent('axle_arrangement', _textOrNull('axle_arrangement'));
+    addIfPresent('track_gauge', _parseNumber('track_gauge'));
+    addIfPresent('loco_braking', _textOrNull('loco_braking'));
+    addIfPresent('train_braking', _textOrNull('train_braking'));
+    addIfPresent('max_speed', _maxSpeedInKph());
+    addIfPresent('buffer_type', _textOrNull('buffer_type'));
+    addIfPresent('drawgear_strength', _textOrNull('drawgear_strength'));
+    addIfPresent('train_heating', _textOrNull('train_heating'));
+    addIfPresent('route_restriction', _textOrNull('route_restriction'));
+    addIfPresent('safety_systems', _textOrNull('safety_systems'));
+    addIfPresent('width', _parseNumber('width'));
+    addIfPresent('height', _parseNumber('height'));
+    addIfPresent('length', _parseNumber('length'));
+    addIfPresent('weight', _parseNumber('weight'));
+    addIfPresent('power', _parseNumber('power'));
+    addIfPresent('tractive_effort', _parseNumber('tractive_effort'));
+    addIfPresent('electrical_voltage', _textOrNull('electrical_voltage'));
+    addIfPresent('traction_motors', _textOrNull('traction_motors'));
+    addIfPresent('build_date', _textOrNull('build_date'));
+
+    return payload;
+  }
+
+  Future<void> _handleSubmit() async {
+    final form = _formKey.currentState;
+    if (form == null) return;
+    if (!form.validate()) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(content: Text('Please fill the required fields.')),
+      );
+      return;
+    }
+    FocusScope.of(context).unfocus();
+    setState(() => _submitting = true);
+    final messenger = ScaffoldMessenger.of(context);
+    try {
+      await context.read<DataService>().createLoco(_buildPayload());
+      if (!mounted) return;
+      messenger.showSnackBar(
+        const SnackBar(content: Text('Traction added successfully')),
+      );
+      Navigator.of(context).pop(_controllers['class']?.text.trim());
+    } catch (e) {
+      if (!mounted) return;
+      messenger.showSnackBar(
+        SnackBar(content: Text('Failed to add traction: $e')),
+      );
+      setState(() => _submitting = false);
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final isActive = _statusIsActive;
+    final size = MediaQuery.of(context).size;
+    final isNarrow = size.width < 720;
+    final fieldWidth = isNarrow ? double.infinity : 340.0;
+
+    Widget textField(
+      String key,
+      String label, {
+      bool required = false,
+      int maxLines = 1,
+      String? helper,
+      String? suffixText,
+      TextInputType? keyboardType,
+      double? widthOverride,
+      String? Function(String?)? validator,
+    }) {
+      return SizedBox(
+        width: widthOverride ?? fieldWidth,
+        child: TextFormField(
+          controller: _controllers[key],
+          decoration: InputDecoration(
+            labelText: required ? '$label *' : label,
+            helperText: helper,
+            suffixText: suffixText,
+            border: const OutlineInputBorder(),
+          ),
+          keyboardType: keyboardType,
+          maxLines: maxLines,
+          validator: (val) {
+            if (required && (val == null || val.trim().isEmpty)) {
+              return 'Required';
+            }
+            return validator?.call(val);
+          },
+        ),
+      );
+    }
+
+    Widget numberField(String key, String label, {String? suffixText}) {
+      return textField(
+        key,
+        label,
+        keyboardType: const TextInputType.numberWithOptions(decimal: true),
+        suffixText: suffixText,
+      );
+    }
+
+    Widget dropdownField({
+      required String label,
+      required List<String> options,
+      required String value,
+      required ValueChanged<String> onChanged,
+      bool required = false,
+      double? widthOverride,
+    }) {
+      return SizedBox(
+        width: widthOverride ?? fieldWidth,
+        child: DropdownButtonFormField<String>(
+          value: value,
+          decoration: InputDecoration(
+            labelText: required ? '$label *' : label,
+            border: const OutlineInputBorder(),
+          ),
+          items: options
+              .map((opt) => DropdownMenuItem(value: opt, child: Text(opt)))
+              .toList(),
+          onChanged: (val) {
+            if (val != null) onChanged(val);
+          },
+          validator: required
+              ? (val) => val == null || val.isEmpty ? 'Required' : null
+              : null,
+        ),
+      );
+    }
+
+    return SafeArea(
+      child: SingleChildScrollView(
+        padding: const EdgeInsets.all(16.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                TextButton.icon(
+                  onPressed: () => Navigator.of(context).pop(),
+                  icon: const Icon(Icons.arrow_back),
+                  label: const Text('Back'),
+                ),
+              ],
+            ),
+            const SizedBox(height: 12),
+            Card(
+              child: Padding(
+                padding: const EdgeInsets.all(16.0),
+                child: Form(
+                  key: _formKey,
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Text(
+                        'Basics',
+                        style: Theme.of(context).textTheme.titleMedium,
+                      ),
+                      const SizedBox(height: 8),
+                      Wrap(
+                        spacing: 12,
+                        runSpacing: 12,
+                        children: [
+                          textField('number', 'Number', required: true),
+                          textField('class', 'Class', required: true),
+                          dropdownField(
+                            label: 'Type',
+                            options: _typeOptions,
+                            value: _type,
+                            required: true,
+                            onChanged: (val) => setState(() => _type = val),
+                          ),
+                          dropdownField(
+                            label: 'Status',
+                            options: _statusOptions,
+                            value: _status,
+                            required: true,
+                            onChanged: (val) => setState(() => _status = val),
+                          ),
+                          textField('name', 'Name'),
+                          textField('operator', 'Operator'),
+                          textField('evn', 'EVN'),
+                          dropdownField(
+                            label: 'Domain',
+                            options: _domainOptions,
+                            value: _domain,
+                            onChanged: (val) => setState(() => _domain = val),
+                          ),
+                          textField('livery', 'Livery'),
+                          textField('owner', 'Owner'),
+                          textField('location', 'Location'),
+                        ],
+                      ),
+                      const SizedBox(height: 12),
+                      Wrap(
+                        spacing: 8,
+                        runSpacing: 8,
+                        children: [
+                          Chip(
+                            avatar: Icon(
+                              isActive ? Icons.check_circle : Icons.block,
+                              color: isActive ? Colors.green : Colors.grey,
+                            ),
+                            label: Text('Gettable: ${isActive ? 'Yes' : 'No'}'),
+                          ),
+                          Chip(
+                            avatar: Icon(
+                              isActive ? Icons.check_circle : Icons.block,
+                              color: isActive ? Colors.green : Colors.grey,
+                            ),
+                            label: Text(
+                              'Operational: ${isActive ? 'Yes' : 'No'}',
+                            ),
+                          ),
+                        ],
+                      ),
+                      const SizedBox(height: 4),
+                      Text(
+                        'Status controls availability: active sets gettable and operational to true, everything else sets them to false.',
+                        style: Theme.of(context).textTheme.bodySmall,
+                      ),
+                      const SizedBox(height: 16),
+                      Text(
+                        'Equipment & Capabilities',
+                        style: Theme.of(context).textTheme.titleMedium,
+                      ),
+                      const SizedBox(height: 8),
+                      Wrap(
+                        spacing: 12,
+                        runSpacing: 12,
+                        children: [
+                          SizedBox(
+                            width: fieldWidth,
+                            child: SwitchListTile(
+                              contentPadding: EdgeInsets.zero,
+                              value: _preserved,
+                              onChanged: (v) => setState(() => _preserved = v),
+                              title: const Text('Preserved'),
+                            ),
+                          ),
+                          SizedBox(
+                            width: fieldWidth,
+                            child: SwitchListTile(
+                              contentPadding: EdgeInsets.zero,
+                              value: _remoteControl,
+                              onChanged: (v) =>
+                                  setState(() => _remoteControl = v),
+                              title: const Text('Remote control'),
+                            ),
+                          ),
+                          SizedBox(
+                            width: fieldWidth,
+                            child: SwitchListTile(
+                              contentPadding: EdgeInsets.zero,
+                              value: _cabAirConditioning,
+                              onChanged: (v) =>
+                                  setState(() => _cabAirConditioning = v),
+                              title: const Text('Cab air conditioning'),
+                            ),
+                          ),
+                          SizedBox(
+                            width: fieldWidth,
+                            child: SwitchListTile(
+                              contentPadding: EdgeInsets.zero,
+                              value: _cabDoorControl,
+                              onChanged: (v) =>
+                                  setState(() => _cabDoorControl = v),
+                              title: const Text('Cab door control'),
+                            ),
+                          ),
+                        ],
+                      ),
+                      const SizedBox(height: 8),
+                      Wrap(
+                        spacing: 12,
+                        runSpacing: 12,
+                        children: [
+                          textField('power_unit', 'Power unit'),
+                          textField('headlights', 'Headlights'),
+                          textField('pantograph', 'Pantograph'),
+                          textField('misc', 'Misc'),
+                          textField('coupling', 'Coupling'),
+                          textField('axle_arrangement', 'Axle arrangement'),
+                          textField('loco_braking', 'Loco braking'),
+                          textField('train_braking', 'Train braking'),
+                          textField('buffer_type', 'Buffer type'),
+                          textField('drawgear_strength', 'Drawgear strength'),
+                          textField('train_heating', 'Train heating'),
+                          textField('route_restriction', 'Route restriction'),
+                          textField('safety_systems', 'Safety systems'),
+                        ],
+                      ),
+                      const SizedBox(height: 16),
+                      Text(
+                        'Dimensions & Performance',
+                        style: Theme.of(context).textTheme.titleMedium,
+                      ),
+                      const SizedBox(height: 8),
+                      Wrap(
+                        spacing: 12,
+                        runSpacing: 12,
+                        children: [
+                          numberField('weight', 'Weight', suffixText: 'tonnes'),
+                          numberField('length', 'Length', suffixText: 'mm'),
+                          numberField('width', 'Width', suffixText: 'mm'),
+                          numberField('height', 'Height', suffixText: 'mm'),
+                          numberField(
+                            'track_gauge',
+                            'Track gauge',
+                            suffixText: 'mm',
+                          ),
+                          numberField('power', 'Power', suffixText: 'kW'),
+                          numberField(
+                            'tractive_effort',
+                            'Tractive effort',
+                            suffixText: 'kN',
+                          ),
+                          SizedBox(
+                            width: fieldWidth,
+                            child: Row(
+                              children: [
+                                Expanded(
+                                  child: numberField(
+                                    'max_speed',
+                                    'Max speed (${_speedUnit == _SpeedUnit.kph ? 'km/h' : 'mph'})',
+                                  ),
+                                ),
+                                const SizedBox(width: 8),
+                                SizedBox(
+                                  width: 120,
+                                  child: DropdownButtonFormField<_SpeedUnit>(
+                                    value: _speedUnit,
+                                    decoration: const InputDecoration(
+                                      border: OutlineInputBorder(),
+                                      labelText: 'Units',
+                                    ),
+                                    items: const [
+                                      DropdownMenuItem(
+                                        value: _SpeedUnit.kph,
+                                        child: Text('km/h'),
+                                      ),
+                                      DropdownMenuItem(
+                                        value: _SpeedUnit.mph,
+                                        child: Text('mph'),
+                                      ),
+                                    ],
+                                    onChanged: (val) {
+                                      if (val != null) {
+                                        setState(() => _speedUnit = val);
+                                      }
+                                    },
+                                  ),
+                                ),
+                              ],
+                            ),
+                          ),
+                        ],
+                      ),
+                      const SizedBox(height: 16),
+                      Text(
+                        'Electrical & Build',
+                        style: Theme.of(context).textTheme.titleMedium,
+                      ),
+                      const SizedBox(height: 8),
+                      Wrap(
+                        spacing: 12,
+                        runSpacing: 12,
+                        children: [
+                          textField('electrical_voltage', 'Electrical voltage'),
+                          textField('traction_motors', 'Traction motors'),
+                          textField(
+                            'build_date',
+                            'Build date',
+                            helper:
+                                'Format YYYY-MM-DD, use XX for unknown DD/YY',
+                            validator: _validateBuildDate,
+                          ),
+                        ],
+                      ),
+                      const SizedBox(height: 16),
+                      textField(
+                        'notes',
+                        'Notes',
+                        maxLines: 3,
+                        helper: 'Optional notes',
+                        widthOverride: double.infinity,
+                      ),
+                      const SizedBox(height: 20),
+                      SizedBox(
+                        width: double.infinity,
+                        child: ElevatedButton.icon(
+                          onPressed: _submitting ? null : _handleSubmit,
+                          icon: _submitting
+                              ? const SizedBox(
+                                  width: 16,
+                                  height: 16,
+                                  child: CircularProgressIndicator(
+                                    strokeWidth: 2,
+                                  ),
+                                )
+                              : const Icon(Icons.save),
+                          label: Text(_submitting ? 'Submitting...' : 'Submit'),
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/components/pages/traction.dart

@@ -1,7 +1,12 @@
+import 'dart:convert';
+
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:mileograph_flutter/components/traction/traction_card.dart';
 import 'package:mileograph_flutter/objects/objects.dart';
-import 'package:mileograph_flutter/services/dataService.dart';
+import 'package:mileograph_flutter/services/data_service.dart';
 import 'package:provider/provider.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 
 class TractionPage extends StatefulWidget {
   const TractionPage({
@@ -20,23 +25,20 @@ class TractionPage extends StatefulWidget {
 }
 
 class _TractionPageState extends State<TractionPage> {
+  static const String _prefsKey = 'traction_search_state_v1';
   final _classController = TextEditingController();
   final _classFocusNode = FocusNode();
   final _numberController = TextEditingController();
+  final _nameController = TextEditingController();
   bool _mileageFirst = true;
   bool _initialised = false;
   bool _showAdvancedFilters = false;
   String? _selectedClass;
   late Set<String> _selectedKeys;
-  final _nameController = TextEditingController();
-  final _operatorController = TextEditingController();
-  final _statusController = TextEditingController();
-  final _evnController = TextEditingController();
-  final _ownerController = TextEditingController();
-  final _locationController = TextEditingController();
-  final _liveryController = TextEditingController();
-  final _domainController = TextEditingController();
-  final _typeController = TextEditingController();
+
+  final Map<String, TextEditingController> _dynamicControllers = {};
+  final Map<String, String?> _enumSelections = {};
+  bool _restoredFromPrefs = false;
 
   @override
   void initState() {
@@ -51,60 +53,149 @@ class _TractionPageState extends State<TractionPage> {
       _initialised = true;
       _selectedKeys = {...widget.selectedKeys};
       WidgetsBinding.instance.addPostFrameCallback((_) {
-        context.read<DataService>().fetchClassList();
-        _refreshTraction();
+        _initialLoad();
       });
     }
   }
 
+  Future<void> _initialLoad() async {
+    final data = context.read<DataService>();
+    await _restoreSearchState();
+    data.fetchClassList();
+    data.fetchEventFields();
+    await _refreshTraction();
+  }
+
+  Future<void> _restoreSearchState() async {
+    if (widget.selectionMode) return;
+    if (_restoredFromPrefs) return;
+    _restoredFromPrefs = true;
+    try {
+      final prefs = await SharedPreferences.getInstance();
+      final raw = prefs.getString(_prefsKey);
+      if (raw == null || raw.trim().isEmpty) return;
+      final decoded = jsonDecode(raw);
+      if (decoded is! Map) return;
+
+      final classText = decoded['classText']?.toString();
+      final numberText = decoded['number']?.toString();
+      final nameText = decoded['name']?.toString();
+      final selectedClass = decoded['selectedClass']?.toString();
+      final mileageFirst = decoded['mileageFirst'];
+      final showAdvanced = decoded['showAdvancedFilters'];
+
+      if (classText != null) _classController.text = classText;
+      if (numberText != null) _numberController.text = numberText;
+      if (nameText != null) _nameController.text = nameText;
+
+      final dynamicValues = <String, String>{};
+      final enumValues = <String, String?>{};
+      final dynamicRaw = decoded['dynamic'];
+      if (dynamicRaw is Map) {
+        for (final entry in dynamicRaw.entries) {
+          final key = entry.key.toString();
+          final val = entry.value?.toString() ?? '';
+          dynamicValues[key] = val;
+        }
+      }
+      final enumRaw = decoded['enum'];
+      if (enumRaw is Map) {
+        for (final entry in enumRaw.entries) {
+          enumValues[entry.key.toString()] = entry.value?.toString();
+        }
+      }
+
+      for (final entry in dynamicValues.entries) {
+        _dynamicControllers.putIfAbsent(
+          entry.key,
+          () => TextEditingController(text: entry.value),
+        );
+        _dynamicControllers[entry.key]?.text = entry.value;
+      }
+      for (final entry in enumValues.entries) {
+        _enumSelections[entry.key] = entry.value;
+      }
+
+      if (!mounted) return;
+      setState(() {
+        _selectedClass = (selectedClass != null && selectedClass.trim().isNotEmpty)
+            ? selectedClass
+            : null;
+        if (mileageFirst is bool) _mileageFirst = mileageFirst;
+        if (showAdvanced is bool) _showAdvancedFilters = showAdvanced;
+      });
+    } catch (_) {
+      // Ignore preference restore failures.
+    }
+  }
+
+  Future<void> _persistSearchState() async {
+    if (widget.selectionMode) return;
+    final payload = <String, dynamic>{
+      'classText': _classController.text,
+      'number': _numberController.text,
+      'name': _nameController.text,
+      'selectedClass': _selectedClass,
+      'mileageFirst': _mileageFirst,
+      'showAdvancedFilters': _showAdvancedFilters,
+      'dynamic': _dynamicControllers.map((k, v) => MapEntry(k, v.text)),
+      'enum': _enumSelections,
+    };
+
+    try {
+      final prefs = await SharedPreferences.getInstance();
+      await prefs.setString(_prefsKey, jsonEncode(payload));
+    } catch (_) {
+      // Ignore persistence failures.
+    }
+  }
+
   @override
   void dispose() {
     _classController.removeListener(_onClassTextChanged);
+    _persistSearchState();
     _classController.dispose();
     _classFocusNode.dispose();
     _numberController.dispose();
     _nameController.dispose();
-    _operatorController.dispose();
-    _statusController.dispose();
-    _evnController.dispose();
-    _ownerController.dispose();
-    _locationController.dispose();
-    _liveryController.dispose();
-    _domainController.dispose();
-    _typeController.dispose();
+    for (final controller in _dynamicControllers.values) {
+      controller.dispose();
+    }
     super.dispose();
   }
 
   bool get _hasFilters {
+    final dynamicFieldsUsed =
+        _dynamicControllers.values.any(
+          (controller) => controller.text.trim().isNotEmpty,
+        ) ||
+        _enumSelections.values.any(
+          (value) => (value ?? '').toString().trim().isNotEmpty,
+        );
+
     return [
           _selectedClass,
           _classController.text,
           _numberController.text,
           _nameController.text,
-      _operatorController.text,
-      _statusController.text,
-      _evnController.text,
-      _ownerController.text,
-      _locationController.text,
-      _liveryController.text,
-      _domainController.text,
-      _typeController.text,
-    ].any((value) => (value ?? '').toString().trim().isNotEmpty);
+        ].any((value) => (value ?? '').toString().trim().isNotEmpty) ||
+        dynamicFieldsUsed;
   }
 
   Future<void> _refreshTraction({bool append = false}) async {
     final data = context.read<DataService>();
-    final filters = {
-      "name": _nameController.text.trim(),
-      "operator": _operatorController.text.trim(),
-      "status": _statusController.text.trim(),
-      "evn": _evnController.text.trim(),
-      "owner": _ownerController.text.trim(),
-      "location": _locationController.text.trim(),
-      "livery": _liveryController.text.trim(),
-      "domain": _domainController.text.trim(),
-      "type": _typeController.text.trim(),
-    }..removeWhere((key, value) => value.isEmpty);
+    final filters = <String, dynamic>{};
+    final name = _nameController.text.trim();
+    if (name.isNotEmpty) filters['name'] = name;
+    _dynamicControllers.forEach((key, controller) {
+      final value = controller.text.trim();
+      if (value.isNotEmpty) filters[key] = value;
+    });
+    _enumSelections.forEach((key, value) {
+      if (value != null && value.toString().trim().isNotEmpty) {
+        filters[key] = value;
+      }
+    });
     final hadOnly = !_hasFilters;
     await data.fetchTraction(
       hadOnly: hadOnly,
@@ -115,6 +206,7 @@ class _TractionPageState extends State<TractionPage> {
       filters: filters,
       mileageFirst: _mileageFirst,
     );
+    await _persistSearchState();
   }
 
   void _clearFilters() {
@@ -122,17 +214,13 @@ class _TractionPageState extends State<TractionPage> {
       _classController,
       _numberController,
       _nameController,
-      _operatorController,
-      _statusController,
-      _evnController,
-      _ownerController,
-      _locationController,
-      _liveryController,
-      _domainController,
-      _typeController,
     ]) {
       controller.clear();
     }
+    for (final controller in _dynamicControllers.values) {
+      controller.clear();
+    }
+    _enumSelections.clear();
     setState(() {
       _selectedClass = null;
       _mileageFirst = true;
@@ -149,12 +237,41 @@ class _TractionPageState extends State<TractionPage> {
     }
   }
 
+  List<EventField> _activeEventFields(List<EventField> fields) {
+    return fields
+        .where(
+          (field) => ![
+            'class',
+            'number',
+            'name',
+            'build date',
+            'build_date',
+          ].contains(field.name.toLowerCase()),
+        )
+        .toList();
+  }
+
+  void _ensureControllersForFields(List<EventField> fields) {
+    for (final field in fields) {
+      if (field.enumValues != null) {
+        _enumSelections.putIfAbsent(field.name, () => null);
+      } else {
+        _dynamicControllers.putIfAbsent(
+          field.name,
+          () => TextEditingController(),
+        );
+      }
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     final data = context.watch<DataService>();
     final traction = data.traction;
     final classOptions = data.locoClasses;
     final isMobile = MediaQuery.of(context).size.width < 700;
+    _ensureControllersForFields(data.eventFields);
+    final extraFields = _activeEventFields(data.eventFields);
 
     final listView = RefreshIndicator(
       onRefresh: _refreshTraction,
@@ -163,12 +280,16 @@ class _TractionPageState extends State<TractionPage> {
         physics: const AlwaysScrollableScrollPhysics(),
         children: [
           Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: [
-              Column(
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
-                  Text('Fleet', style: Theme.of(context).textTheme.labelMedium),
+              Expanded(
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(
+                      'Fleet',
+                      style: Theme.of(context).textTheme.labelMedium,
+                    ),
                     const SizedBox(height: 2),
                     Text(
                       'Traction',
@@ -176,11 +297,36 @@ class _TractionPageState extends State<TractionPage> {
                     ),
                   ],
                 ),
+              ),
+              Row(
+                mainAxisSize: MainAxisSize.min,
+                children: [
                   IconButton(
                     tooltip: 'Refresh',
                     onPressed: _refreshTraction,
                     icon: const Icon(Icons.refresh),
                   ),
+                  const SizedBox(width: 8),
+                  FilledButton.icon(
+                    onPressed: () async {
+                      final createdClass = await context.push<String>(
+                        '/traction/new',
+                      );
+                      if (createdClass != null && createdClass.isNotEmpty) {
+                        _classController.text = createdClass;
+                        _selectedClass = createdClass;
+                        if (mounted) {
+                          _refreshTraction();
+                        }
+                      } else if (mounted && createdClass == '') {
+                        _refreshTraction();
+                      }
+                    },
+                    icon: const Icon(Icons.add),
+                    label: const Text('New Traction'),
+                  ),
+                ],
+              ),
             ],
           ),
           const SizedBox(height: 12),
@@ -239,8 +385,7 @@ class _TractionPageState extends State<TractionPage> {
                                   onSubmitted: (_) => _refreshTraction(),
                                 );
                               },
-                          optionsViewBuilder:
-                              (context, onSelected, options) {
+                          optionsViewBuilder: (context, onSelected, options) {
                             final optionList = options.toList();
                             if (optionList.isEmpty) {
                               return const SizedBox.shrink();
@@ -306,7 +451,7 @@ class _TractionPageState extends State<TractionPage> {
                       ),
                       FilterChip(
                         label: Text(
-                          _mileageFirst ? 'Mileage first' : 'Had first',
+                          _mileageFirst ? 'Mileage first' : 'Number order',
                         ),
                         selected: _mileageFirst,
                         onSelected: (v) {
@@ -343,99 +488,29 @@ class _TractionPageState extends State<TractionPage> {
                     duration: const Duration(milliseconds: 200),
                     firstChild: Padding(
                       padding: const EdgeInsets.only(top: 12.0),
-                      child: Wrap(
+                      child: data.isEventFieldsLoading
+                          ? const Center(
+                              child: Padding(
+                                padding: EdgeInsets.all(8.0),
+                                child: CircularProgressIndicator(
+                                  strokeWidth: 2,
+                                ),
+                              ),
+                            )
+                          : extraFields.isEmpty
+                          ? const Text('No extra filters available right now.')
+                          : Wrap(
                               spacing: 12,
                               runSpacing: 12,
-                        children: [
-                          SizedBox(
-                            width: isMobile ? double.infinity : 220,
-                            child: TextField(
-                              controller: _operatorController,
-                              decoration: const InputDecoration(
-                                labelText: 'Operator',
-                                border: OutlineInputBorder(),
+                              children: extraFields
+                                  .map(
+                                    (field) => _buildFilterInput(
+                                      context,
+                                      field,
+                                      isMobile,
                                     ),
-                              onSubmitted: (_) => _refreshTraction(),
-                            ),
-                          ),
-                          SizedBox(
-                            width: isMobile ? double.infinity : 220,
-                            child: TextField(
-                              controller: _statusController,
-                              decoration: const InputDecoration(
-                                labelText: 'Status',
-                                border: OutlineInputBorder(),
-                              ),
-                              onSubmitted: (_) => _refreshTraction(),
-                            ),
-                          ),
-                          SizedBox(
-                            width: isMobile ? double.infinity : 220,
-                            child: TextField(
-                              controller: _evnController,
-                              decoration: const InputDecoration(
-                                labelText: 'EVN',
-                                border: OutlineInputBorder(),
-                              ),
-                              onSubmitted: (_) => _refreshTraction(),
-                            ),
-                          ),
-                          SizedBox(
-                            width: isMobile ? double.infinity : 220,
-                            child: TextField(
-                              controller: _ownerController,
-                              decoration: const InputDecoration(
-                                labelText: 'Owner',
-                                border: OutlineInputBorder(),
-                              ),
-                              onSubmitted: (_) => _refreshTraction(),
-                            ),
-                          ),
-                          SizedBox(
-                            width: isMobile ? double.infinity : 220,
-                            child: TextField(
-                              controller: _locationController,
-                              decoration: const InputDecoration(
-                                labelText: 'Location',
-                                border: OutlineInputBorder(),
-                              ),
-                              onSubmitted: (_) => _refreshTraction(),
-                            ),
-                          ),
-                          SizedBox(
-                            width: isMobile ? double.infinity : 220,
-                            child: TextField(
-                              controller: _liveryController,
-                              decoration: const InputDecoration(
-                                labelText: 'Livery',
-                                border: OutlineInputBorder(),
-                              ),
-                              onSubmitted: (_) => _refreshTraction(),
-                            ),
-                          ),
-                          SizedBox(
-                            width: isMobile ? double.infinity : 220,
-                            child: TextField(
-                              controller: _domainController,
-                              decoration: const InputDecoration(
-                                labelText: 'Domain',
-                                border: OutlineInputBorder(),
-                              ),
-                              onSubmitted: (_) => _refreshTraction(),
-                            ),
-                          ),
-                          SizedBox(
-                            width: isMobile ? double.infinity : 220,
-                            child: TextField(
-                              controller: _typeController,
-                              decoration: const InputDecoration(
-                                labelText: 'Type',
-                                border: OutlineInputBorder(),
-                              ),
-                              onSubmitted: (_) => _refreshTraction(),
-                            ),
-                          ),
-                        ],
+                                  )
+                                  .toList(),
                             ),
                     ),
                     secondChild: const SizedBox.shrink(),
@@ -445,12 +520,12 @@ class _TractionPageState extends State<TractionPage> {
             ),
           ),
           const SizedBox(height: 12),
+          Stack(
+            children: [
               if (data.isTractionLoading && traction.isEmpty)
-            const Center(
-              child: Padding(
-                padding: EdgeInsets.symmetric(vertical: 24.0),
-                child: CircularProgressIndicator(),
-              ),
+                const Padding(
+                  padding: EdgeInsets.symmetric(vertical: 32.0),
+                  child: Center(child: CircularProgressIndicator()),
                 )
               else if (traction.isEmpty)
                 Card(
@@ -474,7 +549,17 @@ class _TractionPageState extends State<TractionPage> {
               else
                 Column(
                   children: [
-                ...traction.map((loco) => _buildTractionCard(context, loco)),
+                    ...traction.map(
+                      (loco) => TractionCard(
+                        loco: loco,
+                        selectionMode: widget.selectionMode,
+                        isSelected: _isSelected(loco),
+                        onShowInfo: () => showTractionDetails(context, loco),
+                        onOpenTimeline: () => _openTimeline(loco),
+                        onToggleSelect:
+                            widget.selectionMode ? () => _toggleSelection(loco) : null,
+                      ),
+                    ),
                     if (data.tractionHasMore || data.isTractionLoading)
                       Padding(
                         padding: const EdgeInsets.only(top: 8.0),
@@ -496,6 +581,17 @@ class _TractionPageState extends State<TractionPage> {
                       ),
                   ],
                 ),
+              if (data.isTractionLoading)
+                Positioned.fill(
+                      child: IgnorePointer(
+                        child: Container(
+                      color: Theme.of(context).colorScheme.surface.withValues(alpha: 0.6),
+                      child: const Center(child: CircularProgressIndicator()),
+                    ),
+                  ),
+                ),
+            ],
+          ),
         ],
       ),
     );
@@ -528,225 +624,96 @@ class _TractionPageState extends State<TractionPage> {
     return listView;
   }
 
-  Widget _buildTractionCard(BuildContext context, LocoSummary loco) {
+  void _toggleSelection(LocoSummary loco) {
     final keyVal = '${loco.locoClass}-${loco.number}';
-    final isSelected = _selectedKeys.contains(keyVal);
-    final status = loco.status ?? 'Unknown';
-    final operatorName = loco.operator ?? '';
-    final domain = loco.domain ?? '';
-    return Card(
-      child: Padding(
-        padding: const EdgeInsets.all(12.0),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              children: [
-                Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Text(
-                      '${loco.locoClass} ${loco.number}',
-                      style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                        fontWeight: FontWeight.w700,
-                      ),
-                    ),
-                    if ((loco.name ?? '').isNotEmpty)
-                      Text(
-                        loco.name ?? '',
-                        style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                          fontStyle: FontStyle.italic,
-                        ),
-                      ),
-                  ],
-                ),
-                Chip(
-                  label: Text(status),
-                  backgroundColor: Theme.of(
-                    context,
-                  ).colorScheme.surfaceContainerHighest,
-                ),
-              ],
-            ),
-            const SizedBox(height: 8),
-            Row(
-              children: [
-                TextButton.icon(
-                  onPressed: () => _showLocoInfo(loco),
-                  icon: const Icon(Icons.info_outline),
-                  label: const Text('Details'),
-                ),
-                const Spacer(),
-                if (widget.selectionMode)
-                  TextButton.icon(
-                    onPressed: () {
     if (widget.onSelect != null) {
       widget.onSelect!(loco);
     }
     setState(() {
-                        if (isSelected) {
+      if (_selectedKeys.contains(keyVal)) {
         _selectedKeys.remove(keyVal);
       } else {
         _selectedKeys.add(keyVal);
       }
     });
+  }
+
+  bool _isSelected(LocoSummary loco) {
+    final keyVal = '${loco.locoClass}-${loco.number}';
+    return _selectedKeys.contains(keyVal);
+  }
+
+  Future<void> _openTimeline(LocoSummary loco) async {
+    final label = '${loco.locoClass} ${loco.number}'.trim();
+    await context.push(
+      '/traction/${loco.id}/timeline',
+      extra: {'label': label},
+    );
+    if (!mounted) return;
+    await _refreshTraction();
+  }
+
+  Widget _buildFilterInput(
+    BuildContext context,
+    EventField field,
+    bool isMobile,
+  ) {
+    final width = isMobile ? double.infinity : 220.0;
+    if (field.enumValues != null && field.enumValues!.isNotEmpty) {
+      final options = field.enumValues!
+          .map((e) => e.toString())
+          .toSet()
+          .toList();
+      final currentValue = _enumSelections[field.name];
+      final safeValue = options.contains(currentValue) ? currentValue : null;
+      return SizedBox(
+        width: width,
+        child: DropdownButtonFormField<String?>(
+          value: safeValue,
+          decoration: InputDecoration(
+            labelText: field.display,
+            border: const OutlineInputBorder(),
+          ),
+          items: [
+            const DropdownMenuItem(value: null, child: Text('Any')),
+            ...options.map(
+              (value) => DropdownMenuItem(value: value, child: Text(value)),
+            ),
+          ],
+          onChanged: (val) {
+            setState(() {
+              _enumSelections[field.name] = val;
+            });
+            _refreshTraction();
           },
-                    icon: Icon(
-                      isSelected
-                          ? Icons.remove_circle_outline
-                          : Icons.add_circle_outline,
-                    ),
-                    label: Text(isSelected ? 'Remove' : 'Add to entry'),
-                  ),
-              ],
-            ),
-            Wrap(
-              spacing: 8,
-              runSpacing: 4,
-              children: [
-                _statPill(
-                  context,
-                  label: 'Miles',
-                  value: _formatNumber(loco.mileage),
-                ),
-                _statPill(
-                  context,
-                  label: 'Trips',
-                  value: (loco.trips ?? loco.journeys ?? 0).toString(),
-                ),
-                if (operatorName.isNotEmpty)
-                  _statPill(context, label: 'Operator', value: operatorName),
-                if (domain.isNotEmpty)
-                  _statPill(context, label: 'Domain', value: domain),
-              ],
-            ),
-          ],
-        ),
         ),
       );
     }
 
-  Widget _statPill(
-    BuildContext context, {
-    required String label,
-    required String value,
-  }) {
-    return Container(
-      padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6),
-      decoration: BoxDecoration(
-        color: Theme.of(context).colorScheme.surfaceContainerHighest,
-        borderRadius: BorderRadius.circular(10),
-      ),
-      child: Row(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          Text('$label: ', style: Theme.of(context).textTheme.labelSmall),
-          Text(
-            value,
-            style: Theme.of(
-              context,
-            ).textTheme.labelSmall?.copyWith(fontWeight: FontWeight.w700),
-          ),
-        ],
-      ),
-    );
+    final controller =
+        _dynamicControllers[field.name] ?? TextEditingController();
+    _dynamicControllers[field.name] = controller;
+    TextInputType? inputType;
+    if (field.type != null) {
+      final type = field.type!.toLowerCase();
+      if (type.contains('int') ||
+          type.contains('num') ||
+          type.contains('double')) {
+        inputType = const TextInputType.numberWithOptions(decimal: true);
+      }
     }
 
-  Future<void> _showLocoInfo(LocoSummary loco) async {
-    await showModalBottomSheet(
-      context: context,
-      isScrollControlled: true,
-      builder: (ctx) {
-        return DraggableScrollableSheet(
-          expand: false,
-          maxChildSize: 0.9,
-          initialChildSize: 0.65,
-          builder: (_, controller) {
-            return Padding(
-              padding: const EdgeInsets.all(16.0),
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Row(
-                    children: [
-                      IconButton(
-                        icon: const Icon(Icons.close),
-                        onPressed: () => Navigator.of(ctx).pop(),
-                      ),
-                      const SizedBox(width: 8),
-                      Text(
-                        '${loco.locoClass} ${loco.number}',
-                        style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                          fontWeight: FontWeight.w700,
-                        ),
-                      ),
-                    ],
-                  ),
-                  if ((loco.name ?? '').isNotEmpty)
-                    Padding(
-                      padding: const EdgeInsets.only(left: 52.0, bottom: 12),
-                      child: Text(
-                        loco.name ?? '',
-                        style: Theme.of(context).textTheme.bodyMedium,
-                      ),
-                    ),
-                  const SizedBox(height: 4),
-                  Expanded(
-                    child: ListView(
+    return SizedBox(
+      width: width,
+      child: TextField(
         controller: controller,
-                      children: [
-                        _detailRow('Status', loco.status ?? 'Unknown'),
-                        _detailRow('Operator', loco.operator ?? ''),
-                        _detailRow('Domain', loco.domain ?? ''),
-                        _detailRow('Owner', loco.owner ?? ''),
-                        _detailRow('Livery', loco.livery ?? ''),
-                        _detailRow('Location', loco.location ?? ''),
-                        _detailRow('Mileage', _formatNumber(loco.mileage ?? 0)),
-                        _detailRow(
-                          'Trips',
-                          (loco.trips ?? loco.journeys ?? 0).toString(),
+        keyboardType: inputType,
+        decoration: InputDecoration(
+          labelText: field.display,
+          border: const OutlineInputBorder(),
         ),
-                        _detailRow('EVN', loco.evn ?? ''),
-                        if (loco.notes != null && loco.notes!.isNotEmpty)
-                          _detailRow('Notes', loco.notes!),
-                      ],
-                    ),
-                  ),
-                ],
+        onSubmitted: (_) => _refreshTraction(),
       ),
     );
-          },
-        );
-      },
-    );
-  }
-
-  Widget _detailRow(String label, String value) {
-    if (value.isEmpty) return const SizedBox.shrink();
-    return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 6.0),
-      child: Row(
-        children: [
-          SizedBox(
-            width: 110,
-            child: Text(
-              label,
-              style: Theme.of(
-                context,
-              ).textTheme.labelMedium?.copyWith(fontWeight: FontWeight.w600),
-            ),
-          ),
-          Expanded(
-            child: Text(value, style: Theme.of(context).textTheme.bodyMedium),
-          ),
-        ],
-      ),
-    );
-  }
-
-  String _formatNumber(double? value) {
-    if (value == null) return '0';
-    return value.toStringAsFixed(1);
   }
 }

lib/components/pages/trips.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:mileograph_flutter/objects/objects.dart';
-import 'package:mileograph_flutter/services/dataService.dart';
+import 'package:mileograph_flutter/services/data_service.dart';
 import 'package:provider/provider.dart';
 
 class TripsPage extends StatefulWidget {
@@ -46,11 +46,15 @@ class _TripsPageState extends State<TripsPage> {
               Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
-                  Text('Journeys',
-                      style: Theme.of(context).textTheme.labelMedium),
+                  Text(
+                    'Journeys',
+                    style: Theme.of(context).textTheme.labelMedium,
+                  ),
                   const SizedBox(height: 2),
-                  Text('Trips',
-                      style: Theme.of(context).textTheme.headlineSmall),
+                  Text(
+                    'Trips',
+                    style: Theme.of(context).textTheme.headlineSmall,
+                  ),
                 ],
               ),
               Row(
@@ -81,10 +85,9 @@ class _TripsPageState extends State<TripsPage> {
                   children: [
                     Text(
                       'No trips yet',
-                      style: Theme.of(context)
-                          .textTheme
-                          .titleMedium
-                          ?.copyWith(fontWeight: FontWeight.w700),
+                      style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                        fontWeight: FontWeight.w700,
+                      ),
                     ),
                     const SizedBox(height: 8),
                     const Text(
@@ -101,8 +104,9 @@ class _TripsPageState extends State<TripsPage> {
                     (trip) => Card(
                       child: ListTile(
                         title: Text(trip.tripName),
-                        subtitle:
-                            Text('${trip.tripMileage.toStringAsFixed(1)} mi'),
+                        subtitle: Text(
+                          '${trip.tripMileage.toStringAsFixed(1)} mi',
+                        ),
                       ),
                     ),
                   )
@@ -110,8 +114,9 @@ class _TripsPageState extends State<TripsPage> {
             )
           else
             Column(
-              children:
-                  tripDetails.map((trip) => _buildTripCard(context, trip, isMobile)).toList(),
+              children: tripDetails
+                  .map((trip) => _buildTripCard(context, trip, isMobile))
+                  .toList(),
             ),
         ],
       ),
@@ -134,10 +139,9 @@ class _TripsPageState extends State<TripsPage> {
                   children: [
                     Text(
                       trip.name,
-                      style: Theme.of(context)
-                          .textTheme
-                          .titleMedium
-                          ?.copyWith(fontWeight: FontWeight.w700),
+                      style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                        fontWeight: FontWeight.w700,
+                      ),
                     ),
                     Text(
                       '${trip.mileage.toStringAsFixed(1)} mi · ${trip.legCount} legs',
@@ -145,6 +149,14 @@ class _TripsPageState extends State<TripsPage> {
                     ),
                   ],
                 ),
+                Row(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    IconButton(
+                      icon: const Icon(Icons.train),
+                      tooltip: 'Traction',
+                      onPressed: () => _showTripWinners(context, trip),
+                    ),
                     IconButton(
                       icon: const Icon(Icons.open_in_new),
                       tooltip: 'Details',
@@ -152,6 +164,8 @@ class _TripsPageState extends State<TripsPage> {
                     ),
                   ],
                 ),
+              ],
+            ),
             const SizedBox(height: 8),
             if (legs.isNotEmpty)
               Column(
@@ -168,10 +182,9 @@ class _TripsPageState extends State<TripsPage> {
                     ),
                     trailing: Text(
                       leg.mileage?.toStringAsFixed(1) ?? '-',
-                      style: Theme.of(context)
-                          .textTheme
-                          .labelLarge
-                          ?.copyWith(fontWeight: FontWeight.bold),
+                      style: Theme.of(context).textTheme.labelLarge?.copyWith(
+                        fontWeight: FontWeight.bold,
+                      ),
                     ),
                   );
                 }).toList(),
@@ -215,10 +228,9 @@ class _TripsPageState extends State<TripsPage> {
                     ),
                     Text(
                       trip.name,
-                      style: Theme.of(context)
-                          .textTheme
-                          .titleMedium
-                          ?.copyWith(fontWeight: FontWeight.bold),
+                      style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                        fontWeight: FontWeight.bold,
+                      ),
                     ),
                     const Spacer(),
                     Text('${trip.mileage.toStringAsFixed(1)} mi'),
@@ -237,9 +249,7 @@ class _TripsPageState extends State<TripsPage> {
                         subtitle: Text(_formatDate(leg.beginTime)),
                         trailing: Text(
                           leg.mileage?.toStringAsFixed(1) ?? '-',
-                          style: Theme.of(context)
-                              .textTheme
-                              .labelLarge
+                          style: Theme.of(context).textTheme.labelLarge
                               ?.copyWith(fontWeight: FontWeight.bold),
                         ),
                       );
@@ -253,4 +263,113 @@ class _TripsPageState extends State<TripsPage> {
       },
     );
   }
+
+  void _showTripWinners(BuildContext context, TripDetail trip) {
+    showModalBottomSheet(
+      context: context,
+      isScrollControlled: true,
+      builder: (_) {
+        final data = context.read<DataService>();
+        return SafeArea(
+          child: FutureBuilder<List<TripLocoStat>>(
+            future: data.fetchTripLocoStats(trip.id),
+            builder: (ctx, snapshot) {
+              final items = snapshot.data ?? [];
+              final loading =
+                  snapshot.connectionState == ConnectionState.waiting;
+              return Padding(
+                padding: const EdgeInsets.all(16.0),
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Row(
+                      children: [
+                        IconButton(
+                          icon: const Icon(Icons.arrow_back),
+                          onPressed: () => Navigator.of(context).pop(),
+                        ),
+                        Text(
+                          trip.name,
+                          style: Theme.of(context)
+                              .textTheme
+                              .titleMedium
+                              ?.copyWith(fontWeight: FontWeight.bold),
+                        ),
+                        const Spacer(),
+                        Text('${trip.mileage.toStringAsFixed(1)} mi'),
+                      ],
+                    ),
+                    const SizedBox(height: 8),
+                    if (!loading && items.isNotEmpty) ...[
+                      Wrap(
+                        spacing: 8,
+                        runSpacing: 8,
+                        children: [
+                          Chip(
+                            avatar: const Icon(Icons.train, size: 16),
+                            label: Text('Total had: ${items.length}'),
+                          ),
+                          Chip(
+                            avatar: const Icon(Icons.star, size: 16),
+                            label: Text(
+                              'Winners: ${items.where((e) => e.won == true).length}',
+                            ),
+                          ),
+                        ],
+                      ),
+                      const SizedBox(height: 8),
+                    ],
+                    if (loading)
+                      const Center(
+                        child: Padding(
+                          padding: EdgeInsets.symmetric(vertical: 24.0),
+                          child: CircularProgressIndicator(),
+                        ),
+                      )
+                    else if (items.isEmpty)
+                      const Padding(
+                        padding: EdgeInsets.symmetric(vertical: 16.0),
+                        child: Text('No traction recorded for this trip yet.'),
+                      )
+                    else
+                      SizedBox(
+                        height: MediaQuery.of(context).size.height * 0.6,
+                        child: ListView.builder(
+                          itemCount: items.length,
+                          itemBuilder: (context, index) {
+                            final loco = items[index];
+                            final won = loco.won;
+                            final isWon = won == true;
+                            return ListTile(
+                              leading: const Icon(Icons.train),
+                              title: Text('${loco.locoClass} ${loco.number}'),
+                              subtitle:
+                                  loco.name == null || loco.name!.isEmpty
+                                      ? null
+                                      : Text(loco.name!),
+                              trailing: Chip(
+                                label: Text(isWon ? 'Won' : 'Dud'),
+                                backgroundColor: isWon
+                                    ? Colors.green.shade100
+                                    : Colors.grey.shade300,
+                                labelStyle: TextStyle(
+                                  color: isWon
+                                      ? Colors.green.shade900
+                                      : Colors.grey.shade800,
+                                ),
+                              ),
+                            );
+                          },
+                        ),
+                      ),
+                  ],
+                ),
+              );
+            },
+          ),
+        );
+      },
+    );
+  }
 }

lib/components/traction/traction_card.dart

@@ -0,0 +1,336 @@
+import 'package:flutter/material.dart';
+import 'package:mileograph_flutter/objects/objects.dart';
+
+class TractionCard extends StatelessWidget {
+  const TractionCard({
+    super.key,
+    required this.loco,
+    required this.selectionMode,
+    required this.isSelected,
+    required this.onShowInfo,
+    required this.onOpenTimeline,
+    this.onToggleSelect,
+  });
+
+  final LocoSummary loco;
+  final bool selectionMode;
+  final bool isSelected;
+  final VoidCallback onShowInfo;
+  final VoidCallback onOpenTimeline;
+  final VoidCallback? onToggleSelect;
+
+  @override
+  Widget build(BuildContext context) {
+    final status = loco.status ?? 'Unknown';
+    final operatorName = loco.operator ?? '';
+    final domain = loco.domain ?? '';
+    final hasMileageOrTrips = _hasMileageOrTrips(loco);
+    final statusColors = _statusChipColors(context, status);
+
+    return Card(
+      child: Padding(
+        padding: const EdgeInsets.all(12.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Row(
+                      children: [
+                        Text(
+                          loco.number,
+                          style: Theme.of(context).textTheme.headlineSmall
+                              ?.copyWith(fontWeight: FontWeight.w800),
+                        ),
+                        if (hasMileageOrTrips)
+                          Padding(
+                            padding: const EdgeInsets.only(left: 6.0),
+                            child: Icon(
+                              Icons.check_circle,
+                              size: 18,
+                              color: Colors.green.shade600,
+                            ),
+                          ),
+                      ],
+                    ),
+                    Text(
+                      loco.locoClass,
+                      style: Theme.of(context).textTheme.labelMedium,
+                    ),
+                    if ((loco.name ?? '').isNotEmpty)
+                      Padding(
+                        padding: const EdgeInsets.only(top: 2.0),
+                        child: Text(
+                          loco.name ?? '',
+                          style: Theme.of(context).textTheme.bodyMedium
+                              ?.copyWith(fontStyle: FontStyle.italic),
+                        ),
+                      ),
+                  ],
+                ),
+                Chip(
+                  label: Text(status),
+                  backgroundColor: statusColors.$1,
+                  labelStyle: TextStyle(color: statusColors.$2),
+                ),
+              ],
+            ),
+            const SizedBox(height: 8),
+            Row(
+              children: [
+                TextButton.icon(
+                  onPressed: onShowInfo,
+                  icon: const Icon(Icons.info_outline),
+                  label: const Text('Details'),
+                ),
+                const SizedBox(width: 8),
+                TextButton.icon(
+                  onPressed: onOpenTimeline,
+                  icon: const Icon(Icons.timeline),
+                  label: const Text('Timeline'),
+                ),
+                const Spacer(),
+                if (selectionMode && onToggleSelect != null)
+                  TextButton.icon(
+                    onPressed: onToggleSelect,
+                    icon: Icon(
+                      isSelected
+                          ? Icons.remove_circle_outline
+                          : Icons.add_circle_outline,
+                    ),
+                    label: Text(isSelected ? 'Remove' : 'Add to entry'),
+                  ),
+              ],
+            ),
+            Wrap(
+              spacing: 8,
+              runSpacing: 4,
+              children: [
+                _statPill(
+                  context,
+                  label: 'Miles',
+                  value: _formatNumber(loco.mileage),
+                ),
+                _statPill(
+                  context,
+                  label: 'Trips',
+                  value: (loco.trips ?? loco.journeys ?? 0).toString(),
+                ),
+                if (operatorName.isNotEmpty)
+                  _statPill(context, label: 'Operator', value: operatorName),
+                if (domain.isNotEmpty)
+                  _statPill(context, label: 'Domain', value: domain),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _statPill(
+    BuildContext context, {
+    required String label,
+    required String value,
+  }) {
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6),
+      decoration: BoxDecoration(
+        color: Theme.of(context).colorScheme.surfaceContainerHighest,
+        borderRadius: BorderRadius.circular(10),
+      ),
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Text('$label: ', style: Theme.of(context).textTheme.labelSmall),
+          Text(
+            value,
+            style: Theme.of(
+              context,
+            ).textTheme.labelSmall?.copyWith(fontWeight: FontWeight.w700),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+Future<void> showTractionDetails(
+  BuildContext context,
+  LocoSummary loco,
+) async {
+  final hasMileageOrTrips = _hasMileageOrTrips(loco);
+  await showModalBottomSheet(
+    context: context,
+    isScrollControlled: true,
+    builder: (ctx) {
+      return DraggableScrollableSheet(
+        expand: false,
+        maxChildSize: 0.9,
+        initialChildSize: 0.65,
+        builder: (_, controller) {
+          return Padding(
+            padding: const EdgeInsets.all(16.0),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Row(
+                  children: [
+                    IconButton(
+                      icon: const Icon(Icons.close),
+                      onPressed: () => Navigator.of(ctx).pop(),
+                    ),
+                    const SizedBox(width: 8),
+                    Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Row(
+                          children: [
+                            Text(
+                              loco.number,
+                              style: Theme.of(context).textTheme.titleLarge
+                                  ?.copyWith(fontWeight: FontWeight.w800),
+                            ),
+                            if (hasMileageOrTrips)
+                              Padding(
+                                padding: const EdgeInsets.only(left: 6.0),
+                                child: Icon(
+                                  Icons.check_circle,
+                                  size: 18,
+                                  color: Colors.green.shade600,
+                                ),
+                              ),
+                          ],
+                        ),
+                        Text(
+                          loco.locoClass,
+                          style: Theme.of(context).textTheme.labelMedium,
+                        ),
+                      ],
+                    ),
+                  ],
+                ),
+                if ((loco.name ?? '').isNotEmpty)
+                  Padding(
+                    padding: const EdgeInsets.only(left: 52.0, bottom: 12),
+                    child: Text(
+                      loco.name ?? '',
+                      style: Theme.of(context).textTheme.bodyMedium,
+                    ),
+                  ),
+                const SizedBox(height: 4),
+                Expanded(
+                  child: ListView(
+                    controller: controller,
+                    children: [
+                      _detailRow(context, 'Status', loco.status ?? 'Unknown'),
+                      _detailRow(context, 'Operator', loco.operator ?? ''),
+                      _detailRow(context, 'Domain', loco.domain ?? ''),
+                      _detailRow(context, 'Owner', loco.owner ?? ''),
+                      _detailRow(context, 'Livery', loco.livery ?? ''),
+                      _detailRow(context, 'Location', loco.location ?? ''),
+                      _detailRow(
+                        context,
+                        'Mileage',
+                        _formatNumber(loco.mileage ?? 0),
+                      ),
+                      _detailRow(
+                        context,
+                        'Trips',
+                        (loco.trips ?? loco.journeys ?? 0).toString(),
+                      ),
+                      _detailRow(context, 'EVN', loco.evn ?? ''),
+                      if (loco.notes != null && loco.notes!.isNotEmpty)
+                        _detailRow(context, 'Notes', loco.notes!),
+                    ],
+                  ),
+                ),
+              ],
+            ),
+          );
+        },
+      );
+    },
+  );
+}
+
+Widget _detailRow(BuildContext context, String label, String value) {
+  if (value.isEmpty) return const SizedBox.shrink();
+  return Padding(
+    padding: const EdgeInsets.symmetric(vertical: 6.0),
+    child: Row(
+      children: [
+        SizedBox(
+          width: 110,
+          child: Text(
+            label,
+            style: Theme.of(context)
+                .textTheme
+                .labelMedium
+                ?.copyWith(fontWeight: FontWeight.w600),
+          ),
+        ),
+        Expanded(
+          child: Text(value, style: Theme.of(context).textTheme.bodyMedium),
+        ),
+      ],
+    ),
+  );
+}
+
+(Color, Color) _statusChipColors(BuildContext context, String status) {
+  final scheme = Theme.of(context).colorScheme;
+  final isDark = scheme.brightness == Brightness.dark;
+  Color blend(
+    Color base, {
+    double bgOpacity = 0.18,
+    double fgOpacity = 0.82,
+  }) {
+    final bg = Color.alphaBlend(
+      base.withValues(alpha: isDark ? bgOpacity + 0.07 : bgOpacity),
+      scheme.surface,
+    );
+    final fg = Color.alphaBlend(
+      base.withValues(alpha: isDark ? fgOpacity : fgOpacity * 0.8),
+      scheme.onSurface,
+    );
+    return Color.lerp(bg, fg, 0.0) ?? bg;
+  }
+
+  Color background;
+  Color foreground;
+  final key = status.toLowerCase();
+
+  if (key.contains('scrap')) {
+    background = blend(Colors.red);
+    foreground = Colors.red.shade200.withValues(alpha: isDark ? 0.85 : 0.9);
+  } else if (key.contains('active')) {
+    background = blend(scheme.primary);
+    foreground = scheme.primary.withValues(alpha: isDark ? 0.9 : 0.8);
+  } else if (key.contains('withdrawn')) {
+    background = blend(Colors.amber);
+    foreground = Colors.amber.shade800.withValues(alpha: isDark ? 0.9 : 0.8);
+  } else if (key.contains('stored') || key.contains('unknown')) {
+    background = blend(Colors.grey);
+    foreground = Colors.grey.shade700.withValues(alpha: isDark ? 0.85 : 0.75);
+  } else {
+    background = scheme.surfaceContainerHighest;
+    foreground = scheme.onSurface;
+  }
+  return (background, foreground);
+}
+
+bool _hasMileageOrTrips(LocoSummary loco) {
+  final mileage = loco.mileage ?? 0;
+  final trips = loco.trips ?? loco.journeys ?? 0;
+  return mileage > 0 || trips > 0;
+}
+
+String _formatNumber(double? value) {
+  if (value == null) return '0';
+  return value.toStringAsFixed(1);
+}

lib/main.dart

@@ -1,15 +1,19 @@
 import 'package:flutter/material.dart';
 import 'package:dynamic_color/dynamic_color.dart';
 import 'package:mileograph_flutter/components/pages/calculator.dart';
+import 'package:mileograph_flutter/components/pages/calculator_details.dart';
+import 'package:mileograph_flutter/components/pages/loco_timeline.dart';
 import 'package:mileograph_flutter/components/pages/new_entry.dart';
+import 'package:mileograph_flutter/components/pages/new_traction.dart';
 import 'package:mileograph_flutter/components/pages/traction.dart';
 import 'package:mileograph_flutter/components/pages/trips.dart';
 import 'package:provider/provider.dart';
 
 import 'package:mileograph_flutter/components/pages/legs.dart';
-import 'package:mileograph_flutter/services/apiService.dart';
+import 'package:mileograph_flutter/services/api_service.dart';
 import 'package:mileograph_flutter/services/authservice.dart';
-import 'package:mileograph_flutter/services/dataService.dart';
+import 'package:mileograph_flutter/services/data_service.dart';
+import 'package:mileograph_flutter/services/navigation_guard.dart';
 
 import 'components/login/login.dart';
 import 'components/pages/dashboard.dart';
@@ -24,7 +28,7 @@ void main() {
       providers: [
         Provider<ApiService>(
           create: (_) {
-            api = ApiService(baseUrl: 'https://dev.mileograph.co.uk/api/v1');
+            api = ApiService(baseUrl: 'https://mileograph.co.uk/api/v1');
             return api;
           },
         ),
@@ -35,8 +39,9 @@ void main() {
           },
         ),
         ProxyProvider<AuthService, void>(
-          update: (_, auth, __) {
+          update: (_, auth, previous) {
             api.setTokenProvider(() => auth.token);
+            api.setUnauthorizedHandler(() => auth.handleTokenExpired());
           },
         ),
         ChangeNotifierProxyProvider<ApiService, DataService>(
@@ -84,19 +89,57 @@ class MyApp extends StatelessWidget {
             return MyHomePage(child: child);
           },
           routes: [
-            GoRoute(path: '/', builder: (_, __) => const Dashboard()),
-            GoRoute(path: '/calculator', builder: (_, __) => CalculatorPage()),
+            GoRoute(path: '/', builder: (context, state) => const Dashboard()),
+            GoRoute(
+              path: '/calculator',
+              builder: (context, state) => CalculatorPage(),
+            ),
             GoRoute(
               path: '/calculator/details',
-              builder: (_, __) => CalculatorPage(),
+              builder: (context, state) => CalculatorDetailsPage(
+                result: state.extra,
+              ),
+            ),
+            GoRoute(path: '/legs', builder: (context, state) => LegsPage()),
+            GoRoute(path: '/traction', builder: (context, state) => TractionPage()),
+            GoRoute(
+              path: '/traction/:id/timeline',
+              builder: (_, state) {
+                final idParam = state.pathParameters['id'];
+                final locoId = int.tryParse(idParam ?? '') ?? 0;
+                final extra = state.extra;
+                String label = state.uri.queryParameters['label'] ?? '';
+                if (extra is Map && extra['label'] is String) {
+                  label = extra['label'] as String;
+                } else if (extra is String && extra.isNotEmpty) {
+                  label = extra;
+                }
+                if (label.trim().isEmpty) {
+                  label = 'Loco $locoId';
+                }
+                return LocoTimelinePage(
+                  locoId: locoId,
+                  locoLabel: label,
+                );
+              },
+            ),
+            GoRoute(
+              path: '/traction/new',
+              builder: (context, state) => const NewTractionPage(),
+            ),
+            GoRoute(path: '/trips', builder: (context, state) => TripsPage()),
+            GoRoute(path: '/add', builder: (context, state) => NewEntryPage()),
+            GoRoute(
+              path: '/legs/edit/:id',
+              builder: (_, state) {
+                final idParam = state.pathParameters['id'];
+                final legId = idParam == null ? null : int.tryParse(idParam);
+                return NewEntryPage(editLegId: legId);
+              },
             ),
-            GoRoute(path: '/legs', builder: (_, __) => LegsPage()),
-            GoRoute(path: '/traction', builder: (_, __) => TractionPage()),
-            GoRoute(path: '/trips', builder: (_, __) => TripsPage()),
-            GoRoute(path: '/add', builder: (_, __) => NewEntryPage()),
           ],
         ),
-        GoRoute(path: '/login', builder: (_, __) => const LoginScreen()),
+        GoRoute(path: '/login', builder: (context, state) => const LoginScreen()),
       ],
     );
 
@@ -163,19 +206,25 @@ class _MyHomePageState extends State<MyHomePage> {
   ];
 
   int _getIndexFromLocation(String location) {
-    int newIndex = contentPages.indexWhere((path) => location == path);
+    int newIndex = contentPages.indexWhere((path) {
+      if (location == path) return true;
+      if (path == '/') return location == '/';
+      return location.startsWith('$path/');
+    });
     if (newIndex < 0) {
       return 0;
     }
     return newIndex;
   }
 
-  void _onItemTapped(int index, int currentIndex) {
+  Future<void> _onItemTapped(int index, int currentIndex) async {
     if (index < 0 || index >= contentPages.length || index == currentIndex) {
       return;
     }
-    context.push(contentPages[index]);
-    _getIndexFromLocation(contentPages[index]);
+    await NavigationGuard.attemptNavigation(() async {
+      if (!mounted) return;
+      context.go(contentPages[index]);
+    });
   }
 
   bool loggedIn = false;
@@ -189,11 +238,13 @@ class _MyHomePageState extends State<MyHomePage> {
       _fetched = true;
       WidgetsBinding.instance.addPostFrameCallback((_) {
         Future(() async {
+          if (!mounted) return;
           final data = context.read<DataService>();
           final auth = context.read<AuthService>();
           api.setTokenProvider(() => auth.token);
           await auth.tryRestoreSession();
           if (!auth.isLoggedIn) return;
+          data.fetchEventFields();
           if (data.homepageStats == null) {
             data.fetchHomepageStats();
           }

lib/objects/objects.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
 
 class DestinationObject {
   const DestinationObject(
@@ -15,24 +16,24 @@ class DestinationObject {
 }
 
 class UserData {
-  const UserData(this.username, this.full_name, this.user_id, this.email);
+  const UserData(this.username, this.fullName, this.userId, this.email);
 
-  final String user_id;
+  final String userId;
   final String username;
-  final String full_name;
+  final String fullName;
   final String email;
 }
 
 class AuthenticatedUserData extends UserData {
   const AuthenticatedUserData({
-    required String user_id,
+    required String userId,
     required String username,
-    required String full_name,
+    required String fullName,
     required String email,
-    required this.access_token,
-  }) : super(username, full_name, user_id, email);
+    required this.accessToken,
+  }) : super(username, fullName, userId, email);
 
-  final String access_token;
+  final String accessToken;
 }
 
 class HomepageStats {
@@ -190,6 +191,143 @@ class LocoSummary extends Loco {
   );
 }
 
+class LocoAttrVersion {
+  final String attrCode;
+  final int? versionId;
+  final int locoId;
+  final int? attrTypeId;
+  final String? valueStr;
+  final int? valueInt;
+  final DateTime? valueDate;
+  final bool? valueBool;
+  final String? valueEnum;
+  final DateTime? validFrom;
+  final DateTime? validTo;
+  final DateTime? txnFrom;
+  final DateTime? txnTo;
+  final String? suggestedBy;
+  final String? approvedBy;
+  final DateTime? approvedAt;
+  final int? sourceEventId;
+  final String? precisionLevel;
+  final String? maskedValidFrom;
+  final dynamic valueNorm;
+
+  const LocoAttrVersion({
+    required this.attrCode,
+    required this.locoId,
+    this.versionId,
+    this.attrTypeId,
+    this.valueStr,
+    this.valueInt,
+    this.valueDate,
+    this.valueBool,
+    this.valueEnum,
+    this.validFrom,
+    this.validTo,
+    this.txnFrom,
+    this.txnTo,
+    this.suggestedBy,
+    this.approvedBy,
+    this.approvedAt,
+    this.sourceEventId,
+    this.precisionLevel,
+    this.maskedValidFrom,
+    this.valueNorm,
+  });
+
+  factory LocoAttrVersion.fromJson(Map<String, dynamic> json) {
+    return LocoAttrVersion(
+      attrCode: json['attr_code']?.toString() ?? '',
+      locoId: (json['loco_id'] as num?)?.toInt() ?? 0,
+      versionId: (json['loco_attr_v_id'] as num?)?.toInt(),
+      attrTypeId: (json['attr_type_id'] as num?)?.toInt(),
+      valueStr: json['value_str']?.toString(),
+      valueInt: (json['value_int'] as num?)?.toInt(),
+      valueDate: _parseDate(json['value_date']),
+      valueBool: _parseBool(json['value_bool']),
+      valueEnum: json['value_enum']?.toString(),
+      validFrom: _parseDate(json['valid_from']),
+      validTo: _parseDate(json['valid_to']),
+      txnFrom: _parseDate(json['txn_from']),
+      txnTo: _parseDate(json['txn_to']),
+      suggestedBy: json['suggested_by']?.toString(),
+      approvedBy: json['approved_by']?.toString(),
+      approvedAt: _parseDate(json['approved_at']),
+      sourceEventId: (json['source_event_id'] as num?)?.toInt(),
+      precisionLevel: json['precision_level']?.toString(),
+      maskedValidFrom: json['masked_valid_from']?.toString(),
+      valueNorm: json['value_norm'],
+    );
+  }
+
+  static DateTime? _parseDate(dynamic value) {
+    if (value == null) return null;
+    if (value is DateTime) return value;
+    return DateTime.tryParse(value.toString());
+  }
+
+  static bool? _parseBool(dynamic value) {
+    if (value == null) return null;
+    if (value is bool) return value;
+    if (value is num) return value != 0;
+    final str = value.toString().toLowerCase();
+    if (['true', '1', 'yes'].contains(str)) return true;
+    if (['false', '0', 'no'].contains(str)) return false;
+    return null;
+  }
+
+  static List<LocoAttrVersion> fromGroupedJson(dynamic json) {
+    final List<LocoAttrVersion> items = [];
+    if (json is Map) {
+      json.forEach((key, value) {
+        if (value is List) {
+          for (final entry in value) {
+            if (entry is Map<String, dynamic>) {
+              final merged = Map<String, dynamic>.from(entry);
+              merged.putIfAbsent('attr_code', () => key);
+              items.add(LocoAttrVersion.fromJson(merged));
+            }
+          }
+        }
+      });
+    }
+    items.sort(
+      (a, b) {
+        final aDate = a.validFrom ?? a.txnFrom ?? DateTime.fromMillisecondsSinceEpoch(0);
+        final bDate = b.validFrom ?? b.txnFrom ?? DateTime.fromMillisecondsSinceEpoch(0);
+        final dateCompare = aDate.compareTo(bDate);
+        if (dateCompare != 0) return dateCompare;
+        return a.attrCode.compareTo(b.attrCode);
+      },
+    );
+    return items;
+  }
+
+  String get valueLabel {
+    if (valueStr != null && valueStr!.isNotEmpty) return valueStr!;
+    if (valueEnum != null && valueEnum!.isNotEmpty) return valueEnum!;
+    if (valueInt != null) return valueInt!.toString();
+    if (valueBool != null) return valueBool! ? 'Yes' : 'No';
+    if (valueDate != null) return DateFormat('yyyy-MM-dd').format(valueDate!);
+    if (valueNorm != null && valueNorm.toString().isNotEmpty) {
+      return valueNorm.toString();
+    }
+    return '—';
+  }
+
+  String get validityRange {
+    final start = maskedValidFrom ?? _formatDate(validFrom) ?? 'Unknown';
+    final end = _formatDate(validTo, fallback: 'Present') ?? 'Present';
+    return '$start → $end';
+  }
+
+  String? _formatDate(DateTime? value, {String? fallback}) {
+    if (value == null) return fallback;
+    return DateFormat('yyyy-MM-dd').format(value);
+  }
+}
+
 class LeaderboardEntry {
   final String userId, username, userFullName;
   final double mileage;
@@ -386,7 +524,7 @@ class TripDetail {
   });
 
   factory TripDetail.fromJson(Map<String, dynamic> json) => TripDetail(
-    id: json['trip_id'] ?? 0,
+    id: json['trip_id'] ?? json['id'] ?? 0,
     name: json['trip_name'] ?? '',
     mileage: (json['trip_mileage'] as num?)?.toDouble() ?? 0,
     legCount: json['leg_count'] ?? ((json['trip_legs'] as List?)?.length ?? 0),
@@ -397,3 +535,82 @@ class TripDetail {
         [],
   );
 }
+
+class TripLocoStat {
+  final String locoClass;
+  final String number;
+  final String? name;
+  final bool won;
+
+  TripLocoStat({
+    required this.locoClass,
+    required this.number,
+    required this.won,
+    this.name,
+  });
+
+  factory TripLocoStat.fromJson(Map<String, dynamic> json) {
+    final locoJson = json['loco'] is Map<String, dynamic>
+        ? Map<String, dynamic>.from(json['loco'] as Map)
+        : null;
+    final locoClass = json['loco_class'] ??
+        json['class'] ??
+        locoJson?['class'] ??
+        locoJson?['loco_class'] ??
+        '';
+    final locoNumber = json['loco_number'] ??
+        json['number'] ??
+        locoJson?['number'] ??
+        locoJson?['loco_number'] ??
+        '';
+    final locoName =
+        json['loco_name'] ?? json['name'] ?? locoJson?['name'] ?? locoJson?['loco_name'];
+    final wonValue = json['won'] ?? json['result'] ?? json['winner'];
+    final won = _parseWonFlag(wonValue);
+
+    return TripLocoStat(
+      locoClass: locoClass,
+      number: locoNumber,
+      name: locoName,
+      won: won,
+    );
+  }
+
+  static bool _parseWonFlag(dynamic value) {
+    if (value == null) return false;
+    if (value is bool) return value;
+    if (value is num) return value != 0;
+    final normalized = value.toString().toLowerCase();
+    return ['1', 'true', 'win', 'won', 'yes', 'w'].contains(normalized);
+  }
+}
+
+class EventField {
+  final String name;
+  final String display;
+  final String? type;
+  final List<String>? enumValues;
+
+  const EventField({
+    required this.name,
+    required this.display,
+    this.type,
+    this.enumValues,
+  });
+
+  factory EventField.fromJson(Map<String, dynamic> json) {
+    final enumList = json['enum'];
+    List<String>? enumValues;
+    if (enumList is List) {
+      enumValues = enumList.map((e) => e.toString()).toList();
+    }
+    final baseName = json['name']?.toString() ?? json['field']?.toString() ?? '';
+    final display = json['field']?.toString() ?? baseName;
+    return EventField(
+      name: baseName,
+      display: display,
+      type: json['type']?.toString(),
+      enumValues: enumValues,
+    );
+  }
+}

lib/services/api_service.dart

@@ -2,10 +2,12 @@ import 'dart:convert';
 import 'package:http/http.dart' as http;
 
 typedef TokenProvider = String? Function();
+typedef UnauthorizedHandler = Future<void> Function();
 
 class ApiService {
   final String baseUrl;
   TokenProvider? _getToken;
+  UnauthorizedHandler? _onUnauthorized;
 
   ApiService({required this.baseUrl});
 
@@ -13,6 +15,10 @@ class ApiService {
     _getToken = provider;
   }
 
+  void setUnauthorizedHandler(UnauthorizedHandler handler) {
+    _onUnauthorized = handler;
+  }
+
   Map<String, String> _buildHeaders(Map<String, String>? extra) {
     final token = _getToken?.call();
     final headers = {'accept': 'application/json', ...?extra};
@@ -85,12 +91,16 @@ class ApiService {
     return {'Content-Type': 'application/json', if (extra != null) ...extra};
   }
 
-  dynamic _processResponse(http.Response res) {
+  Future<dynamic> _processResponse(http.Response res) async {
     final body = res.body.isNotEmpty ? jsonDecode(res.body) : null;
     if (res.statusCode >= 200 && res.statusCode < 300) {
       return body;
-    } else {
+    }
+
+    if (res.statusCode == 401 && _onUnauthorized != null) {
+      await _onUnauthorized!();
+    }
+
     throw Exception('API error ${res.statusCode}: $body');
   }
-  }
 }

lib/services/authservice.dart

@@ -1,22 +1,23 @@
 import 'package:flutter/foundation.dart';
 import 'package:mileograph_flutter/objects/objects.dart';
-import 'package:mileograph_flutter/services/apiService.dart';
-import 'package:shared_preferences/shared_preferences.dart';
+import 'package:mileograph_flutter/services/api_service.dart';
+import 'package:mileograph_flutter/services/token_storage_service.dart';
 
 class AuthService extends ChangeNotifier {
   final ApiService api;
-  static const _tokenKey = 'auth_token';
   bool _restoring = false;
 
+  final TokenStorageService _tokenStorage = TokenStorageService();
+
   AuthService({required this.api});
 
   AuthenticatedUserData? _user;
 
   bool get isLoggedIn => _user != null;
-  String? get token => _user?.access_token;
-  String? get userId => _user?.user_id;
+  String? get token => _user?.accessToken;
+  String? get userId => _user?.userId;
   String? get username => _user?.username;
-  String? get fullName => _user?.full_name;
+  String? get fullName => _user?.fullName;
 
   void setLoginData({
     required String userId,
@@ -26,10 +27,10 @@ class AuthService extends ChangeNotifier {
     required String email,
   }) {
     _user = AuthenticatedUserData(
-      user_id: userId,
+      userId: userId,
       username: username,
-      full_name: fullName,
-      access_token: accessToken,
+      fullName: fullName,
+      accessToken: accessToken,
       email: email,
     );
     _persistToken(accessToken);
@@ -73,9 +74,10 @@ class AuthService extends ChangeNotifier {
     if (_restoring || _user != null) return;
     _restoring = true;
     try {
-      final prefs = await SharedPreferences.getInstance();
-      final token = prefs.getString(_tokenKey);
+      // read token from secure storage (with fallback)
+      final token = await _tokenStorage.getToken();
       if (token == null || token.isEmpty) return;
+
       final userResponse = await api.get(
         '/users/me',
         headers: {
@@ -83,6 +85,7 @@ class AuthService extends ChangeNotifier {
           'accept': 'application/json',
         },
       );
+
       setLoginData(
         userId: userResponse['user_id'],
         username: userResponse['username'],
@@ -97,14 +100,30 @@ class AuthService extends ChangeNotifier {
     }
   }
 
+  Future<bool> validateStoredToken() async {
+    final token = await _tokenStorage.getToken();
+    if (token == null || token.isEmpty) return false;
+    try {
+      await api.get(
+        '/validate',
+        headers: {
+          'Authorization': 'Bearer $token',
+          'accept': 'application/json',
+        },
+      );
+      return true;
+    } catch (_) {
+      await _clearToken();
+      return false;
+    }
+  }
+
   Future<void> _persistToken(String token) async {
-    final prefs = await SharedPreferences.getInstance();
-    await prefs.setString(_tokenKey, token);
+    await _tokenStorage.setToken(token);
   }
 
   Future<void> _clearToken() async {
-    final prefs = await SharedPreferences.getInstance();
-    await prefs.remove(_tokenKey);
+    await _tokenStorage.clearToken();
   }
 
   Future<void> register({
@@ -126,9 +145,13 @@ class AuthService extends ChangeNotifier {
     await api.postForm('/register', formData);
   }
 
-  void logout() {
+  Future<void> handleTokenExpired() async {
     _user = null;
-    _clearToken();
+    await _clearToken();
     notifyListeners();
   }
+
+  void logout() {
+    handleTokenExpired(); // reuse
+  }
 }

lib/services/data_service.dart

@@ -1,9 +1,10 @@
 import 'dart:async';
+import 'dart:convert';
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:mileograph_flutter/objects/objects.dart';
-import 'package:mileograph_flutter/services/apiService.dart'; // assumes you've moved HomepageStats + submodels to a separate file
+import 'package:mileograph_flutter/services/api_service.dart'; // assumes you've moved HomepageStats + submodels to a separate file
 
 class _LegFetchOptions {
   final int limit;
@@ -49,6 +50,12 @@ class DataService extends ChangeNotifier {
   bool get isTractionLoading => _isTractionLoading;
   bool _tractionHasMore = false;
   bool get tractionHasMore => _tractionHasMore;
+  final Map<int, List<LocoAttrVersion>> _locoTimelines = {};
+  final Map<int, bool> _isLocoTimelineLoading = {};
+  List<LocoAttrVersion> timelineForLoco(int locoId) =>
+      _locoTimelines[locoId] ?? [];
+  bool isLocoTimelineLoading(int locoId) =>
+      _isLocoTimelineLoading[locoId] ?? false;
 
   // Trips
   List<TripSummary> _trips = [];
@@ -61,6 +68,10 @@ class DataService extends ChangeNotifier {
   List<String> get locoClasses => _locoClasses;
   List<TripSummary> _tripList = [];
   List<TripSummary> get tripList => _tripList;
+  List<EventField> _eventFields = [];
+  List<EventField> get eventFields => _eventFields;
+  bool _isEventFieldsLoading = false;
+  bool get isEventFieldsLoading => _isEventFieldsLoading;
 
   // Station Data
   List<Station>? _cachedStations;
@@ -73,6 +84,17 @@ class DataService extends ChangeNotifier {
   bool _isOnThisDayLoading = false;
   bool get isOnThisDayLoading => _isOnThisDayLoading;
 
+  static const List<EventField> _fallbackEventFields = [
+    EventField(name: 'operator', display: 'Operator'),
+    EventField(name: 'status', display: 'Status'),
+    EventField(name: 'evn', display: 'EVN'),
+    EventField(name: 'owner', display: 'Owner'),
+    EventField(name: 'location', display: 'Location'),
+    EventField(name: 'livery', display: 'Livery'),
+    EventField(name: 'domain', display: 'Domain'),
+    EventField(name: 'type', display: 'Type'),
+  ];
+
   void _notifyAsync() {
     // Always defer to the next frame to avoid setState during build.
     SchedulerBinding.instance.addPostFrameCallback((_) {
@@ -117,7 +139,8 @@ class DataService extends ChangeNotifier {
       );
     }
     final buffer = StringBuffer(
-        '?sort_direction=$sortDirection&sort_by=$sortBy&offset=$offset&limit=$limit');
+      '?sort_direction=$sortDirection&sort_by=$sortBy&offset=$offset&limit=$limit',
+    );
     if (dateRangeStart != null && dateRangeStart.isNotEmpty) {
       buffer.write('&date_range_start=$dateRangeStart');
     }
@@ -178,7 +201,7 @@ class DataService extends ChangeNotifier {
     try {
       final params = StringBuffer('?limit=$limit&offset=$offset');
       if (hadOnly) params.write('&had_only=true');
-      if (mileageFirst) params.write('&mileage_first=true');
+      if (!mileageFirst) params.write('&mileage_first=false');
 
       final payload = <String, dynamic>{};
       if (locoClass != null && locoClass.isNotEmpty) {
@@ -203,7 +226,7 @@ class DataService extends ChangeNotifier {
       if (json is List) {
         final newItems = json.map((e) => LocoSummary.fromJson(e)).toList();
         _traction = append ? [..._traction, ...newItems] : newItems;
-        _tractionHasMore = newItems.length >= limit;
+        _tractionHasMore = newItems.length >= limit - 1;
       } else {
         throw Exception('Unexpected traction response: $json');
       }
@@ -219,6 +242,41 @@ class DataService extends ChangeNotifier {
     }
   }
 
+  Future<List<LocoAttrVersion>> fetchLocoTimeline(int locoId) async {
+    _isLocoTimelineLoading[locoId] = true;
+    _notifyAsync();
+    try {
+      final json = await api.get('/loco/get-timeline/$locoId');
+      final timeline = LocoAttrVersion.fromGroupedJson(json);
+      _locoTimelines[locoId] = timeline;
+      return timeline;
+    } catch (e) {
+      debugPrint('Failed to fetch loco timeline for $locoId: $e');
+      _locoTimelines[locoId] = [];
+      return [];
+    } finally {
+      _isLocoTimelineLoading[locoId] = false;
+      _notifyAsync();
+    }
+  }
+
+  Future<dynamic> createLoco(Map<String, dynamic> payload) async {
+    try {
+      final response = await api.put('/loco/new', payload);
+      final locoClass = payload['class']?.toString();
+      if (locoClass != null &&
+          locoClass.isNotEmpty &&
+          !_locoClasses.contains(locoClass)) {
+        _locoClasses = [..._locoClasses, locoClass];
+      }
+      _notifyAsync();
+      return response;
+    } catch (e) {
+      debugPrint('Failed to create loco: $e');
+      rethrow;
+    }
+  }
+
   Future<void> fetchOnThisDay({DateTime? date}) async {
     _isOnThisDayLoading = true;
     final target = date ?? DateTime.now();
@@ -245,12 +303,13 @@ class DataService extends ChangeNotifier {
     try {
       final json = await api.get('/trips/legs-and-stats');
       if (json is List) {
-        _tripDetails = json.map((e) => TripDetail.fromJson(e)).toList();
+        final tripMap = json.map((e) => TripDetail.fromJson(e)).toList();
+        _tripDetails = [...tripMap]..sort((a, b) => b.id.compareTo(a.id));
       } else {
         _tripDetails = [];
       }
     } catch (e) {
-      debugPrint('Failed to fetch trips: $e');
+      debugPrint('Failed to fetch trip_map: $e');
       _tripDetails = [];
     } finally {
       _isTripDetailsLoading = false;
@@ -258,9 +317,86 @@ class DataService extends ChangeNotifier {
     }
   }
 
+  Future<List<TripLocoStat>> fetchTripLocoStats(int tripId) async {
+    try {
+      final json = await api.get('/trips/stats/$tripId');
+      return _parseTripLocoStats(json);
+    } catch (e) {
+      debugPrint('Failed to fetch trip loco stats: $e');
+      return [];
+    }
+  }
+
+  List<TripLocoStat> _parseTripLocoStats(dynamic json) {
+    List<dynamic>? list;
+    if (json is List) {
+      list = json.expand((e) => e is List ? e : [e]).toList();
+    } else if (json is Map) {
+      for (final key in ['locos', 'stats', 'data', 'trip_locos']) {
+        final candidate = json[key];
+        if (candidate is List) {
+          list = candidate.expand((e) => e is List ? e : [e]).toList();
+          break;
+        }
+      }
+    }
+    if (list == null) return [];
+    return list
+        .whereType<Map<String, dynamic>>()
+        .map((e) => TripLocoStat.fromJson(e))
+        .toList();
+  }
+
+  Future<void> fetchEventFields({bool force = false}) async {
+    if (_eventFields.isNotEmpty && !force) return;
+    _isEventFieldsLoading = true;
+    _notifyAsync();
+    try {
+      final json = await api.get('/event/fields');
+      List<EventField> fields = _parseEventFields(json);
+      if (fields.isEmpty) {
+        fields = _fallbackEventFields;
+      }
+      _eventFields = fields;
+    } catch (e) {
+      debugPrint('Failed to fetch event fields: $e');
+      _eventFields = _fallbackEventFields;
+    } finally {
+      _isEventFieldsLoading = false;
+      _notifyAsync();
+    }
+  }
+
+  List<EventField> _parseEventFields(dynamic json) {
+    if (json is List) {
+      return json
+          .whereType<Map<String, dynamic>>()
+          .map(EventField.fromJson)
+          .toList();
+    }
+    if (json is Map) {
+      if (json['fields'] is List) {
+        return (json['fields'] as List)
+            .whereType<Map<String, dynamic>>()
+            .map(EventField.fromJson)
+            .toList();
+      }
+      // If map of name -> definition
+      return json.entries
+          .where((entry) => entry.value is Map<String, dynamic>)
+          .map((entry) {
+            final map = Map<String, dynamic>.from(entry.value);
+            map['name'] = entry.key;
+            return EventField.fromJson(map);
+          })
+          .toList();
+    }
+    return [];
+  }
+
   Future<void> fetchTrips() async {
     try {
-      final json = await api.get('/trips');
+      final json = await api.get('/trips/mileage');
       Iterable<dynamic>? raw;
       if (json is List) {
         raw = json;
@@ -274,10 +410,12 @@ class DataService extends ChangeNotifier {
         }
       }
       if (raw != null) {
-        _tripList = raw
+        final tripMap = raw
             .whereType<Map<String, dynamic>>()
             .map((e) => TripSummary.fromJson(e))
             .toList();
+
+        _tripList = [...tripMap]..sort((a, b) => b.tripId.compareTo(a.tripId));
       } else {
         debugPrint('Unexpected trip list response: $json');
         _tripList = [];
@@ -304,12 +442,50 @@ class DataService extends ChangeNotifier {
     return _locoClasses;
   }
 
+  Future<void> createLocoEvent({
+    required int locoId,
+    required String eventDate,
+    required Map<String, dynamic> values,
+    required String details,
+    String eventType = 'other',
+  }) async {
+    try {
+      await api.put(
+        '/event/new',
+        {
+          'loco_id': locoId,
+          'loco_event_type': eventType,
+          'loco_event_date': eventDate,
+          'loco_event_value': jsonEncode(values),
+          'loco_event_details': details,
+        },
+      );
+    } catch (e) {
+      debugPrint('Failed to create loco event: $e');
+      rethrow;
+    }
+  }
+
+  Future<void> deleteTimelineBlock({
+    required int blockId,
+  }) async {
+    try {
+      await api.delete('/event/delete/$blockId');
+    } catch (e) {
+      debugPrint('Failed to delete timeline block $blockId: $e');
+      rethrow;
+    }
+  }
+
   void clear() {
     _homepageStats = null;
     _legs = [];
     _onThisDay = [];
     _trips = [];
     _tripDetails = [];
+    _eventFields = [];
+    _locoTimelines.clear();
+    _isLocoTimelineLoading.clear();
     _notifyAsync();
   }
 

lib/services/navigation_guard.dart

@@ -0,0 +1,40 @@
+typedef NavigationGuardCallback = Future<bool> Function();
+
+class NavigationGuard {
+  static NavigationGuardCallback? _callback;
+
+  static void register(NavigationGuardCallback callback) {
+    _callback = callback;
+  }
+
+  static void unregister(NavigationGuardCallback callback) {
+    if (_callback == callback) {
+      _callback = null;
+    }
+  }
+
+  static Future<void> attemptNavigation(
+    Future<void> Function() performNavigation,
+  ) async {
+    if (_promptActive) return;
+    final cb = _callback;
+    if (cb == null) {
+      await performNavigation();
+      return;
+    }
+    _promptActive = true;
+    bool allow = false;
+    try {
+      allow = await cb();
+    } catch (_) {
+      allow = false;
+    } finally {
+      _promptActive = false;
+    }
+    if (allow) {
+      await performNavigation();
+    }
+  }
+
+  static bool _promptActive = false;
+}

lib/services/token_storage_service.dart

@@ -0,0 +1,57 @@
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+/// Stores the auth token in secure storage and falls back to SharedPreferences
+/// so debug builds and platforms without a working keyring still persist.
+class TokenStorageService {
+  TokenStorageService._internal();
+
+  static final TokenStorageService _instance = TokenStorageService._internal();
+
+  factory TokenStorageService() => _instance;
+
+  static const _tokenKey = 'auth_token';
+  final FlutterSecureStorage _secureStorage = const FlutterSecureStorage();
+
+  Future<SharedPreferences> get _prefs async =>
+      await SharedPreferences.getInstance();
+
+  Future<void> setToken(String token) async {
+    try {
+      await _secureStorage.write(key: _tokenKey, value: token);
+    } catch (_) {
+      // ignore secure storage failures in debug/unsupported environments
+    }
+    final prefs = await _prefs;
+    await prefs.setString(_tokenKey, token);
+  }
+
+  Future<String?> getToken() async {
+    try {
+      final secured = await _secureStorage.read(key: _tokenKey);
+      if (secured != null && secured.isNotEmpty) {
+        return secured;
+      }
+    } catch (_) {
+      // ignore and fall back
+    }
+    final prefs = await _prefs;
+    final token = prefs.getString(_tokenKey);
+    return (token == null || token.isEmpty) ? null : token;
+  }
+
+  Future<void> clearToken() async {
+    try {
+      await _secureStorage.delete(key: _tokenKey);
+    } catch (_) {
+      // ignore
+    }
+    final prefs = await _prefs;
+    await prefs.remove(_tokenKey);
+  }
+
+  Future<bool> hasToken() async {
+    final token = await getToken();
+    return token != null && token.isNotEmpty;
+  }
+}

linux/flutter/generated_plugin_registrant.cc

@@ -7,9 +7,13 @@
 #include "generated_plugin_registrant.h"
 
 #include <dynamic_color/dynamic_color_plugin.h>
+#include <flutter_secure_storage_linux/flutter_secure_storage_linux_plugin.h>
 
 void fl_register_plugins(FlPluginRegistry* registry) {
   g_autoptr(FlPluginRegistrar) dynamic_color_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "DynamicColorPlugin");
   dynamic_color_plugin_register_with_registrar(dynamic_color_registrar);
+  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);
 }

linux/flutter/generated_plugins.cmake

@@ -4,6 +4,7 @@
 
 list(APPEND FLUTTER_PLUGIN_LIST
   dynamic_color
+  flutter_secure_storage_linux
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -6,9 +6,13 @@ import FlutterMacOS
 import Foundation
 
 import dynamic_color
+import flutter_secure_storage_darwin
+import path_provider_foundation
 import shared_preferences_foundation
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   DynamicColorPlugin.register(with: registry.registrar(forPlugin: "DynamicColorPlugin"))
+  FlutterSecureStorageDarwinPlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStorageDarwinPlugin"))
+  PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
 }

pubspec.lock

@@ -1,6 +1,22 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  archive:
+    dependency: transitive
+    description:
+      name: archive
+      sha256: "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.7"
+  args:
+    dependency: transitive
+    description:
+      name: args
+      sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.7.0"
   async:
     dependency: transitive
     description:
@@ -25,6 +41,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.4.0"
+  checked_yaml:
+    dependency: transitive
+    description:
+      name: checked_yaml
+      sha256: "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.4"
+  cli_util:
+    dependency: transitive
+    description:
+      name: cli_util
+      sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.4.2"
   clock:
     dependency: transitive
     description:
@@ -34,13 +66,21 @@ packages:
     source: hosted
     version: "1.1.2"
   collection:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: collection
       sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
       url: "https://pub.dev"
     source: hosted
     version: "1.19.1"
+  crypto:
+    dependency: transitive
+    description:
+      name: crypto
+      sha256: c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.7"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -86,6 +126,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_launcher_icons:
+    dependency: "direct dev"
+    description:
+      name: flutter_launcher_icons
+      sha256: "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.13.1"
   flutter_lints:
     dependency: "direct dev"
     description:
@@ -94,6 +142,54 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.0.0"
+  flutter_secure_storage:
+    dependency: "direct main"
+    description:
+      name: flutter_secure_storage
+      sha256: da922f2aab2d733db7e011a6bcc4a825b844892d4edd6df83ff156b09a9b2e40
+      url: "https://pub.dev"
+    source: hosted
+    version: "10.0.0"
+  flutter_secure_storage_darwin:
+    dependency: transitive
+    description:
+      name: flutter_secure_storage_darwin
+      sha256: "8878c25136a79def1668c75985e8e193d9d7d095453ec28730da0315dc69aee3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.0"
+  flutter_secure_storage_linux:
+    dependency: transitive
+    description:
+      name: flutter_secure_storage_linux
+      sha256: "2b5c76dce569ab752d55a1cee6a2242bcc11fdba927078fb88c503f150767cda"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.0"
+  flutter_secure_storage_platform_interface:
+    dependency: transitive
+    description:
+      name: flutter_secure_storage_platform_interface
+      sha256: "8ceea1223bee3c6ac1a22dabd8feefc550e4729b3675de4b5900f55afcb435d6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
+  flutter_secure_storage_web:
+    dependency: transitive
+    description:
+      name: flutter_secure_storage_web
+      sha256: "6a1137df62b84b54261dca582c1c09ea72f4f9a4b2fcee21b025964132d5d0c3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
+  flutter_secure_storage_windows:
+    dependency: transitive
+    description:
+      name: flutter_secure_storage_windows
+      sha256: "3b7c8e068875dfd46719ff57c90d8c459c87f2302ed6b00ff006b3c9fcad1613"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.1.0"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -128,6 +224,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.1.2"
+  image:
+    dependency: transitive
+    description:
+      name: image
+      sha256: "51555e36056541237b15b57afc31a0f53d4f9aefd9bd00873a6dc0090e54e332"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.6.0"
   intl:
     dependency: "direct main"
     description:
@@ -136,6 +240,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.19.0"
+  json_annotation:
+    dependency: transitive
+    description:
+      name: json_annotation
+      sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.9.0"
   leak_tracker:
     dependency: transitive
     description:
@@ -216,6 +328,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.9.1"
+  path_provider:
+    dependency: transitive
+    description:
+      name: path_provider
+      sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.5"
+  path_provider_android:
+    dependency: transitive
+    description:
+      name: path_provider_android
+      sha256: "3b4c1fc3aa55ddc9cd4aa6759984330d5c8e66aa7702a6223c61540dc6380c37"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.19"
+  path_provider_foundation:
+    dependency: transitive
+    description:
+      name: path_provider_foundation
+      sha256: "16eef174aacb07e09c351502740fa6254c165757638eba1e9116b0a781201bbd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.2"
   path_provider_linux:
     dependency: transitive
     description:
@@ -240,6 +376,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.3.0"
+  petitparser:
+    dependency: transitive
+    description:
+      name: petitparser
+      sha256: "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.0.1"
   platform:
     dependency: transitive
     description:
@@ -256,6 +400,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.8"
+  posix:
+    dependency: transitive
+    description:
+      name: posix
+      sha256: "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.0.3"
   provider:
     dependency: "direct main"
     description:
@@ -405,6 +557,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.1"
+  win32:
+    dependency: transitive
+    description:
+      name: win32
+      sha256: d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.15.0"
   xdg_directories:
     dependency: transitive
     description:
@@ -413,6 +573,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.0"
+  xml:
+    dependency: transitive
+    description:
+      name: xml
+      sha256: "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.6.1"
+  yaml:
+    dependency: transitive
+    description:
+      name: yaml
+      sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.3"
 sdks:
   dart: ">=3.8.1 <4.0.0"
   flutter: ">=3.29.0"

pubspec.yaml

@@ -1,5 +1,5 @@
 name: mileograph_flutter
-description: "A new Flutter project."
+description: "Native app for the Mileograph website"
 # The following line prevents the package from being accidentally published to
 # pub.dev using `flutter pub publish`. This is preferred for private packages.
 publish_to: "none" # Remove this line if you wish to publish to pub.dev
@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.1.1+1
+version: 0.2.2+1
 
 environment:
   sdk: ^3.8.1
@@ -35,6 +35,8 @@ dependencies:
   http: ^1.4.0
   provider: ^6.1.5
   dynamic_color: ^1.6.6
+  flutter_secure_storage: ^10.0.0
+  collection: ^1.18.0
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
@@ -51,6 +53,7 @@ dev_dependencies:
   # package. See that file for information about deactivating specific lint
   # rules and activating additional ones.
   flutter_lints: ^6.0.0
+  flutter_launcher_icons: ^0.13.1
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
@@ -95,3 +98,11 @@ flutter:
   #
   # For details regarding fonts from package dependencies,
   # see https://flutter.dev/to/font-from-package
+
+flutter_launcher_icons:
+  android: true
+  ios: true
+  image_path: assets/icons/app_icon.png
+  adaptive_icon_background: "#ffffff"
+  adaptive_icon_foreground: assets/icons/app_icon.png
+  min_sdk_android: 21

windows/flutter/generated_plugin_registrant.cc

@@ -7,8 +7,11 @@
 #include "generated_plugin_registrant.h"
 
 #include <dynamic_color/dynamic_color_plugin_c_api.h>
+#include <flutter_secure_storage_windows/flutter_secure_storage_windows_plugin.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
   DynamicColorPluginCApiRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("DynamicColorPluginCApi"));
+  FlutterSecureStorageWindowsPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("FlutterSecureStorageWindowsPlugin"));
 }

windows/flutter/generated_plugins.cmake

@@ -4,6 +4,7 @@
 
 list(APPEND FLUTTER_PLUGIN_LIST
   dynamic_color
+  flutter_secure_storage_windows
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST