add draft changes

.gitea/workflows/release.yml

@@ -9,13 +9,14 @@ 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 }}
     steps:
@@ -30,7 +31,8 @@ jobs:
           echo "base=${BASE_VERSION}" >> "$GITHUB_OUTPUT"
 
   android-build:
-    runs-on: ubuntu-latest
+    runs-on:
+      - mileograph
     needs: meta
     steps:
       - name: Checkout
@@ -70,30 +72,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
@@ -109,14 +169,24 @@ jobs:
           $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 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
 
@@ -135,7 +205,8 @@ jobs:
           path: app-linux-x64.tar.gz
 
   release-dev:
-    runs-on: ubuntu-latest
+    runs-on:
+      - mileograph
     needs:
       - meta
       - android-build
@@ -157,54 +228,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="v${BASE}-dev.${{ github.run_number }}"
 
-          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 }}
+          tag: ${{ steps.bundle.outputs.tag }}
           name: v${{ needs.meta.outputs.base_version }}-dev build ${{ github.run_number }}
           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 \
@@ -215,27 +268,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
@@ -243,35 +303,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
-
           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' }}
@@ -281,4 +321,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

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/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/dashboard.dart

@@ -76,8 +76,9 @@ class _DashboardState extends State<Dashboard> {
               if (isInitialLoading)
                 Positioned.fill(
                   child: Container(
-                    color:
-                        Theme.of(context).colorScheme.surface.withOpacity(0.7),
+                    color: Theme.of(
+                      context,
+                    ).colorScheme.surface.withOpacity(0.7),
                     child: const Center(
                       child: Column(
                         mainAxisSize: MainAxisSize.min,
@@ -183,7 +184,8 @@ class _DashboardState extends State<Dashboard> {
         _buildCard(
           context,
           title: 'On this day',
-          action: data.onThisDay
+          action:
+              data.onThisDay
                       .where((leg) => leg.beginTime.year != DateTime.now().year)
                       .length >
                   5
@@ -328,10 +330,10 @@ class _DashboardState extends State<Dashboard> {
   }
 
   Widget _buildTripsCard(BuildContext context, DataService data) {
-    final trips_unsorted = data.trips;
+    final tripsUnsorted = data.trips;
     List trips = [];
-    if (trips_unsorted.isNotEmpty) {
-      trips = [...trips_unsorted]..sort((a, b) => b.tripId.compareTo(a.tripId));
+    if (tripsUnsorted.isNotEmpty) {
+      trips = [...tripsUnsorted]..sort((a, b) => b.tripId.compareTo(a.tripId));
     }
     return _buildCard(
       context,

lib/components/pages/legs.dart

@@ -1,6 +1,7 @@
 import 'dart:convert';
 
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 import 'package:mileograph_flutter/objects/objects.dart';
 import 'package:mileograph_flutter/services/dataService.dart';
 import 'package:provider/provider.dart';
@@ -279,6 +280,11 @@ class _LegsPageState extends State<LegsPage> {
         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:

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/dataService.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,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 import 'package:mileograph_flutter/objects/objects.dart';
 import 'package:mileograph_flutter/services/dataService.dart';
 import 'package:provider/provider.dart';
@@ -68,10 +69,13 @@ class _TractionPageState extends State<TractionPage> {
   }
 
   bool get _hasFilters {
-    final dynamicFieldsUsed = _dynamicControllers.values
-            .any((controller) => controller.text.trim().isNotEmpty) ||
-        _enumSelections.values
-            .any((value) => (value ?? '').toString().trim().isNotEmpty);
+    final dynamicFieldsUsed =
+        _dynamicControllers.values.any(
+          (controller) => controller.text.trim().isNotEmpty,
+        ) ||
+        _enumSelections.values.any(
+          (value) => (value ?? '').toString().trim().isNotEmpty,
+        );
 
     return [
           _selectedClass,
@@ -109,7 +113,11 @@ class _TractionPageState extends State<TractionPage> {
   }
 
   void _clearFilters() {
-    for (final controller in [_classController, _numberController, _nameController]) {
+    for (final controller in [
+      _classController,
+      _numberController,
+      _nameController,
+    ]) {
       controller.clear();
     }
     for (final controller in _dynamicControllers.values) {
@@ -135,9 +143,13 @@ 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()),
+          (field) => ![
+            'class',
+            'number',
+            'name',
+            'build date',
+            'build_date',
+          ].contains(field.name.toLowerCase()),
         )
         .toList();
   }
@@ -147,7 +159,10 @@ class _TractionPageState extends State<TractionPage> {
       if (field.enumValues != null) {
         _enumSelections.putIfAbsent(field.name, () => null);
       } else {
-        _dynamicControllers.putIfAbsent(field.name, () => TextEditingController());
+        _dynamicControllers.putIfAbsent(
+          field.name,
+          () => TextEditingController(),
+        );
       }
     }
   }
@@ -168,12 +183,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',
@@ -181,11 +200,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),
@@ -228,7 +272,12 @@ class _TractionPageState extends State<TractionPage> {
                             );
                           },
                           fieldViewBuilder:
-                              (context, controller, focusNode, onFieldSubmitted) {
+                              (
+                                context,
+                                controller,
+                                focusNode,
+                                onFieldSubmitted,
+                              ) {
                                 return TextField(
                                   controller: controller,
                                   focusNode: focusNode,
@@ -323,7 +372,9 @@ class _TractionPageState extends State<TractionPage> {
                               : Icons.expand_more,
                         ),
                         label: Text(
-                          _showAdvancedFilters ? 'Hide filters' : 'More filters',
+                          _showAdvancedFilters
+                              ? 'Hide filters'
+                              : 'More filters',
                         ),
                       ),
                       ElevatedButton.icon(
@@ -344,7 +395,9 @@ class _TractionPageState extends State<TractionPage> {
                           ? const Center(
                               child: Padding(
                                 padding: EdgeInsets.all(8.0),
-                                child: CircularProgressIndicator(strokeWidth: 2),
+                                child: CircularProgressIndicator(
+                                  strokeWidth: 2,
+                                ),
                               ),
                             )
                           : extraFields.isEmpty
@@ -404,8 +457,9 @@ class _TractionPageState extends State<TractionPage> {
                   Padding(
                     padding: const EdgeInsets.only(top: 8.0),
                     child: OutlinedButton.icon(
-                      onPressed:
-                          data.isTractionLoading ? null : () => _refreshTraction(append: true),
+                      onPressed: data.isTractionLoading
+                          ? null
+                          : () => _refreshTraction(append: true),
                       icon: data.isTractionLoading
                           ? const SizedBox(
                               height: 14,
@@ -458,6 +512,7 @@ class _TractionPageState extends State<TractionPage> {
     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(
@@ -470,18 +525,36 @@ class _TractionPageState extends State<TractionPage> {
               children: [
                 Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Row(
                       children: [
                         Text(
-                      '${loco.locoClass} ${loco.number}',
-                      style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                        fontWeight: FontWeight.w700,
+                          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)
-                      Text(
+                      Padding(
+                        padding: const EdgeInsets.only(top: 2.0),
+                        child: Text(
                           loco.name ?? '',
-                        style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                          fontStyle: FontStyle.italic,
+                          style: Theme.of(context).textTheme.bodyMedium
+                              ?.copyWith(fontStyle: FontStyle.italic),
                         ),
                       ),
                   ],
@@ -580,7 +653,11 @@ class _TractionPageState extends State<TractionPage> {
   (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}) {
+    Color blend(
+      Color base, {
+      double bgOpacity = 0.18,
+      double fgOpacity = 0.82,
+    }) {
       final bg = Color.alphaBlend(
         base.withOpacity(isDark ? bgOpacity + 0.07 : bgOpacity),
         scheme.surface,
@@ -637,11 +714,32 @@ class _TractionPageState extends State<TractionPage> {
                         onPressed: () => Navigator.of(ctx).pop(),
                       ),
                       const SizedBox(width: 8),
+                      Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Row(
+                            children: [
                               Text(
-                        '${loco.locoClass} ${loco.number}',
-                        style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                          fontWeight: FontWeight.w700,
+                                loco.number,
+                                style: Theme.of(context).textTheme.titleLarge
+                                    ?.copyWith(fontWeight: FontWeight.w800),
                               ),
+                              if (_hasMileageOrTrips(loco))
+                                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,
+                          ),
+                        ],
                       ),
                     ],
                   ),
@@ -712,6 +810,12 @@ class _TractionPageState extends State<TractionPage> {
     return value.toStringAsFixed(1);
   }
 
+  bool _hasMileageOrTrips(LocoSummary loco) {
+    final mileage = loco.mileage ?? 0;
+    final trips = loco.trips ?? loco.journeys ?? 0;
+    return mileage > 0 || trips > 0;
+  }
+
   Widget _buildFilterInput(
     BuildContext context,
     EventField field,
@@ -719,29 +823,25 @@ class _TractionPageState extends State<TractionPage> {
   ) {
     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 options = field.enumValues!
+          .map((e) => e.toString())
+          .toSet()
+          .toList();
       final currentValue = _enumSelections[field.name];
-      if (currentValue != null && !options.contains(currentValue)) {
-        options.insert(0, currentValue);
-      }
+      final safeValue = options.contains(currentValue) ? currentValue : null;
       return SizedBox(
         width: width,
         child: DropdownButtonFormField<String?>(
-          value: currentValue,
+          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),
+            ...options.map(
+              (value) => DropdownMenuItem(value: value, child: Text(value)),
             ),
-                )
-                .toList(),
           ],
           onChanged: (val) {
             setState(() {
@@ -759,7 +859,9 @@ class _TractionPageState extends State<TractionPage> {
     TextInputType? inputType;
     if (field.type != null) {
       final type = field.type!.toLowerCase();
-      if (type.contains('int') || type.contains('num') || type.contains('double')) {
+      if (type.contains('int') ||
+          type.contains('num') ||
+          type.contains('double')) {
         inputType = const TextInputType.numberWithOptions(decimal: true);
       }
     }

lib/main.dart

@@ -2,6 +2,7 @@ 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/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';
@@ -10,6 +11,7 @@ import 'package:mileograph_flutter/components/pages/legs.dart';
 import 'package:mileograph_flutter/services/apiService.dart';
 import 'package:mileograph_flutter/services/authservice.dart';
 import 'package:mileograph_flutter/services/dataService.dart';
+import 'package:mileograph_flutter/services/navigation_guard.dart';
 
 import 'components/login/login.dart';
 import 'components/pages/dashboard.dart';
@@ -93,8 +95,20 @@ class MyApp extends StatelessWidget {
             ),
             GoRoute(path: '/legs', builder: (_, __) => LegsPage()),
             GoRoute(path: '/traction', builder: (_, __) => TractionPage()),
+            GoRoute(
+              path: '/traction/new',
+              builder: (_, __) => const NewTractionPage(),
+            ),
             GoRoute(path: '/trips', builder: (_, __) => TripsPage()),
             GoRoute(path: '/add', builder: (_, __) => 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: '/login', builder: (_, __) => const LoginScreen()),
@@ -164,19 +178,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;

lib/objects/objects.dart

@@ -386,7 +386,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),
@@ -411,16 +411,42 @@ class TripLocoStat {
     this.name,
   });
 
-  factory TripLocoStat.fromJson(Map<String, dynamic> json) => TripLocoStat(
-    locoClass: json['loco_class'] ?? json['class'] ?? '',
-    number: json['loco_number'] ?? json['number'] ?? '',
-    name: json['loco_name'] ?? json['name'],
-    won: json['won'] == 1 ||
-        json['won'] == true ||
-        (json['won'] is String && json['won'].toString() == '1'),
+  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;

lib/services/authservice.dart

@@ -100,6 +100,24 @@ 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 {
     await _tokenStorage.setToken(token);
   }

lib/services/dataService.dart

@@ -235,6 +235,23 @@ class DataService extends ChangeNotifier {
     }
   }
 
+  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();
@@ -261,8 +278,8 @@ class DataService extends ChangeNotifier {
     try {
       final json = await api.get('/trips/legs-and-stats');
       if (json is List) {
-        final trip_map = json.map((e) => TripDetail.fromJson(e)).toList();
-        _tripDetails = [...trip_map]..sort((a, b) => b.id.compareTo(a.id));
+        final tripMap = json.map((e) => TripDetail.fromJson(e)).toList();
+        _tripDetails = [...tripMap]..sort((a, b) => b.id.compareTo(a.id));
       } else {
         _tripDetails = [];
       }
@@ -277,26 +294,34 @@ class DataService extends ChangeNotifier {
 
   Future<List<TripLocoStat>> fetchTripLocoStats(int tripId) async {
     try {
-      final json = await api.get('/trips/stats?trip_id=$tripId');
-      if (json is List) {
-        return json
-            .whereType<Map<String, dynamic>>()
-            .map((e) => TripLocoStat.fromJson(e))
-            .toList();
-      }
-      if (json is Map && json['locos'] is List) {
-        return (json['locos'] as List)
-            .whereType<Map<String, dynamic>>()
-            .map((e) => TripLocoStat.fromJson(e))
-            .toList();
-      }
-      return [];
+      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;
@@ -360,12 +385,12 @@ class DataService extends ChangeNotifier {
         }
       }
       if (raw != null) {
-        final trip_map = raw
+        final tripMap = raw
             .whereType<Map<String, dynamic>>()
             .map((e) => TripSummary.fromJson(e))
             .toList();
 
-        _tripList = [...trip_map]..sort((a, b) => b.tripId.compareTo(a.tripId));
+        _tripList = [...tripMap]..sort((a, b) => b.tripId.compareTo(a.tripId));
       } else {
         debugPrint('Unexpected trip list response: $json');
         _tripList = [];

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;
+}

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:
@@ -41,6 +73,14 @@ packages:
       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:
@@ -176,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:
@@ -184,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:
@@ -312,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:
@@ -328,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:
@@ -493,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.2+1
+version: 0.1.4+1
 
 environment:
   sdk: ^3.8.1
@@ -52,6 +52,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
@@ -96,3 +97,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