re add mileograph tags

fix failed flutter install
remove mileograph tag
2026-01-01 18:06:50 +00:00 · 2026-01-01 17:26:54 +00:00 · 2026-01-01 17:11:55 +00:00 · 2026-01-01 15:28:11 +00:00 · 2026-01-01 12:50:27 +00:00 · 2025-12-31 18:23:37 +00:00
31 changed files with 2489 additions and 460 deletions
--- a/.gitea/workflows/release.yml
+++ b/.gitea/workflows/release.yml
@@ -10,7 +10,7 @@ env:
  JAVA_VERSION: "17"
  ANDROID_SDK_ROOT: "${{ github.workspace }}/android-sdk"
  FLUTTER_VERSION: "3.38.5"
-  BUILD_WINDOWS: "false" # set to "true" when you actually want Windows builds
+  BUILD_WINDOWS: "false" # Windows build disabled (no runner available)
  GITEA_BASE_URL: https://git.tgj.services

 jobs:
@@ -20,6 +20,7 @@ jobs:
    outputs:
      base_version: ${{ steps.meta.outputs.base }}
      release_tag: ${{ steps.meta.outputs.release_tag }}
+      dev_suffix: ${{ steps.meta.outputs.dev_suffix }}
    steps:
      - name: Checkout
        uses: actions/checkout@v4
@@ -29,12 +30,24 @@ jobs:
        run: |
          RAW_VERSION=$(awk '/^version:/{print $2}' pubspec.yaml)
          BASE_VERSION=${RAW_VERSION%%+*}
-          TAG="v${BASE_VERSION}"
+          VERSION="${BASE_VERSION}"
+          TAG="v${VERSION}"
+          DEV_SUFFIX=""
+
          if [ "${GITHUB_REF}" = "refs/heads/dev" ]; then
-            TAG="v${BASE_VERSION}-dev"
+            DEV_ITER="${GITHUB_RUN_NUMBER:-}"
+            if [ -z "$DEV_ITER" ]; then
+              DEV_ITER=$(git rev-list --count HEAD)
            fi
+
+            DEV_SUFFIX="-dev.${DEV_ITER}"
+            VERSION="${BASE_VERSION}${DEV_SUFFIX}"
+            TAG="v${VERSION}"
+          fi
+
          echo "base=${BASE_VERSION}" >> "$GITHUB_OUTPUT"
          echo "release_tag=${TAG}" >> "$GITHUB_OUTPUT"
+          echo "dev_suffix=${DEV_SUFFIX}" >> "$GITHUB_OUTPUT"

      - name: Fail if release already exists
        env:
@@ -110,6 +123,8 @@ jobs:
        run: |
          set -euo pipefail
          FLUTTER_HOME="$HOME/flutter"
+          # Avoid git ownership issues when Flutter checks out deps.
+          git config --global --add safe.directory "$FLUTTER_HOME" || true
          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"
@@ -207,6 +222,8 @@ jobs:
        run: |
          set -euo pipefail
          FLUTTER_HOME="$HOME/flutter"
+          # Avoid git ownership issues when Flutter checks out deps.
+          git config --global --add safe.directory "$FLUTTER_HOME" || true
          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"
@@ -268,11 +285,19 @@ jobs:
        run: |
          BASE="${{ needs.meta.outputs.base_version }}"
          TAG="${{ needs.meta.outputs.release_tag }}"
+          DEV_SUFFIX="${{ needs.meta.outputs.dev_suffix }}"
+          if [ -z "$DEV_SUFFIX" ]; then
+            echo "dev_suffix is empty; expected '-dev.<n>'"
+            exit 1
+          fi

-          mv "artifacts/mileograph-${BASE}.apk" "artifacts/mileograph-${BASE}-dev.apk"
+          VERSION="${BASE}${DEV_SUFFIX}"
+          APK_NAME="mileograph-${VERSION}.apk"
+
+          mv "artifacts/mileograph-${BASE}.apk" "artifacts/${APK_NAME}"

          echo "tag=${TAG}" >> "$GITHUB_OUTPUT"
-          echo "apk=artifacts/mileograph-${BASE}-dev.apk" >> "$GITHUB_OUTPUT"
+          echo "apk=artifacts/${APK_NAME}" >> "$GITHUB_OUTPUT"

      - name: Create prerelease on Gitea
        if: ${{ github.ref == 'refs/heads/dev' }}
--- a/lib/app.dart
+++ b/lib/app.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:mileograph_flutter/services/api_service.dart';
 import 'package:mileograph_flutter/services/authservice.dart';
 import 'package:mileograph_flutter/services/data_service.dart';
+import 'package:mileograph_flutter/services/distance_unit_service.dart';
 import 'package:mileograph_flutter/services/endpoint_service.dart';
 import 'package:mileograph_flutter/ui/app_shell.dart';
 import 'package:provider/provider.dart';
@@ -16,6 +17,9 @@ class App extends StatelessWidget {
        ChangeNotifierProvider<EndpointService>(
          create: (_) => EndpointService(),
        ),
+        ChangeNotifierProvider<DistanceUnitService>(
+          create: (_) => DistanceUnitService(),
+        ),
        ProxyProvider<EndpointService, ApiService>(
          update: (_, endpoint, api) {
            final service = api ?? ApiService(baseUrl: endpoint.baseUrl);
--- a/lib/components/calculator/route_summary_widget.dart
+++ b/lib/components/calculator/route_summary_widget.dart
@@ -1,4 +1,6 @@
 import 'package:flutter/material.dart';
+import 'package:mileograph_flutter/services/distance_unit_service.dart';
+import 'package:provider/provider.dart';

 class RouteSummaryWidget extends StatelessWidget {
  final double distance;
@@ -12,13 +14,14 @@ class RouteSummaryWidget extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
+    final distanceUnits = context.watch<DistanceUnitService>();
    return Padding(
      padding: const EdgeInsets.all(16),
      child: Row(
        children: [
          Expanded(
            child: Text(
-              "Total Distance: ${distance.toStringAsFixed(2)} mi",
+              "Total Distance: ${distanceUnits.format(distance, decimals: 2)}",
              style: Theme.of(context).textTheme.titleMedium,
            ),
          ),
@@ -48,6 +51,7 @@ class RouteDetailsView extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
+    final distanceUnits = context.watch<DistanceUnitService>();
    final highlightColor = Theme.of(context).colorScheme.primary;
    final mutedColor = Theme.of(context).colorScheme.outlineVariant;
    return Column(
@@ -78,7 +82,9 @@ class RouteDetailsView extends StatelessWidget {
                      ? TextStyle(color: highlightColor, fontWeight: FontWeight.w600)
                      : null,
                ),
-                trailing: Text("${costs[index].toStringAsFixed(2)} mi"),
+                trailing: Text(
+                  distanceUnits.format(costs[index], decimals: 2),
+                ),
              );
            },
          ),
--- a/lib/components/dashboard/leaderboard_panel.dart
+++ b/lib/components/dashboard/leaderboard_panel.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:mileograph_flutter/services/data_service.dart';
+import 'package:mileograph_flutter/services/distance_unit_service.dart';

 import 'package:provider/provider.dart';

@@ -9,6 +10,7 @@ class LeaderboardPanel extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    final data = context.watch<DataService>();
+    final distanceUnits = context.watch<DistanceUnitService>();
    final leaderboard = data.homepageStats?.leaderboard ?? [];
    final textTheme = Theme.of(context).textTheme;
    if (data.isHomepageLoading && leaderboard.isEmpty) {
@@ -82,7 +84,10 @@ class LeaderboardPanel extends StatelessWidget {
                        ),
                      ),
                      trailing: Text(
-                        '${leaderboard[index].mileage.toStringAsFixed(1)} mi',
+                        distanceUnits.format(
+                          leaderboard[index].mileage,
+                          decimals: 1,
+                        ),
                        style: textTheme.labelLarge?.copyWith(
                          fontWeight: FontWeight.w700,
                        ),
--- a/lib/components/dashboard/top_traction_panel.dart
+++ b/lib/components/dashboard/top_traction_panel.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:mileograph_flutter/services/data_service.dart';
-
+import 'package:mileograph_flutter/services/distance_unit_service.dart';
 import 'package:provider/provider.dart';

 class TopTractionPanel extends StatelessWidget {
@@ -9,6 +9,7 @@ class TopTractionPanel extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    final data = context.watch<DataService>();
+    final distanceUnits = context.watch<DistanceUnitService>();
    final stats = data.homepageStats;
    final locos = stats?.topLocos ?? [];
    final textTheme = Theme.of(context).textTheme;
@@ -78,7 +79,10 @@ class TopTractionPanel extends StatelessWidget {
                              ),
                      ),
                      trailing: Text(
-                        '${locos[index].mileage?.toStringAsFixed(1)} mi',
+                        distanceUnits.format(
+                          locos[index].mileage ?? 0,
+                          decimals: 1,
+                        ),
                        style: textTheme.labelLarge?.copyWith(
                          fontWeight: FontWeight.w700,
                        ),
--- a/lib/components/legs/leg_card.dart
+++ b/lib/components/legs/leg_card.dart
@@ -1,9 +1,8 @@
-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/data_service.dart';
+import 'package:mileograph_flutter/services/distance_unit_service.dart';
 import 'package:provider/provider.dart';

 class LegCard extends StatefulWidget {
@@ -28,6 +27,7 @@ class _LegCardState extends State<LegCard> {
  @override
  Widget build(BuildContext context) {
    final leg = widget.leg;
+    final distanceUnits = context.watch<DistanceUnitService>();
    final routeSegments = _parseRouteSegments(leg.route);
    final textTheme = Theme.of(context).textTheme;
    return Card(
@@ -38,19 +38,72 @@ class _LegCardState extends State<LegCard> {
        title: LayoutBuilder(
          builder: (context, constraints) {
            final isWide = constraints.maxWidth > 520;
-            final routeText = Text('${leg.start} → ${leg.end}');
-            final timeText =
-                Text(_formatDateTime(leg.beginTime, includeDate: widget.showDate));
+            final beginTimeWidget = _timeWithDelay(
+              context,
+              leg.beginTime,
+              leg.beginDelayMinutes,
+              includeDate: widget.showDate,
+            );
+            final endTimeWidget = leg.endTime == null
+                ? null
+                : _timeWithDelay(
+                    context,
+                    leg.endTime!,
+                    leg.endDelayMinutes,
+                    includeDate: widget.showDate,
+                  );
+
+            final routeText = Text(
+              '${leg.start} → ${leg.end}',
+              softWrap: true,
+            );
            if (!isWide) {
-              return routeText;
-            }
-            return Row(
+              final timeStyle = Theme.of(context).textTheme.labelSmall;
+              return Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
                children: [
-                timeText,
-                const SizedBox(width: 6),
+                  routeText,
+                  const SizedBox(height: 2),
+                  Wrap(
+                    spacing: 6,
+                    runSpacing: 4,
+                    crossAxisAlignment: WrapCrossAlignment.center,
+                    children: [
+                      _timeWithDelay(
+                        context,
+                        leg.beginTime,
+                        leg.beginDelayMinutes,
+                        includeDate: widget.showDate,
+                        style: timeStyle,
+                      ),
+                      if (endTimeWidget != null) ...[
                        const Text('·'),
-                const SizedBox(width: 6),
-                Expanded(child: routeText),
+                        _timeWithDelay(
+                          context,
+                          leg.endTime!,
+                          leg.endDelayMinutes,
+                          includeDate: widget.showDate,
+                          style: timeStyle,
+                        ),
+                      ],
+                    ],
+                  ),
+                ],
+              );
+            }
+
+            return Wrap(
+              spacing: 6,
+              runSpacing: 4,
+              crossAxisAlignment: WrapCrossAlignment.center,
+              children: [
+                beginTimeWidget,
+                const Text('·'),
+                routeText,
+                if (endTimeWidget != null) ...[
+                  const Text('·'),
+                  endTimeWidget,
+                ],
              ],
            );
          },
@@ -58,8 +111,12 @@ class _LegCardState extends State<LegCard> {
        subtitle: LayoutBuilder(
          builder: (context, constraints) {
            final isWide = constraints.maxWidth > 520;
-            final timeWidget =
-                Text(_formatDateTime(leg.beginTime, includeDate: widget.showDate));
+            final timeWidget = _timeWithDelay(
+              context,
+              leg.beginTime,
+              leg.beginDelayMinutes,
+              includeDate: widget.showDate,
+            );
            final tractionWrap = !_expanded && leg.locos.isNotEmpty
                ? Wrap(
                    spacing: 8,
@@ -90,9 +147,7 @@ class _LegCardState extends State<LegCard> {
                children.add(tractionWrap);
              }
            } else {
-              children.add(timeWidget);
              if (tractionWrap != null) {
-                children.add(const SizedBox(height: 4));
                children.add(tractionWrap);
              }
            }
@@ -128,7 +183,7 @@ class _LegCardState extends State<LegCard> {
              crossAxisAlignment: CrossAxisAlignment.end,
              children: [
                Text(
-                  '${leg.mileage.toStringAsFixed(1)} mi',
+                  distanceUnits.format(leg.mileage, decimals: 1),
                  style: textTheme.labelLarge?.copyWith(
                    fontWeight: FontWeight.w700,
                  ),
@@ -191,6 +246,12 @@ class _LegCardState extends State<LegCard> {
                  ),
                  const SizedBox(height: 12),
                ],
+                if (_hasTrainDetails(leg)) ...[
+                  Text('Train', style: textTheme.titleSmall),
+                  const SizedBox(height: 6),
+                  ..._buildTrainDetails(leg, textTheme),
+                  const SizedBox(height: 12),
+                ],
                if (routeSegments.isNotEmpty) ...[
                  Text('Route', style: textTheme.titleSmall),
                  const SizedBox(height: 6),
@@ -238,6 +299,40 @@ class _LegCardState extends State<LegCard> {
    }
  }

+  Widget _timeWithDelay(
+    BuildContext context,
+    DateTime time,
+    int? delay, {
+    bool includeDate = true,
+    TextStyle? style,
+  }) {
+    final textTheme = Theme.of(context).textTheme;
+    final colorScheme = Theme.of(context).colorScheme;
+    final delayMinutes = delay ?? 0;
+    final delayText =
+        delayMinutes == 0 ? null : '${delayMinutes > 0 ? '+' : ''}$delayMinutes';
+    final delayColor = delayMinutes == 0
+        ? null
+        : (delayMinutes < 0 ? Colors.green : colorScheme.error);
+    return Row(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Text(
+          _formatDateTime(time, includeDate: includeDate),
+          style: style,
+        ),
+        if (delayText != null) ...[
+          const SizedBox(width: 4),
+          Text(
+            '$delayText m',
+            style:
+                (style ?? textTheme.labelSmall)?.copyWith(color: delayColor),
+          ),
+        ],
+      ],
+    );
+  }
+
  String _formatDate(DateTime? date) {
    if (date == null) return '';
    return '${date.year.toString().padLeft(4, '0')}-${date.month.toString().padLeft(2, '0')}-${date.day.toString().padLeft(2, '0')}';
@@ -286,6 +381,51 @@ class _LegCardState extends State<LegCard> {
        .toList();
  }

+  bool _hasTrainDetails(Leg leg) {
+    return leg.headcode.isNotEmpty ||
+        leg.origin.isNotEmpty ||
+        leg.destination.isNotEmpty ||
+        leg.originTime != null ||
+        leg.destinationTime != null;
+  }
+
+  List<Widget> _buildTrainDetails(Leg leg, TextTheme textTheme) {
+    final widgets = <Widget>[];
+    if (leg.headcode.isNotEmpty) {
+      widgets.add(
+        Text(
+          'Headcode: ${leg.headcode}',
+          style: textTheme.bodyMedium,
+        ),
+      );
+    }
+    final originLine = _locationLine(
+      'Origin',
+      leg.origin,
+      leg.originTime,
+    );
+    if (originLine != null) {
+      widgets.add(Text(originLine, style: textTheme.bodyMedium));
+    }
+    final destinationLine = _locationLine(
+      'Destination',
+      leg.destination,
+      leg.destinationTime,
+    );
+    if (destinationLine != null) {
+      widgets.add(Text(destinationLine, style: textTheme.bodyMedium));
+    }
+    return widgets;
+  }
+
+  String? _locationLine(String label, String location, DateTime? time) {
+    final parts = <String>[];
+    if (location.trim().isNotEmpty) parts.add(location.trim());
+    if (time != null) parts.add(_formatDateTime(time));
+    if (parts.isEmpty) return null;
+    return '$label: ${parts.join(' · ')}';
+  }
+
  Widget _buildRouteList(List<String> segments) {
    return Column(
      crossAxisAlignment: CrossAxisAlignment.start,
@@ -306,38 +446,7 @@ class _LegCardState extends State<LegCard> {
    );
  }

-  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 (_) {}
-    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];
+  List<String> _parseRouteSegments(List<String> route) {
+    return route.map((e) => e.toString()).where((e) => e.trim().isNotEmpty).toList();
  }
 }
--- a/lib/components/pages/dashboard.dart
+++ b/lib/components/pages/dashboard.dart
@@ -7,6 +7,7 @@ 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/data_service.dart';
+import 'package:mileograph_flutter/services/distance_unit_service.dart';
 import 'package:provider/provider.dart';

 class Dashboard extends StatefulWidget {
@@ -23,6 +24,7 @@ class _DashboardState extends State<Dashboard> {
  Widget build(BuildContext context) {
    final data = context.watch<DataService>();
    final auth = context.watch<AuthService>();
+    final distanceUnits = context.watch<DistanceUnitService>();
    final stats = data.homepageStats;

    final isInitialLoading = data.isHomepageLoading || stats == null;
@@ -46,9 +48,15 @@ class _DashboardState extends State<Dashboard> {
              ListView(
                padding: const EdgeInsets.all(16),
                children: [
-                  _buildHero(context, auth, data, stats),
+                  _buildHero(context, auth, data, stats, distanceUnits),
                  const SizedBox(height: spacing),
-                  _buildTiles(context, data, maxWidth, spacing),
+                  _buildTiles(
+                    context,
+                    data,
+                    distanceUnits,
+                    maxWidth,
+                    spacing,
+                  ),
                ],
              ),
              if (isInitialLoading)
@@ -81,6 +89,7 @@ class _DashboardState extends State<Dashboard> {
    AuthService auth,
    DataService data,
    HomepageStats? stats,
+    DistanceUnitService distanceUnits,
  ) {
    final colorScheme = Theme.of(context).colorScheme;
    final greetingName =
@@ -119,14 +128,14 @@ class _DashboardState extends State<Dashboard> {
                _metricTile(
                  context,
                  label: 'Total mileage',
-                  value: '${totalMileage.toStringAsFixed(1)} mi',
+                  value: distanceUnits.format(totalMileage, decimals: 1),
                  icon: Icons.route,
                  color: colorScheme.onPrimaryContainer,
                ),
                _metricTile(
                  context,
                  label: 'This year',
-                  value: '${currentYearMileage.toStringAsFixed(1)} mi',
+                  value: distanceUnits.format(currentYearMileage, decimals: 1),
                  icon: Icons.calendar_today,
                  color: colorScheme.onPrimaryContainer,
                ),
@@ -215,6 +224,7 @@ class _DashboardState extends State<Dashboard> {
  Widget _buildTiles(
    BuildContext context,
    DataService data,
+    DistanceUnitService distanceUnits,
    double maxWidth,
    double spacing,
  ) {
@@ -229,9 +239,9 @@ class _DashboardState extends State<Dashboard> {
            child: Column(
              crossAxisAlignment: CrossAxisAlignment.stretch,
              children: [
-                _buildOnThisDayCard(context, data),
+                _buildOnThisDayCard(context, data, distanceUnits),
                const SizedBox(height: 16),
-                _buildTripsCard(context, data),
+                _buildTripsCard(context, data, distanceUnits),
                const SizedBox(height: 16),
                const LatestLocoChangesPanel(expanded: true),
              ],
@@ -256,13 +266,13 @@ class _DashboardState extends State<Dashboard> {
    return Column(
      crossAxisAlignment: CrossAxisAlignment.stretch,
      children: [
-        _buildOnThisDayCard(context, data),
+        _buildOnThisDayCard(context, data, distanceUnits),
        const SizedBox(height: 16),
        const TopTractionPanel(),
        const SizedBox(height: 16),
        const LeaderboardPanel(),
        const SizedBox(height: 16),
-        _buildTripsCard(context, data),
+        _buildTripsCard(context, data, distanceUnits),
        const SizedBox(height: 16),
        const LatestLocoChangesPanel(),
      ],
@@ -296,7 +306,8 @@ class _DashboardState extends State<Dashboard> {
    );
  }

-  Widget _buildOnThisDayCard(BuildContext context, DataService data) {
+  Widget _buildOnThisDayCard(
+      BuildContext context, DataService data, DistanceUnitService distanceUnits) {
    final filtered = data.onThisDay
        .where((leg) => leg.beginTime.year != DateTime.now().year)
        .toList();
@@ -329,7 +340,7 @@ class _DashboardState extends State<Dashboard> {
          : Column(
              children: [
                for (int idx = 0; idx < visible.length; idx++) ...[
-                  _otdRow(context, visible[idx], textTheme),
+                  _otdRow(context, visible[idx], textTheme, distanceUnits),
                  if (idx != visible.length - 1) const Divider(height: 12),
                ],
              ],
@@ -337,7 +348,8 @@ class _DashboardState extends State<Dashboard> {
    );
  }

-  Widget _otdRow(BuildContext context, Leg leg, TextTheme textTheme) {
+  Widget _otdRow(BuildContext context, Leg leg, TextTheme textTheme,
+      DistanceUnitService distanceUnits) {
    final traction = leg.locos;
    return Row(
      crossAxisAlignment: CrossAxisAlignment.center,
@@ -443,7 +455,7 @@ class _DashboardState extends State<Dashboard> {
          crossAxisAlignment: CrossAxisAlignment.end,
          children: [
            Text(
-              '${leg.mileage.toStringAsFixed(1)} mi',
+              distanceUnits.format(leg.mileage, decimals: 1),
              style: textTheme.labelLarge?.copyWith(
                fontWeight: FontWeight.w800,
              ),
@@ -498,7 +510,8 @@ class _DashboardState extends State<Dashboard> {
    );
  }

-  Widget _buildTripsCard(BuildContext context, DataService data) {
+  Widget _buildTripsCard(
+      BuildContext context, DataService data, DistanceUnitService distanceUnits) {
    final tripsUnsorted = data.trips;
    List trips = [];
    if (tripsUnsorted.isNotEmpty) {
@@ -543,7 +556,7 @@ class _DashboardState extends State<Dashboard> {
                                  ?.copyWith(fontWeight: FontWeight.w700),
                            ),
                            Text(
-                              '${trip.tripMileage.toStringAsFixed(1)} mi',
+                              distanceUnits.format(trip.tripMileage, decimals: 1),
                              style: Theme.of(context).textTheme.labelMedium,
                            ),
                          ],
--- a/lib/components/pages/legs.dart
+++ b/lib/components/pages/legs.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:mileograph_flutter/components/legs/leg_card.dart';
 import 'package:mileograph_flutter/objects/objects.dart';
 import 'package:mileograph_flutter/services/data_service.dart';
+import 'package:mileograph_flutter/services/distance_unit_service.dart';
 import 'package:provider/provider.dart';

 class LegsPage extends StatefulWidget {
@@ -90,6 +91,7 @@ class _LegsPageState extends State<LegsPage> {
  @override
  Widget build(BuildContext context) {
    final data = context.watch<DataService>();
+    final distanceUnits = context.watch<DistanceUnitService>();
    final legs = data.legs;
    final pageMileage = _pageMileage(legs);

@@ -121,7 +123,7 @@ class _LegsPageState extends State<LegsPage> {
                    children: [
                      Text('Page mileage',
                          style: Theme.of(context).textTheme.labelSmall),
-                      Text('${pageMileage.toStringAsFixed(1)} mi',
+                      Text(distanceUnits.format(pageMileage, decimals: 1),
                          style: Theme.of(context)
                              .textTheme
                              .titleMedium
@@ -212,7 +214,7 @@ class _LegsPageState extends State<LegsPage> {
          else
            Column(
              children: [
-                ..._buildLegsWithDividers(context, legs),
+                ..._buildLegsWithDividers(context, legs, distanceUnits),
                const SizedBox(height: 8),
                if (data.legsHasMore || data.isLegsLoading)
                  Align(
@@ -239,7 +241,11 @@ class _LegsPageState extends State<LegsPage> {
    );
  }

-  List<Widget> _buildLegsWithDividers(BuildContext context, List<Leg> legs) {
+  List<Widget> _buildLegsWithDividers(
+    BuildContext context,
+    List<Leg> legs,
+    DistanceUnitService distanceUnits,
+  ) {
    final widgets = <Widget>[];
    String? currentDate;
    double dayMileage = 0;
@@ -261,10 +267,8 @@ class _LegsPageState extends State<LegsPage> {
                      ),
                ),
              ),
-              Text(
-                '${dayMileage.toStringAsFixed(1)} mi',
-                style: Theme.of(context).textTheme.labelMedium,
-              ),
+              Text(distanceUnits.format(dayMileage, decimals: 1),
+                  style: Theme.of(context).textTheme.labelMedium),
            ],
          ),
        ),
--- a/lib/components/pages/logbook.dart
+++ b/lib/components/pages/logbook.dart
@@ -21,8 +21,7 @@ class LogbookPage extends StatelessWidget {
        children: [
          TabBar(
            onTap: (index) {
-              final dest =
-                  index == 0 ? '/logbook/entries' : '/logbook/trips';
+              final dest = index == 0 ? '/logbook/entries' : '/logbook/trips';
              final current = GoRouterState.of(context).uri.path;
              if (current != dest) {
                context.go(dest);
@@ -34,12 +33,7 @@ class LogbookPage extends StatelessWidget {
            ],
          ),
          Expanded(
-            child: TabBarView(
-              children: const [
-                LegsPage(),
-                TripsPage(),
-              ],
-            ),
+            child: TabBarView(children: const [LegsPage(), TripsPage()]),
          ),
        ],
      ),
--- a/lib/components/pages/more.dart
+++ b/lib/components/pages/more.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:mileograph_flutter/components/pages/profile.dart';
 import 'package:mileograph_flutter/components/pages/settings.dart';
+import 'package:mileograph_flutter/components/pages/stats.dart';

 class MorePage extends StatelessWidget {
  const MorePage({super.key});
@@ -18,12 +19,18 @@ class MorePage extends StatelessWidget {
          case '/profile':
            page = const ProfilePage();
            break;
+          case '/stats':
+            page = const StatsPage();
+            break;
          case '/more/settings':
            page = const SettingsPage();
            break;
          case '/more/profile':
            page = const ProfilePage();
            break;
+          case '/more/stats':
+            page = const StatsPage();
+            break;
          case '/':
          default:
            page = _MoreHome();
@@ -54,6 +61,12 @@ class _MoreHome extends StatelessWidget {
                onTap: () => Navigator.of(context).pushNamed('/more/profile'),
              ),
              const Divider(height: 1),
+              ListTile(
+                leading: const Icon(Icons.bar_chart),
+                title: const Text('Stats'),
+                onTap: () => Navigator.of(context).pushNamed('/more/stats'),
+              ),
+              const Divider(height: 1),
              ListTile(
                leading: const Icon(Icons.settings),
                title: const Text('Settings'),
--- a/lib/components/pages/new_entry/new_entry.dart
+++ b/lib/components/pages/new_entry/new_entry.dart
@@ -11,6 +11,7 @@ import 'package:mileograph_flutter/components/pages/traction.dart';
 import 'package:mileograph_flutter/objects/objects.dart';
 import 'package:mileograph_flutter/services/api_service.dart';
 import 'package:mileograph_flutter/services/data_service.dart';
+import 'package:mileograph_flutter/services/distance_unit_service.dart';
 import 'package:mileograph_flutter/services/navigation_guard.dart';
 import 'package:provider/provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
--- a/lib/components/pages/new_entry/new_entry_draft_logic.dart
+++ b/lib/components/pages/new_entry/new_entry_draft_logic.dart
@@ -13,6 +13,9 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
    if (choice == _ExitChoice.save) {
      await _saveDraftEntry(draftId: _activeDraftId);
    } else if (choice == _ExitChoice.discard) {
+      // Delay reset to avoid setState during the dialog/build phase.
+      await Future<void>.delayed(Duration.zero);
+      if (!mounted) return false;
      await _resetFormState(clearDraft: true);
      _activeDraftId = null;
    }
@@ -29,12 +32,21 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
  }

  bool _formIsEmpty() {
+    final beginDelayVal = _parseDelayMinutes(_beginDelayController.text);
+    final endDelayVal = _parseDelayMinutes(_endDelayController.text);
    return _startController.text.trim().isEmpty &&
        _endController.text.trim().isEmpty &&
        _headcodeController.text.trim().isEmpty &&
        _notesController.text.trim().isEmpty &&
        _networkController.text.trim().isEmpty &&
        _mileageController.text.trim().isEmpty &&
+        _originController.text.trim().isEmpty &&
+        _destinationController.text.trim().isEmpty &&
+        beginDelayVal == 0 &&
+        endDelayVal == 0 &&
+        !_hasOriginTime &&
+        !_hasDestinationTime &&
+        !_hasEndTime &&
        _routeResult == null &&
        _tractionItems.length <= 1;
  }
@@ -122,6 +134,30 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
      "notes": _notesController.text,
      "mileage": _mileageController.text,
      "network": _networkController.text,
+      "origin": _originController.text,
+      "destination": _destinationController.text,
+      "hasEndTime": _hasEndTime,
+      "hasOriginTime": _hasOriginTime,
+      "hasDestinationTime": _hasDestinationTime,
+      "endDate": _selectedEndDate.toIso8601String(),
+      "endTime": {
+        "hour": _selectedEndTime.hour,
+        "minute": _selectedEndTime.minute,
+      },
+      "originDate": _selectedOriginDate.toIso8601String(),
+      "originTime": {
+        "hour": _selectedOriginTime.hour,
+        "minute": _selectedOriginTime.minute,
+      },
+      "destinationDate": _selectedDestinationDate.toIso8601String(),
+      "destinationTime": {
+        "hour": _selectedDestinationTime.hour,
+        "minute": _selectedDestinationTime.minute,
+      },
+      "matchOriginToEntry": _matchOriginToEntry,
+      "matchDestinationToEntry": _matchDestinationToEntry,
+      "beginDelay": _parseDelayMinutes(_beginDelayController.text),
+      "endDelay": _parseDelayMinutes(_endDelayController.text),
      "useManualMileage": _useManualMileage,
      "selectedTripId": _selectedTripId,
      "routeResult": _routeResult == null
@@ -199,7 +235,14 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
    required String id,
    bool includeTimestamp = true,
  }) {
+    final units = _distanceUnits(context);
    final routeStations = _routeResult?.calculatedRoute ?? [];
+    final endTime = _legEndDateTime;
+    final originTime = _originDateTime;
+    final destinationTime = _destinationDateTime;
+    final beginDelay = _parseDelayMinutes(_beginDelayController.text);
+    final endDelay =
+        _hasEndTime ? _parseDelayMinutes(_endDelayController.text) : 0;
    final startVal = _useManualMileage
        ? _startController.text.trim()
        : (routeStations.isNotEmpty ? routeStations.first : '');
@@ -207,30 +250,36 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
        ? _endController.text.trim()
        : (routeStations.isNotEmpty ? routeStations.last : '');
    final mileageVal = _useManualMileage
-        ? double.tryParse(_mileageController.text.trim()) ?? 0
+        ? (units.milesFromInput(_mileageController.text.trim()) ?? 0)
        : (_routeResult?.distance ?? 0);
    final tractionPayload = _buildTractionPayload();
+    final commonPayload = {
+      "leg_trip": _selectedTripId,
+      "leg_begin_time": _legDateTime.toIso8601String(),
+      if (endTime != null) "leg_end_time": endTime.toIso8601String(),
+      if (originTime != null) "leg_origin_time": originTime.toIso8601String(),
+      if (destinationTime != null)
+        "leg_destination_time": destinationTime.toIso8601String(),
+      "leg_notes": _notesController.text.trim(),
+      "leg_headcode": _headcodeController.text.trim(),
+      "leg_network": _networkController.text.trim(),
+      "leg_origin": _originController.text.trim(),
+      "leg_destination": _destinationController.text.trim(),
+      "leg_begin_delay": beginDelay,
+      if (_hasEndTime) "leg_end_delay": endDelay,
+      "locos": tractionPayload,
+    };
    final payload = _useManualMileage
        ? {
-            "leg_trip": _selectedTripId,
+            ...commonPayload,
            "leg_start": startVal,
            "leg_end": endVal,
-            "leg_begin_time": _legDateTime.toIso8601String(),
-            "leg_network": _networkController.text.trim(),
            "leg_distance": mileageVal,
            "isKilometers": false,
-            "leg_notes": _notesController.text.trim(),
-            "leg_headcode": _headcodeController.text.trim(),
-            "locos": tractionPayload,
          }
        : {
-            "leg_trip": _selectedTripId,
-            "leg_begin_time": _legDateTime.toIso8601String(),
+            ...commonPayload,
            "leg_route": routeStations,
-            "leg_notes": _notesController.text.trim(),
-            "leg_headcode": _headcodeController.text.trim(),
-            "leg_network": _networkController.text.trim(),
-            "locos": tractionPayload,
            "leg_mileage": _routeResult?.distance ?? mileageVal,
          };
    return {
@@ -265,8 +314,32 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
    final beginTime = beginStr == null
        ? DateTime.now()
        : DateTime.tryParse(beginStr) ?? DateTime.now();
+    final originTimeStr = payload['leg_origin_time'] as String?;
+    final destinationTimeStr = payload['leg_destination_time'] as String?;
+    final originTime =
+        originTimeStr == null ? null : DateTime.tryParse(originTimeStr);
+    final destinationTime = destinationTimeStr == null
+        ? null
+        : DateTime.tryParse(destinationTimeStr);
+    final endStr = payload['leg_end_time'] as String?;
+    final endTime =
+        endStr == null ? null : DateTime.tryParse(endStr);
+    final beginDelay =
+        _parseDelayMinutes('${payload['leg_begin_delay'] ?? ''}');
+    final endDelay =
+        _parseDelayMinutes('${payload['leg_end_delay'] ?? ''}');
+    final hasEndTime = endTime != null || endDelay != 0;
+    final matchOrigin = data['matchOriginToEntry'] == true;
+    final matchDestination = data['matchDestinationToEntry'] == true;
+    final hasOriginTime =
+        originTime != null || data['hasOriginTime'] == true;
+    final hasDestinationTime =
+        destinationTime != null || data['hasDestinationTime'] == true;
+    final origin = payload['leg_origin'] as String? ?? '';
+    final destination = payload['leg_destination'] as String? ?? '';
    final tripRaw = payload['leg_trip'];
    final tripId = tripRaw is num ? tripRaw.toInt() : null;
+    final units = _distanceUnits(context);

    List<String> routeStations = [];
    RouteResult? restoredRouteResult;
@@ -312,6 +385,21 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
      _useManualMileage = useManual;
      _selectedDate = beginTime;
      _selectedTime = TimeOfDay.fromDateTime(beginTime);
+      _selectedEndDate = endTime ?? beginTime;
+      _selectedEndTime = TimeOfDay.fromDateTime(endTime ?? beginTime);
+      _hasEndTime = hasEndTime;
+      _matchOriginToEntry = matchOrigin;
+      _matchDestinationToEntry = matchDestination;
+      _selectedOriginDate = originTime ?? beginTime;
+      _selectedOriginTime =
+          TimeOfDay.fromDateTime(originTime ?? beginTime);
+      _selectedDestinationDate =
+          destinationTime ?? endTime ?? beginTime;
+      _selectedDestinationTime = TimeOfDay.fromDateTime(
+        destinationTime ?? endTime ?? beginTime,
+      );
+      _hasOriginTime = hasOriginTime;
+      _hasDestinationTime = hasDestinationTime;
      _selectedTripId = tripId == null || tripId == 0 ? null : tripId;
      _routeResult = restoredRouteResult;
      _headcodeController.text = (payload['leg_headcode'] as String? ?? '')
@@ -319,6 +407,10 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
      _networkController.text = (payload['leg_network'] as String? ?? '')
          .toUpperCase();
      _notesController.text = payload['leg_notes'] ?? '';
+      _originController.text = origin;
+      _destinationController.text = destination;
+      _beginDelayController.text = beginDelay.toString();
+      _endDelayController.text = endDelay.toString();

      if (useManual) {
        _startController.text = payload['leg_start'] ?? '';
@@ -326,14 +418,20 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
        final miles = (payload['leg_distance'] as num?)?.toDouble();
        _mileageController.text = miles == null || miles == 0
            ? ''
-            : miles.toStringAsFixed(2);
+            : units.format(
+                miles,
+                decimals: 2,
+                includeUnit: false,
+              );
      } else {
        _startController.text =
            routeStations.isNotEmpty ? routeStations.first : '';
        _endController.text =
            routeStations.isNotEmpty ? routeStations.last : '';
        final dist = _routeResult?.distance ?? 0;
-        _mileageController.text = dist == 0 ? '' : dist.toStringAsFixed(2);
+        _mileageController.text = dist == 0
+            ? ''
+            : units.format(dist, decimals: 2, includeUnit: false);
      }

      final tractionRaw = data['tractionItems'];
@@ -359,6 +457,7 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
      includeTimestamp: false,
    );
    _restoringDraft = false;
+    _scheduleMatchUpdate();
  }

  Future<void> _loadDraft() async {
--- a/lib/components/pages/new_entry/new_entry_drafts.dart
+++ b/lib/components/pages/new_entry/new_entry_drafts.dart
@@ -150,6 +150,7 @@ class _DraftListBodyState extends State<_DraftListBody> {
    final payload = draft.data['payload'];
    if (payload is! Map) return '';
    final map = Map<String, dynamic>.from(payload);
+    final units = context.read<DistanceUnitService>();
    final parts = <String>[];
    if ((map['leg_trip'] as int? ?? 0) != 0) {
      parts.add('Trip ${map['leg_trip']}');
@@ -164,7 +165,7 @@ class _DraftListBodyState extends State<_DraftListBody> {
        (map['leg_distance'] as num?)?.toDouble() ??
        (map['leg_mileage'] as num?)?.toDouble();
    if (mileage != null && mileage > 0) {
-      parts.add('${mileage.toStringAsFixed(1)} mi');
+      parts.add(units.format(mileage, decimals: 1));
    } else if (map['leg_route'] is List &&
        (map['leg_route'] as List).isNotEmpty) {
      parts.add('Route ${(map['leg_route'] as List).length} stops');
@@ -176,4 +177,3 @@ class _DraftListBodyState extends State<_DraftListBody> {
    return parts.join(' • ');
  }
 }
-
--- a/lib/components/pages/new_entry/new_entry_page.dart
+++ b/lib/components/pages/new_entry/new_entry_page.dart
--- a/lib/components/pages/new_entry/new_entry_submit_logic.dart
+++ b/lib/components/pages/new_entry/new_entry_submit_logic.dart
@@ -4,11 +4,12 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
  Future<bool> _validateRequiredFields() async {
    final missing = <String>[];

+    final units = _distanceUnits(context);
    if (_useManualMileage) {
      if (_startController.text.trim().isEmpty) missing.add('From');
      if (_endController.text.trim().isEmpty) missing.add('To');
      final mileageText = _mileageController.text.trim();
-      if (double.tryParse(mileageText) == null) {
+      if (mileageText.isEmpty || units.milesFromInput(mileageText) == null) {
        missing.add('Mileage');
      }
    } else {
@@ -58,10 +59,17 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
    final endVal = _useManualMileage
        ? _endController.text.trim()
        : (routeStations.isNotEmpty ? routeStations.last : '');
+    final units = _distanceUnits(context);
    final mileageVal = _useManualMileage
-        ? double.tryParse(_mileageController.text.trim()) ?? 0
+        ? (units.milesFromInput(_mileageController.text.trim()) ?? 0)
        : (_routeResult?.distance ?? 0);
    final tractionPayload = _buildTractionPayload();
+    final endTime = _legEndDateTime;
+    final originTime = _originDateTime;
+    final destinationTime = _destinationDateTime;
+    final beginDelay = _parseDelayMinutes(_beginDelayController.text);
+    final endDelay =
+        _hasEndTime ? _parseDelayMinutes(_endDelayController.text) : 0;
    final snapshot = _buildSubmissionSnapshot(
      routeStations: routeStations,
      startVal: startVal,
@@ -82,20 +90,32 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
    final isEditingExisting = _isEditing && widget.editLegId != null;

    try {
-      if (_useManualMileage) {
-        final body = {
+      final commonPayload = {
        if (isEditingExisting) "leg_id": widget.editLegId,
        "leg_trip": _selectedTripId,
-          "leg_start": startVal,
-          "leg_end": endVal,
        "leg_begin_time": _legDateTime.toIso8601String(),
-          "leg_network": _networkController.text.trim(),
-          "leg_distance": mileageVal,
-          "isKilometers": false,
+        if (endTime != null) "leg_end_time": endTime.toIso8601String(),
+        if (originTime != null)
+          "leg_origin_time": originTime.toIso8601String(),
+        if (destinationTime != null)
+          "leg_destination_time": destinationTime.toIso8601String(),
        "leg_notes": _notesController.text.trim(),
        "leg_headcode": _headcodeController.text.trim(),
+        "leg_network": _networkController.text.trim(),
+        "leg_origin": _originController.text.trim(),
+        "leg_destination": _destinationController.text.trim(),
+        "leg_begin_delay": beginDelay,
+        if (_hasEndTime) "leg_end_delay": endDelay,
        "locos": tractionPayload,
      };
+      if (_useManualMileage) {
+        final body = {
+          ...commonPayload,
+          "leg_start": startVal,
+          "leg_end": endVal,
+          "leg_distance": mileageVal,
+          "isKilometers": false,
+        };
        if (isEditingExisting) {
          await api.put('/update', body);
        } else {
@@ -103,14 +123,8 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
        }
      } else {
        final body = {
-          if (isEditingExisting) "leg_id": widget.editLegId,
-          "leg_trip": _selectedTripId,
-          "leg_begin_time": _legDateTime.toIso8601String(),
+          ...commonPayload,
          "leg_route": routeStations,
-          "leg_notes": _notesController.text.trim(),
-          "leg_headcode": _headcodeController.text.trim(),
-          "leg_network": _networkController.text.trim(),
-          "locos": tractionPayload,
        };
        if (isEditingExisting) {
          await api.put('/update', body);
@@ -148,18 +162,31 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
    required double mileageVal,
    required List<Map<String, dynamic>> tractionPayload,
  }) {
+    final beginDelay = _parseDelayMinutes(_beginDelayController.text);
+    final endDelay =
+        _hasEndTime ? _parseDelayMinutes(_endDelayController.text) : 0;
    return {
      "legId": widget.editLegId,
      "useManualMileage": _useManualMileage,
      "tripId": _selectedTripId,
      "legDateTime": _legDateTime.toIso8601String(),
+      "legEndTime": _legEndDateTime?.toIso8601String(),
+      "hasEndTime": _hasEndTime,
+      "legOriginTime": _originDateTime?.toIso8601String(),
+      "hasOriginTime": _hasOriginTime,
+      "legDestinationTime": _destinationDateTime?.toIso8601String(),
+      "hasDestinationTime": _hasDestinationTime,
      "start": startVal,
      "end": endVal,
+      "origin": _originController.text.trim(),
+      "destination": _destinationController.text.trim(),
      "routeStations": routeStations,
      "mileage": mileageVal,
      "network": _networkController.text.trim(),
      "notes": _notesController.text.trim(),
      "headcode": _headcodeController.text.trim(),
+      "beginDelay": beginDelay,
+      "endDelay": endDelay,
      "locos": tractionPayload,
      "routeResult": _routeResult == null
          ? null
@@ -202,11 +229,27 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
    _notesController.clear();
    _mileageController.clear();
    _networkController.clear();
+    _originController.clear();
+    _destinationController.clear();
+    _beginDelayController.text = '0';
+    _endDelayController.text = '0';
    final now = DateTime.now();
    _setState(() {
      _selectedDate = now;
      _selectedTime = TimeOfDay.fromDateTime(now);
+      _selectedEndDate = now;
+      _selectedEndTime = TimeOfDay.fromDateTime(now);
+      _selectedOriginDate = now;
+      _selectedOriginTime = TimeOfDay.fromDateTime(now);
+      _selectedDestinationDate = now;
+      _selectedDestinationTime = TimeOfDay.fromDateTime(now);
      _useManualMileage = false;
+      _hasEndTime = false;
+      _hasOriginTime = false;
+      _hasDestinationTime = false;
+      _matchOriginToEntry = false;
+      _matchDestinationToEntry = false;
+      _matchUpdateScheduled = false;
      _routeResult = null;
      _tractionItems
        ..clear()
--- a/lib/components/pages/settings.dart
+++ b/lib/components/pages/settings.dart
@@ -3,7 +3,9 @@ import 'dart:convert';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:http/http.dart' as http;
+import 'package:mileograph_flutter/services/authservice.dart';
 import 'package:mileograph_flutter/services/api_service.dart';
+import 'package:mileograph_flutter/services/distance_unit_service.dart';
 import 'package:mileograph_flutter/services/endpoint_service.dart';
 import 'package:mileograph_flutter/services/data_service.dart';
 import 'package:provider/provider.dart';
@@ -174,7 +176,11 @@ class _SettingsPageState extends State<SettingsPage> {
  @override
  Widget build(BuildContext context) {
    final endpointService = context.watch<EndpointService>();
-    if (!endpointService.isLoaded) {
+    final distanceUnitService = context.watch<DistanceUnitService>();
+    final loggedIn = context.select<AuthService, bool>(
+      (auth) => auth.isLoggedIn,
+    );
+    if (!endpointService.isLoaded || !distanceUnitService.isLoaded) {
      return const Scaffold(
        body: Center(child: CircularProgressIndicator()),
      );
@@ -200,6 +206,34 @@ class _SettingsPageState extends State<SettingsPage> {
        child: Column(
          crossAxisAlignment: CrossAxisAlignment.start,
          children: [
+            Text(
+              'Distance units',
+              style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                    fontWeight: FontWeight.w700,
+                  ),
+            ),
+            const SizedBox(height: 8),
+            Text(
+              'Choose how distances are displayed across the app.',
+              style: Theme.of(context).textTheme.bodySmall,
+            ),
+            const SizedBox(height: 12),
+            SegmentedButton<DistanceUnit>(
+              segments: DistanceUnit.values
+                  .map(
+                    (unit) => ButtonSegment<DistanceUnit>(
+                      value: unit,
+                      label: Text(unit.label),
+                    ),
+                  )
+                  .toList(),
+              selected: {distanceUnitService.unit},
+              onSelectionChanged: (selection) {
+                final next = selection.first;
+                distanceUnitService.setUnit(next);
+              },
+            ),
+            const SizedBox(height: 24),
            Text(
              'API endpoint',
              style: Theme.of(context).textTheme.titleMedium?.copyWith(
@@ -251,6 +285,7 @@ class _SettingsPageState extends State<SettingsPage> {
              'Current: ${endpointService.baseUrl}',
              style: Theme.of(context).textTheme.labelSmall,
            ),
+            if (loggedIn) ...[
              const SizedBox(height: 32),
              Text(
                'Account',
@@ -343,6 +378,7 @@ class _SettingsPageState extends State<SettingsPage> {
                ),
              ),
            ],
+          ],
        ),
      ),
    );
--- a/lib/components/pages/stats.dart
+++ b/lib/components/pages/stats.dart
@@ -0,0 +1,225 @@
+import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+import 'package:mileograph_flutter/objects/objects.dart';
+import 'package:mileograph_flutter/services/data_service.dart';
+import 'package:mileograph_flutter/services/distance_unit_service.dart';
+import 'package:provider/provider.dart';
+
+class StatsPage extends StatefulWidget {
+  const StatsPage({super.key});
+
+  @override
+  State<StatsPage> createState() => _StatsPageState();
+}
+
+class _StatsPageState extends State<StatsPage> {
+  final NumberFormat _countFormat = NumberFormat.decimalPattern();
+
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _loadStats();
+    });
+  }
+
+  Future<void> _loadStats({bool force = false}) {
+    return context.read<DataService>().fetchAboutStats(force: force);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final data = context.watch<DataService>();
+    final distanceUnits = context.watch<DistanceUnitService>();
+    return Scaffold(
+      appBar: AppBar(title: const Text('Stats')),
+      body: RefreshIndicator(
+        onRefresh: () => _loadStats(force: true),
+        child: _buildContent(data, distanceUnits),
+      ),
+    );
+  }
+
+  Widget _buildContent(
+    DataService data,
+    DistanceUnitService distanceUnits,
+  ) {
+    final stats = data.aboutStats;
+    final loading = data.isAboutStatsLoading;
+
+    if (loading && stats == null) {
+      return ListView(
+        physics: const AlwaysScrollableScrollPhysics(),
+        children: const [
+          SizedBox(height: 140),
+          Center(child: CircularProgressIndicator()),
+          SizedBox(height: 140),
+        ],
+      );
+    }
+
+    if (stats == null || stats.sortedYears.isEmpty) {
+      return ListView(
+        physics: const AlwaysScrollableScrollPhysics(),
+        padding: const EdgeInsets.all(24),
+        children: [
+          const SizedBox(height: 40),
+          const Center(child: Text('No stats available yet.')),
+          const SizedBox(height: 12),
+          Center(
+            child: OutlinedButton(
+              onPressed: () => _loadStats(force: true),
+              child: const Text('Retry'),
+            ),
+          ),
+        ],
+      );
+    }
+
+    final years = stats.sortedYears;
+    return ListView.builder(
+      padding: const EdgeInsets.all(16),
+      itemCount: years.length,
+      itemBuilder: (context, index) {
+        return Padding(
+          padding: EdgeInsets.only(bottom: index == years.length - 1 ? 0 : 12),
+          child: _buildYearCard(context, years[index], distanceUnits),
+        );
+      },
+    );
+  }
+
+  Widget _buildYearCard(
+      BuildContext context, StatsYear year, DistanceUnitService distanceUnits) {
+    final theme = Theme.of(context);
+    return Card(
+      child: Padding(
+        padding: const EdgeInsets.all(12),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(
+                  year.year.toString(),
+                  style: theme.textTheme.titleLarge,
+                ),
+                const Spacer(),
+                Wrap(
+                  spacing: 8,
+                  runSpacing: 8,
+                  alignment: WrapAlignment.end,
+                  children: [
+                    _buildInfoChip(
+                      context,
+                      label: 'Mileage',
+                      value: distanceUnits.format(year.mileage, decimals: 1),
+                    ),
+                    _buildInfoChip(
+                      context,
+                      label: 'Winners',
+                      value: _countFormat.format(year.winnerCount),
+                    ),
+                  ],
+                ),
+              ],
+            ),
+            const SizedBox(height: 8),
+            _buildSection<StatsClassMileage>(
+              context,
+              title: 'Top classes',
+              items: year.topClasses,
+              emptyLabel: 'No class data',
+                itemBuilder: (item, index) => ListTile(
+                  dense: true,
+                  contentPadding: const EdgeInsets.symmetric(horizontal: 8),
+                  title: Text(item.locoClass),
+                  trailing: Text(
+                    distanceUnits.format(item.mileage, decimals: 1),
+                  ),
+                ),
+              ),
+            _buildSection<StatsNetworkMileage>(
+              context,
+              title: 'Top networks',
+              items: year.topNetworks,
+              emptyLabel: 'No network data',
+                itemBuilder: (item, index) => ListTile(
+                  dense: true,
+                  contentPadding: const EdgeInsets.symmetric(horizontal: 8),
+                  title: Text(item.network),
+                  trailing: Text(
+                    distanceUnits.format(item.mileage, decimals: 1),
+                  ),
+                ),
+              ),
+            _buildSection<StatsStationVisits>(
+              context,
+              title: 'Top stations',
+              items: year.topStations,
+              emptyLabel: 'No station data',
+              itemBuilder: (item, index) => ListTile(
+                dense: true,
+                contentPadding: const EdgeInsets.symmetric(horizontal: 8),
+                title: Text(item.station),
+                trailing: Text(
+                  '${_countFormat.format(item.visits)} visit${item.visits == 1 ? '' : 's'}',
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildInfoChip(BuildContext context,
+      {required String label, required String value}) {
+    final theme = Theme.of(context);
+    return Chip(
+      padding: const EdgeInsets.symmetric(horizontal: 8),
+      label: Text(
+        '$label: $value',
+        style: theme.textTheme.labelLarge,
+      ),
+    );
+  }
+
+  Widget _buildSection<T>(
+    BuildContext context, {
+    required String title,
+    required List<T> items,
+    required Widget Function(T item, int index) itemBuilder,
+    String emptyLabel = 'No data',
+  }) {
+    final theme = Theme.of(context);
+    return Padding(
+      padding: const EdgeInsets.only(top: 4),
+      child: ExpansionTile(
+        tilePadding: const EdgeInsets.symmetric(horizontal: 8),
+        childrenPadding:
+            const EdgeInsets.only(left: 8, right: 8, bottom: 8),
+        title: Text(
+          title,
+          style: theme.textTheme.titleMedium,
+        ),
+        children: items.isEmpty
+            ? [
+                Padding(
+                  padding: const EdgeInsets.symmetric(vertical: 8),
+                  child: Text(
+                    emptyLabel,
+                    style: theme.textTheme.bodySmall,
+                  ),
+                ),
+              ]
+            : items
+                .asMap()
+                .entries
+                .map((entry) => itemBuilder(entry.value, entry.key))
+                .toList(),
+      ),
+    );
+  }
+}
--- a/lib/components/pages/traction/traction.dart
+++ b/lib/components/pages/traction/traction.dart
@@ -6,6 +6,7 @@ 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/data_service.dart';
+import 'package:mileograph_flutter/services/distance_unit_service.dart';
 import 'package:provider/provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';

--- a/lib/components/pages/traction/traction_page.dart
+++ b/lib/components/pages/traction/traction_page.dart
@@ -639,6 +639,7 @@ class _TractionPageState extends State<TractionPage> {

  Widget _buildClassStatsCard(BuildContext context) {
    final scheme = Theme.of(context).colorScheme;
+    final distanceUnits = context.watch<DistanceUnitService>();
    if (_classStatsLoading) {
      return Card(
        child: Padding(
@@ -721,9 +722,27 @@ class _TractionPageState extends State<TractionPage> {
              children: [
                _metricTile('Had', hadCount),
                _metricTile('Entries', entriesWithClass),
-                _metricTile('Avg mi / loco had', avgMileagePerLoco.toStringAsFixed(2)),
-                _metricTile('Avg mi / entry', avgMileagePerEntry.toStringAsFixed(2)),
-                _metricTile('Total mileage', totalMileage.toStringAsFixed(2)),
+                _metricTile(
+                  'Avg distance / loco had',
+                  distanceUnits.format(
+                    avgMileagePerLoco,
+                    decimals: 2,
+                  ),
+                ),
+                _metricTile(
+                  'Avg distance / entry',
+                  distanceUnits.format(
+                    avgMileagePerEntry,
+                    decimals: 2,
+                  ),
+                ),
+                _metricTile(
+                  'Total distance',
+                  distanceUnits.format(
+                    totalMileage,
+                    decimals: 2,
+                  ),
+                ),
              ],
            ),
            const SizedBox(height: 12),
--- a/lib/components/pages/trips.dart
+++ b/lib/components/pages/trips.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:mileograph_flutter/objects/objects.dart';
 import 'package:mileograph_flutter/services/data_service.dart';
+import 'package:mileograph_flutter/services/distance_unit_service.dart';
 import 'package:provider/provider.dart';

 class TripsPage extends StatefulWidget {
@@ -27,10 +28,6 @@ class _TripsPageState extends State<TripsPage> {
    _tripLocoStatsFutures.clear();
    final data = context.read<DataService>();
    await data.fetchTripDetails();
-    if (!mounted) return;
-    for (final trip in data.tripDetails) {
-      _tripStatsFuture(trip.id);
-    }
  }

  Future<void> _renameTrip(TripDetail trip, String newName) async {
@@ -42,10 +39,7 @@ class _TripsPageState extends State<TripsPage> {
        "trip_id": trip.id,
        "trip_name": newName,
      });
-      await Future.wait([
-        data.fetchTripDetails(),
-        data.fetchTrips(),
-      ]);
+      await data.fetchTripDetails();
    } catch (e) {
      messenger?.showSnackBar(
        SnackBar(content: Text('Failed to rename trip: $e')),
@@ -54,10 +48,24 @@ class _TripsPageState extends State<TripsPage> {
    }
  }

-  Future<List<TripLocoStat>> _tripStatsFuture(int tripId) {
+  List<TripLocoStat> _cachedTripStats(
+    TripDetail trip,
+    TripSummary? summary,
+  ) {
+    if (trip.locoStats.isNotEmpty) return trip.locoStats;
+    if (summary?.locoStats.isNotEmpty == true) return summary!.locoStats;
+    return const [];
+  }
+
+  Future<List<TripLocoStat>> _loadTripStats(
+    TripDetail trip,
+    TripSummary? summary,
+  ) {
+    final cached = _cachedTripStats(trip, summary);
+    if (cached.isNotEmpty) return Future.value(cached);
    return _tripLocoStatsFutures.putIfAbsent(
-      tripId,
-      () => context.read<DataService>().fetchTripLocoStats(tripId),
+      trip.id,
+      () => context.read<DataService>().fetchTripLocoStats(trip.id),
    );
  }

@@ -92,8 +100,12 @@ class _TripsPageState extends State<TripsPage> {
  @override
  Widget build(BuildContext context) {
    final data = context.watch<DataService>();
+    final distanceUnits = context.watch<DistanceUnitService>();
    final tripDetails = data.tripDetails;
-    final tripSummaries = data.trips;
+    final tripSummaries = data.tripList;
+    final summaryById = {
+      for (final summary in tripSummaries) summary.tripId: summary,
+    };
    final showLoading = data.isTripDetailsLoading && tripDetails.isEmpty;

    return RefreshIndicator(
@@ -178,24 +190,33 @@ class _TripsPageState extends State<TripsPage> {
            return Card(
              child: ListTile(
                title: Text(trip.tripName),
-                subtitle: Text('${trip.tripMileage.toStringAsFixed(1)} mi'),
+                subtitle:
+                    Text(distanceUnits.format(trip.tripMileage, decimals: 1)),
              ),
            );
          }

          final trip = tripDetails[index - 1];
-          return _buildTripCard(context, trip);
+          final summary = summaryById[trip.id];
+          return _buildTripCard(context, trip, summary);
        },
      ),
    );
  }

-  Widget _buildTripCard(BuildContext context, TripDetail trip) {
+  Widget _buildTripCard(
+    BuildContext context,
+    TripDetail trip,
+    TripSummary? summary,
+  ) {
+    final distanceUnits = context.watch<DistanceUnitService>();
    final legs = trip.legs;
-    final legCount = trip.legCount > 0 ? trip.legCount : legs.length;
+    final legCount =
+        trip.legCount > 0 ? trip.legCount : summary?.legCount ?? legs.length;
    final dateRange = _formatDateRange(legs);
    final endpoints = _formatEndpoints(legs);
-    final statsFuture = _tripStatsFuture(trip.id);
+    final stats = _cachedTripStats(trip, summary);
+    final winnerCount = stats.where((e) => e.won).length;

    return Card(
      child: Padding(
@@ -228,67 +249,36 @@ class _TripsPageState extends State<TripsPage> {
                  crossAxisAlignment: CrossAxisAlignment.end,
                  children: [
                    Text(
-                      trip.mileage.toStringAsFixed(1),
+                      distanceUnits.format(trip.mileage, decimals: 1),
                      style:
                          Theme.of(context).textTheme.headlineSmall?.copyWith(
                        fontWeight: FontWeight.w800,
                      ),
                    ),
-                    Text(
-                      'miles',
-                      style: Theme.of(context).textTheme.labelMedium?.copyWith(
-                        color: Theme.of(context).textTheme.bodySmall?.color,
-                      ),
-                    ),
                  ],
                ),
              ],
            ),
            const SizedBox(height: 12),
-            FutureBuilder<List<TripLocoStat>>(
-              future: statsFuture,
-              builder: (context, snapshot) {
-                final chips = <Widget>[
+            Wrap(
+              spacing: 8,
+              runSpacing: 8,
+              children: [
                _buildMetaChip(context, Icons.timeline, '$legCount legs'),
                if (dateRange != null)
                  _buildMetaChip(context, Icons.calendar_month, dateRange),
                if (endpoints != null)
                  _buildMetaChip(context, Icons.route, endpoints),
-                ];
-
-                final stats = snapshot.data ?? const [];
-                final hasStats = stats.isNotEmpty;
-                final loading =
-                    snapshot.connectionState == ConnectionState.waiting;
-
-                if (loading && !hasStats) {
-                  chips.add(
-                    _buildMetaChip(context, Icons.train, 'Loading traction...'),
-                  );
-                } else if (hasStats) {
-                  final winnerCount = stats.where((e) => e.won).length;
-                  chips.add(
+                if (stats.isNotEmpty) ...[
                  _buildMetaChip(context, Icons.train, '${stats.length} had'),
-                  );
-                  chips.add(
                  _buildMetaChip(
                    context,
                    Icons.emoji_events_outlined,
                    '$winnerCount winners',
                  ),
-                  );
-                } else if (snapshot.connectionState == ConnectionState.done) {
-                  chips.add(
+                ] else
                  _buildMetaChip(context, Icons.train, 'No traction yet'),
-                  );
-                }
-
-                return Wrap(
-                  spacing: 8,
-                  runSpacing: 8,
-                  children: chips,
-                );
-              },
+              ],
            ),
            const SizedBox(height: 12),
            Align(
@@ -301,7 +291,7 @@ class _TripsPageState extends State<TripsPage> {
                  OutlinedButton.icon(
                    icon: const Icon(Icons.train),
                    label: const Text('Locos'),
-                    onPressed: () => _showTripWinners(context, trip),
+                    onPressed: () => _showTripWinners(context, trip, summary),
                  ),
                  FilledButton.icon(
                    icon: const Icon(Icons.open_in_new),
@@ -375,6 +365,7 @@ class _TripsPageState extends State<TripsPage> {
  }

  void _showTripDetail(BuildContext context, TripDetail trip) {
+    final distanceUnits = context.read<DistanceUnitService>();
    showModalBottomSheet(
      context: context,
      isScrollControlled: true,
@@ -499,7 +490,9 @@ class _TripsPageState extends State<TripsPage> {
                          ),
                        ],
                        const SizedBox(width: 4),
-                        Text('${trip.mileage.toStringAsFixed(1)} mi'),
+                        Text(
+                          distanceUnits.format(trip.mileage, decimals: 1),
+                        ),
                      ],
                    ),
                    const SizedBox(height: 8),
@@ -514,7 +507,12 @@ class _TripsPageState extends State<TripsPage> {
                            title: Text('${leg.start} → ${leg.end}'),
                            subtitle: Text(_formatDate(leg.beginTime)),
                            trailing: Text(
-                              leg.mileage?.toStringAsFixed(1) ?? '-',
+                              leg.mileage == null
+                                  ? '-'
+                                  : distanceUnits.format(
+                                      leg.mileage!,
+                                      decimals: 1,
+                                    ),
                              style: Theme.of(context).textTheme.labelLarge
                                  ?.copyWith(fontWeight: FontWeight.bold),
                            ),
@@ -532,14 +530,20 @@ class _TripsPageState extends State<TripsPage> {
    );
  }

-  void _showTripWinners(BuildContext context, TripDetail trip) {
+  void _showTripWinners(
+    BuildContext context,
+    TripDetail trip,
+    TripSummary? summary,
+  ) {
+    final distanceUnits = context.read<DistanceUnitService>();
    showModalBottomSheet(
      context: context,
      isScrollControlled: true,
      builder: (_) {
        return SafeArea(
          child: FutureBuilder<List<TripLocoStat>>(
-            future: _tripStatsFuture(trip.id),
+            future: _loadTripStats(trip, summary),
+            initialData: _cachedTripStats(trip, summary),
            builder: (ctx, snapshot) {
              final items = snapshot.data ?? [];
              final loading =
@@ -564,7 +568,9 @@ class _TripsPageState extends State<TripsPage> {
                              ?.copyWith(fontWeight: FontWeight.bold),
                        ),
                        const Spacer(),
-                        Text('${trip.mileage.toStringAsFixed(1)} mi'),
+                        Text(
+                          distanceUnits.format(trip.mileage, decimals: 1),
+                        ),
                      ],
                    ),
                    const SizedBox(height: 8),
--- a/lib/components/traction/traction_card.dart
+++ b/lib/components/traction/traction_card.dart
@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:mileograph_flutter/objects/objects.dart';
+import 'package:mileograph_flutter/services/distance_unit_service.dart';
+import 'package:provider/provider.dart';

 class TractionCard extends StatelessWidget {
  const TractionCard({
@@ -28,6 +30,7 @@ class TractionCard extends StatelessWidget {
    final domain = loco.domain ?? '';
    final hasMileageOrTrips = _hasMileageOrTrips(loco);
    final statusColors = _statusChipColors(context, status);
+    final distanceUnits = context.watch<DistanceUnitService>();

    return Card(
      child: Padding(
@@ -151,8 +154,11 @@ class TractionCard extends StatelessWidget {
              children: [
                _statPill(
                  context,
-                  label: 'Miles',
-                  value: _formatNumber(loco.mileage),
+                  label: 'Distance',
+                  value: distanceUnits.format(
+                    loco.mileage ?? 0,
+                    decimals: 1,
+                  ),
                ),
                _statPill(
                  context,
@@ -203,6 +209,7 @@ Future<void> showTractionDetails(
  LocoSummary loco,
 ) async {
  final hasMileageOrTrips = _hasMileageOrTrips(loco);
+  final distanceUnits = context.read<DistanceUnitService>();
  await showModalBottomSheet(
    context: context,
    isScrollControlled: true,
@@ -275,7 +282,10 @@ Future<void> showTractionDetails(
                      _detailRow(
                        context,
                        'Mileage',
-                        _formatNumber(loco.mileage ?? 0),
+                        distanceUnits.format(
+                          loco.mileage ?? 0,
+                          decimals: 1,
+                        ),
                      ),
                      _detailRow(
                        context,
@@ -368,8 +378,3 @@ bool _hasMileageOrTrips(LocoSummary loco) {
  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);
-}
--- a/lib/objects/objects.dart
+++ b/lib/objects/objects.dart
@@ -1,3 +1,5 @@
+import 'dart:convert';
+
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';

@@ -20,6 +22,35 @@ String _asString(dynamic value, [String fallback = '']) {
  return (str == null) ? fallback : str;
 }

+List<String> _asStringList(dynamic value) {
+  if (value is List) {
+    return value.map((e) => e.toString()).toList();
+  }
+  final trimmed = value?.toString().trim() ?? '';
+  if (trimmed.isEmpty) return const [];
+  try {
+    final decoded = jsonDecode(trimmed);
+    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];
+}
+
 bool _asBool(dynamic value, [bool fallback = false]) {
  if (value is bool) return value;
  if (value is num) return value != 0;
@@ -137,6 +168,208 @@ class YearlyMileage {
  );
 }

+class StatsAbout {
+  final Map<int, StatsYear> years;
+
+  StatsAbout({required this.years});
+
+  factory StatsAbout.fromJson(Map<String, dynamic> json) {
+    final mileageByYear = <int, double>{};
+    final classByYear = <int, List<StatsClassMileage>>{};
+    final networkByYear = <int, List<StatsNetworkMileage>>{};
+    final stationByYear = <int, List<StatsStationVisits>>{};
+    final winnersByYear = <int, int>{};
+
+    void addYearMileage(dynamic entry) {
+      if (entry is Map<String, dynamic>) {
+        final year = entry['year'] is int
+            ? entry['year'] as int
+            : int.tryParse('${entry['year']}');
+        if (year != null) {
+          mileageByYear[year] = _asDouble(entry['mileage']);
+        }
+      }
+    }
+
+    if (json['year_mileages'] is List) {
+      for (final entry in json['year_mileages']) {
+        if (entry is Map<String, dynamic>) {
+          addYearMileage(entry);
+        } else if (entry is Map) {
+          addYearMileage(entry
+              .map((key, value) => MapEntry(key.toString(), value)));
+        }
+      }
+    }
+
+    List<StatsClassMileage> parseClassList(dynamic value) {
+      if (value is List) {
+        return value
+            .whereType<Map>()
+            .map((e) => StatsClassMileage.fromJson(
+                e.map((key, value) => MapEntry(key.toString(), value))))
+            .toList();
+      }
+      return const [];
+    }
+
+    List<StatsNetworkMileage> parseNetworkList(dynamic value) {
+      if (value is List) {
+        return value
+            .whereType<Map>()
+            .map((e) => StatsNetworkMileage.fromJson(
+                e.map((key, value) => MapEntry(key.toString(), value))))
+            .toList();
+      }
+      return const [];
+    }
+
+    List<StatsStationVisits> parseStationList(dynamic value) {
+      if (value is List) {
+        return value
+            .whereType<Map>()
+            .map((e) => StatsStationVisits.fromJson(
+                e.map((key, value) => MapEntry(key.toString(), value))))
+            .toList();
+      }
+      return const [];
+    }
+
+    void parseYearMap<T>(
+      dynamic source,
+      Map<int, T> target,
+      T Function(dynamic value) mapper,
+    ) {
+      if (source is Map) {
+        source.forEach((key, value) {
+          final year = int.tryParse(key.toString());
+          if (year == null) return;
+          target[year] = mapper(value);
+        });
+      }
+    }
+
+    parseYearMap<List<StatsClassMileage>>(
+      json['top_classes'],
+      classByYear,
+      parseClassList,
+    );
+    parseYearMap<List<StatsNetworkMileage>>(
+      json['top_networks'],
+      networkByYear,
+      parseNetworkList,
+    );
+    parseYearMap<List<StatsStationVisits>>(
+      json['top_stations'],
+      stationByYear,
+      parseStationList,
+    );
+    if (json['year_winners'] is Map) {
+      (json['year_winners'] as Map).forEach((key, value) {
+        final year = int.tryParse(key.toString());
+        if (year == null) return;
+        if (value is List) {
+          winnersByYear[year] = value.length;
+        }
+      });
+    }
+
+    final years = <int>{
+      ...mileageByYear.keys,
+      ...classByYear.keys,
+      ...networkByYear.keys,
+      ...stationByYear.keys,
+      ...winnersByYear.keys,
+    }..removeWhere((year) => year == 0);
+
+    final yearMap = <int, StatsYear>{};
+    for (final year in years) {
+      yearMap[year] = StatsYear(
+        year: year,
+        mileage: mileageByYear[year] ?? 0,
+        topClasses: classByYear[year] ?? const [],
+        topNetworks: networkByYear[year] ?? const [],
+        topStations: stationByYear[year] ?? const [],
+        winnerCount: winnersByYear[year] ?? 0,
+      );
+    }
+
+    return StatsAbout(years: yearMap);
+  }
+
+  List<StatsYear> get sortedYears {
+    final list = years.values.toList();
+    list.sort((a, b) => b.year.compareTo(a.year));
+    return list;
+  }
+}
+
+class StatsYear {
+  final int year;
+  final double mileage;
+  final List<StatsClassMileage> topClasses;
+  final List<StatsNetworkMileage> topNetworks;
+  final List<StatsStationVisits> topStations;
+  final int winnerCount;
+
+  StatsYear({
+    required this.year,
+    required this.mileage,
+    required this.topClasses,
+    required this.topNetworks,
+    required this.topStations,
+    required this.winnerCount,
+  });
+}
+
+class StatsClassMileage {
+  final String locoClass;
+  final double mileage;
+
+  StatsClassMileage({
+    required this.locoClass,
+    required this.mileage,
+  });
+
+  factory StatsClassMileage.fromJson(Map<String, dynamic> json) =>
+      StatsClassMileage(
+        locoClass: _asString(json['loco_class'], 'Unknown'),
+        mileage: _asDouble(json['mileage']),
+      );
+}
+
+class StatsNetworkMileage {
+  final String network;
+  final double mileage;
+
+  StatsNetworkMileage({
+    required this.network,
+    required this.mileage,
+  });
+
+  factory StatsNetworkMileage.fromJson(Map<String, dynamic> json) =>
+      StatsNetworkMileage(
+        network: _asString(json['network'], 'Unknown'),
+        mileage: _asDouble(json['mileage']),
+      );
+}
+
+class StatsStationVisits {
+  final String station;
+  final int visits;
+
+  StatsStationVisits({
+    required this.station,
+    required this.visits,
+  });
+
+  factory StatsStationVisits.fromJson(Map<String, dynamic> json) =>
+      StatsStationVisits(
+        station: _asString(json['station'], 'Unknown'),
+        visits: _asInt(json['visits']),
+      );
+}
+
 class Loco {
  final int id;
  final String type, number, locoClass;
@@ -487,25 +720,45 @@ class TripSummary {
  final int tripId;
  final String tripName;
  final double tripMileage;
+  final int legCount;
+  final List<TripLocoStat> locoStats;
+
+  int get locoHadCount => locoStats.length;
+  int get winnersCount => locoStats.where((e) => e.won).length;

  TripSummary({
    required this.tripId,
    required this.tripName,
    required this.tripMileage,
-  });
+    this.legCount = 0,
+    List<TripLocoStat>? locoStats,
+  }) : locoStats = locoStats ?? const [];

  factory TripSummary.fromJson(Map<String, dynamic> json) => TripSummary(
    tripId: _asInt(json['trip_id']),
    tripName: _asString(json['trip_name']),
    tripMileage: _asDouble(json['trip_mileage']),
+    legCount: _asInt(
+      json['leg_count'],
+      (json['trip_legs'] as List?)?.length ?? 0,
+    ),
+    locoStats: TripLocoStat.listFromJson(
+      json['stats'] ?? json['trip_locos'] ?? json['locos'],
+    ),
  );
 }

 class Leg {
  final int id, tripId, timezone, driving;
-  final String start, end, route, network, notes, headcode, user;
+  final String start, end, network, notes, headcode, user;
+  final String origin, destination;
+  final List<String> route;
  final DateTime beginTime;
+  final DateTime? endTime;
+  final DateTime? originTime;
+  final DateTime? destinationTime;
  final double mileage;
+  final int? beginDelayMinutes, endDelayMinutes;
  final List<Loco> locos;

  Leg({
@@ -523,17 +776,36 @@ class Leg {
    required this.driving,
    required this.user,
    required this.locos,
+    this.endTime,
+    this.originTime,
+    this.destinationTime,
+    this.beginDelayMinutes,
+    this.endDelayMinutes,
+    this.origin = '',
+    this.destination = '',
  });

-  factory Leg.fromJson(Map<String, dynamic> json) => Leg(
+  factory Leg.fromJson(Map<String, dynamic> json) {
+    final endTimeRaw = json['leg_end_time'];
+    final parsedEndTime = (endTimeRaw == null || '$endTimeRaw'.isEmpty)
+        ? null
+        : _asDateTime(endTimeRaw);
+    return Leg(
      id: _asInt(json['leg_id']),
      tripId: _asInt(json['leg_trip']),
      start: _asString(json['leg_start']),
      end: _asString(json['leg_end']),
      beginTime: _asDateTime(json['leg_begin_time']),
+      endTime: parsedEndTime,
+      originTime: json['leg_origin_time'] == null
+          ? null
+          : _asDateTime(json['leg_origin_time']),
+      destinationTime: json['leg_destination_time'] == null
+          ? null
+          : _asDateTime(json['leg_destination_time']),
      timezone: _asInt(json['leg_timezone']),
      network: _asString(json['leg_network']),
-    route: _asString(json['leg_route']),
+      route: _asStringList(json['leg_route']),
      mileage: _asDouble(json['leg_mileage']),
      notes: _asString(json['leg_notes']),
      headcode: _asString(json['leg_headcode']),
@@ -543,8 +815,17 @@ class Leg {
          .whereType<Map>()
          .map((e) => Loco.fromJson(Map<String, dynamic>.from(e)))
          .toList(),
+      beginDelayMinutes: json['leg_begin_delay'] == null
+          ? null
+          : _asInt(json['leg_begin_delay']),
+      endDelayMinutes: json['leg_end_delay'] == null
+          ? null
+          : _asInt(json['leg_end_delay']),
+      origin: _asString(json['leg_origin']),
+      destination: _asString(json['leg_destination']),
    );
  }
+}

 class RouteError {
  final String error;
@@ -625,17 +906,23 @@ class TripLeg {
  });

  factory TripLeg.fromJson(Map<String, dynamic> json) => TripLeg(
-    id: json['leg_id'],
-    start: json['leg_start'] ?? '',
-    end: json['leg_end'] ?? '',
+    id: _asInt(json['leg_id']),
+    start: _asString(json['leg_start']),
+    end: _asString(json['leg_end']),
    beginTime:
        json['leg_begin_time'] != null && json['leg_begin_time'] is String
        ? DateTime.tryParse(json['leg_begin_time'])
        : (json['leg_begin_time'] is DateTime ? json['leg_begin_time'] : null),
-    network: json['leg_network'],
-    route: json['leg_route'],
+    network: _asString(json['leg_network'], ''),
+    route: () {
+      final route = json['leg_route'];
+      if (route is List) {
+        return route.whereType<String>().join(' → ');
+      }
+      return _asString(route, '');
+    }(),
    mileage: (json['leg_mileage'] as num?)?.toDouble(),
-    notes: json['leg_notes'],
+    notes: _asString(json['leg_notes'], ''),
    locos:
        (json['locos'] as List?)
            ?.map((e) => Loco.fromJson(e as Map<String, dynamic>))
@@ -649,21 +936,32 @@ class TripDetail {
  final String name;
  final double mileage;
  final int legCount;
+  final List<TripLocoStat> locoStats;
  final List<TripLeg> legs;

+  int get locoHadCount => locoStats.length;
+  int get winnersCount => locoStats.where((e) => e.won).length;
+
  TripDetail({
    required this.id,
    required this.name,
    required this.mileage,
    required this.legCount,
    required this.legs,
-  });
+    List<TripLocoStat>? locoStats,
+  }) : locoStats = locoStats ?? const [];

  factory TripDetail.fromJson(Map<String, dynamic> json) => TripDetail(
    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),
+    legCount: _asInt(
+      json['leg_count'],
+      (json['trip_legs'] as List?)?.length ?? 0,
+    ),
+    locoStats: TripLocoStat.listFromJson(
+      json['stats'] ?? json['trip_locos'] ?? json['locos'],
+    ),
    legs:
        (json['trip_legs'] as List?)
            ?.map((e) => TripLeg.fromJson(e as Map<String, dynamic>))
@@ -712,6 +1010,26 @@ class TripLocoStat {
    );
  }

+  static List<TripLocoStat> listFromJson(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 const [];
+    return list
+        .whereType<Map>()
+        .map((e) => TripLocoStat.fromJson(Map<String, dynamic>.from(e)))
+        .toList();
+  }
+
  static bool _parseWonFlag(dynamic value) {
    if (value == null) return false;
    if (value is bool) return value;
--- a/lib/services/api_service.dart
+++ b/lib/services/api_service.dart
@@ -128,7 +128,12 @@ class ApiService {
      await _onUnauthorized!();
    }

-    throw Exception('API error ${res.statusCode}: $body');
+    final message = _extractErrorMessage(body);
+    throw ApiException(
+      statusCode: res.statusCode,
+      message: message,
+      body: body,
+    );
  }

  dynamic _decodeBody(http.Response res) {
@@ -149,4 +154,41 @@ class ApiService {
      return res.body;
    }
  }
+
+  String _extractErrorMessage(dynamic body) {
+    if (body == null) return 'No response body';
+    if (body is String) return body;
+    if (body is Map<String, dynamic>) {
+      for (final key in ['message', 'error', 'detail', 'msg']) {
+        final val = body[key];
+        if (val is String && val.trim().isNotEmpty) return val;
+      }
+      return body.toString();
+    }
+    if (body is List) {
+      final parts = body
+          .map((e) => e is Map
+              ? _extractErrorMessage(Map<String, dynamic>.from(e))
+              : e.toString())
+          .where((e) => e.trim().isNotEmpty)
+          .toList();
+      if (parts.isNotEmpty) return parts.join('; ');
+    }
+    return body.toString();
+  }
+}
+
+class ApiException implements Exception {
+  final int statusCode;
+  final String message;
+  final dynamic body;
+
+  ApiException({
+    required this.statusCode,
+    required this.message,
+    this.body,
+  });
+
+  @override
+  String toString() => 'API error $statusCode: $message';
 }
--- a/lib/services/data_service/data_service.dart
+++ b/lib/services/data_service/data_service.dart
@@ -11,3 +11,4 @@ part 'data_service_traction.dart';
 part 'data_service_trips.dart';
 part 'data_service_notifications.dart';
 part 'data_service_badges.dart';
+part 'data_service_stats.dart';
--- a/lib/services/data_service/data_service_core.dart
+++ b/lib/services/data_service/data_service_core.dart
@@ -28,6 +28,10 @@ class DataService extends ChangeNotifier {
  // Homepage Data
  HomepageStats? _homepageStats;
  HomepageStats? get homepageStats => _homepageStats;
+  StatsAbout? _aboutStats;
+  StatsAbout? get aboutStats => _aboutStats;
+  bool _isAboutStatsLoading = false;
+  bool get isAboutStatsLoading => _isAboutStatsLoading;

  // Legs Data
  List<Leg> _legs = [];
--- a/lib/services/data_service/data_service_stats.dart
+++ b/lib/services/data_service/data_service_stats.dart
@@ -0,0 +1,28 @@
+part of 'data_service.dart';
+
+extension DataServiceStats on DataService {
+  Future<void> fetchAboutStats({bool force = false}) async {
+    if (_isAboutStatsLoading) return;
+    if (!force && _aboutStats != null) return;
+    _isAboutStatsLoading = true;
+    _notifyAsync();
+    try {
+      final json = await api.get('/stats/about');
+      if (json is Map<String, dynamic>) {
+        _aboutStats = StatsAbout.fromJson(json);
+      } else if (json is Map) {
+        _aboutStats = StatsAbout.fromJson(
+          json.map((key, value) => MapEntry(key.toString(), value)),
+        );
+      } else {
+        throw Exception('Unexpected stats response: $json');
+      }
+    } catch (e) {
+      debugPrint('Failed to fetch about stats: $e');
+      _aboutStats = null;
+    } finally {
+      _isAboutStatsLoading = false;
+      _notifyAsync();
+    }
+  }
+}
--- a/lib/services/data_service/data_service_trips.dart
+++ b/lib/services/data_service/data_service_trips.dart
@@ -4,16 +4,25 @@ extension DataServiceTrips on DataService {
  Future<void> fetchTripDetails() async {
    _isTripDetailsLoading = true;
    try {
-      final json = await api.get('/trips/legs-and-stats');
-      if (json is List) {
-        final tripMap = json.map((e) => TripDetail.fromJson(e)).toList();
-        _tripDetails = [...tripMap]..sort((a, b) => b.id.compareTo(a.id));
-      } else {
-        _tripDetails = [];
-      }
+      final json = await api.get('/trips/info');
+      final tripDetails = _parseTripInfoList(json);
+      _tripDetails = [...tripDetails]..sort((a, b) => b.id.compareTo(a.id));
+      _tripList = tripDetails
+          .map(
+            (detail) => TripSummary(
+              tripId: detail.id,
+              tripName: detail.name,
+              tripMileage: detail.mileage,
+              legCount: detail.legCount,
+              locoStats: detail.locoStats,
+            ),
+          )
+          .toList()
+        ..sort((a, b) => b.tripId.compareTo(a.tripId));
    } catch (e) {
      debugPrint('Failed to fetch trip_map: $e');
      _tripDetails = [];
+      _tripList = [];
    } finally {
      _isTripDetailsLoading = false;
      _notifyAsync();
@@ -23,48 +32,17 @@ extension DataServiceTrips on DataService {
  Future<List<TripLocoStat>> fetchTripLocoStats(int tripId) async {
    try {
      final json = await api.get('/trips/stats/$tripId');
-      return _parseTripLocoStats(json);
+      return TripLocoStat.listFromJson(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> fetchTrips() async {
    try {
-      final json = await api.get('/trips/mileage');
-      Iterable<dynamic>? raw;
-      if (json is List) {
-        raw = json;
-      } else if (json is Map) {
-        for (final key in ['trips', 'trip_data', 'data']) {
-          final value = json[key];
-          if (value is List) {
-            raw = value;
-            break;
-          }
-        }
-      }
+      final json = await api.get('/trips/info');
+      final raw = _extractTrips(json);
      if (raw != null) {
        final tripMap = raw
            .whereType<Map<String, dynamic>>()
@@ -119,8 +97,9 @@ extension DataServiceTrips on DataService {
  }

  void upsertTripSummary(TripSummary trip) {
-    final existingIndex =
-        _tripList.indexWhere((element) => element.tripId == trip.tripId);
+    final existingIndex = _tripList.indexWhere(
+      (element) => element.tripId == trip.tripId,
+    );
    if (existingIndex >= 0) {
      _tripList[existingIndex] = trip;
    } else {
@@ -129,4 +108,24 @@ extension DataServiceTrips on DataService {
    _tripList.sort((a, b) => b.tripId.compareTo(a.tripId));
    _notifyAsync();
  }
+
+  Iterable<dynamic>? _extractTrips(dynamic json) {
+    if (json is List) return json;
+    if (json is Map) {
+      for (final key in ['trips', 'trip_data', 'data', 'trip_info']) {
+        final value = json[key];
+        if (value is List) return value;
+      }
+    }
+    return null;
+  }
+
+  List<TripDetail> _parseTripInfoList(dynamic json) {
+    final raw = _extractTrips(json);
+    if (raw == null) return const [];
+    return raw
+        .whereType<Map<String, dynamic>>()
+        .map((e) => TripDetail.fromJson(e))
+        .toList();
+  }
 }
--- a/lib/services/distance_unit_service.dart
+++ b/lib/services/distance_unit_service.dart
@@ -0,0 +1,211 @@
+import 'package:flutter/foundation.dart';
+import 'package:intl/intl.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+enum DistanceUnit {
+  milesDecimal,
+  milesChains,
+  kilometers,
+}
+
+extension DistanceUnitLabels on DistanceUnit {
+  String get label {
+    switch (this) {
+      case DistanceUnit.milesDecimal:
+        return 'Miles (decimal)';
+      case DistanceUnit.milesChains:
+        return 'Miles & chains';
+      case DistanceUnit.kilometers:
+        return 'Kilometers';
+    }
+  }
+
+  String get shortLabel {
+    switch (this) {
+      case DistanceUnit.milesDecimal:
+        return 'mi';
+      case DistanceUnit.milesChains:
+        return 'm.ch';
+      case DistanceUnit.kilometers:
+        return 'km';
+    }
+  }
+
+  String get _prefsValue => toString().split('.').last;
+
+  static DistanceUnit fromPrefs(String raw) {
+    return DistanceUnit.values.firstWhere(
+      (u) => u._prefsValue == raw,
+      orElse: () => DistanceUnit.milesDecimal,
+    );
+  }
+}
+
+class DistanceUnitService extends ChangeNotifier {
+  static const _prefsKey = 'distance_unit';
+  static const double kmPerMile = 1.609344;
+  static const double chainsPerMile = 80.0;
+
+  DistanceUnitService() {
+    _load();
+  }
+
+  DistanceUnit _unit = DistanceUnit.milesDecimal;
+  bool _loaded = false;
+
+  DistanceUnit get unit => _unit;
+  bool get isLoaded => _loaded;
+
+  Future<void> _load() async {
+    final prefs = await SharedPreferences.getInstance();
+    final saved = prefs.getString(_prefsKey);
+    if (saved != null && saved.trim().isNotEmpty) {
+      _unit = DistanceUnitLabels.fromPrefs(saved.trim());
+    }
+    _loaded = true;
+    notifyListeners();
+  }
+
+  Future<void> setUnit(DistanceUnit unit) async {
+    _unit = unit;
+    final prefs = await SharedPreferences.getInstance();
+    await prefs.setString(_prefsKey, unit._prefsValue);
+    notifyListeners();
+  }
+
+  double? milesFromInput(String input) =>
+      DistanceFormatter(_unit).parseInputMiles(input);
+
+  String format(double miles,
+          {int decimals = 1, bool includeUnit = true}) =>
+      DistanceFormatter(_unit)
+          .format(miles, decimals: decimals, includeUnit: includeUnit);
+
+  double toDisplay(double miles, {int decimals = 1}) =>
+      DistanceFormatter(_unit).convertMiles(miles, decimals: decimals);
+}
+
+class DistanceFormatter {
+  DistanceFormatter(this.unit);
+
+  final DistanceUnit unit;
+
+  String format(double miles,
+      {int decimals = 1, bool includeUnit = true}) {
+    decimals = decimals.clamp(1, 2);
+    if (unit == DistanceUnit.milesChains) {
+      // Always show chains with two decimals.
+      decimals = 2;
+    }
+    switch (unit) {
+      case DistanceUnit.milesDecimal:
+        final value = _numberFormat(decimals).format(miles);
+        return includeUnit ? '$value mi' : value;
+      case DistanceUnit.kilometers:
+        final kms = miles * DistanceUnitService.kmPerMile;
+        final value = _numberFormat(decimals).format(kms);
+        return includeUnit ? '$value km' : value;
+      case DistanceUnit.milesChains:
+        final value = _formatMilesChains(miles);
+        return includeUnit ? '$value mi' : value;
+    }
+  }
+
+  double convertMiles(double miles, {int decimals = 1}) {
+    decimals = decimals.clamp(1, 2);
+    switch (unit) {
+      case DistanceUnit.milesDecimal:
+        return double.parse(miles.toStringAsFixed(decimals));
+      case DistanceUnit.kilometers:
+        final kms = miles * DistanceUnitService.kmPerMile;
+        return double.parse(kms.toStringAsFixed(decimals));
+      case DistanceUnit.milesChains:
+        // Return miles again; chains representation handled by format.
+        return double.parse(miles.toStringAsFixed(decimals));
+    }
+  }
+
+  double milesFromDisplayValue(double value) {
+    switch (unit) {
+      case DistanceUnit.milesDecimal:
+        return value;
+      case DistanceUnit.kilometers:
+        return value / DistanceUnitService.kmPerMile;
+      case DistanceUnit.milesChains:
+        // Value already represents miles when parsed via parseMilesChains.
+        return value;
+    }
+  }
+
+  double? parseInputMiles(String input) {
+    final trimmed = input.trim();
+    if (trimmed.isEmpty) return null;
+    switch (unit) {
+      case DistanceUnit.milesDecimal:
+        return double.tryParse(trimmed.replaceAll(',', ''));
+      case DistanceUnit.kilometers:
+        final km = double.tryParse(trimmed.replaceAll(',', ''));
+        if (km == null) return null;
+        return km / DistanceUnitService.kmPerMile;
+      case DistanceUnit.milesChains:
+        return _parseMilesChains(trimmed);
+    }
+  }
+
+  NumberFormat _numberFormat(int decimals) {
+    final pattern =
+        decimals == 1 ? '#,##0.0' : '#,##0.00';
+    return NumberFormat(pattern);
+  }
+
+  String _formatMilesChains(double miles, {int decimals = 1}) {
+    final totalChains = miles * DistanceUnitService.chainsPerMile;
+    var milesPart = totalChains ~/ DistanceUnitService.chainsPerMile;
+    final chainRemainder =
+        totalChains - (milesPart * DistanceUnitService.chainsPerMile);
+
+    // Always show chains as two digits (00-79), rounded to the nearest chain.
+    var roundedChains = chainRemainder.roundToDouble();
+    if (roundedChains >= DistanceUnitService.chainsPerMile) {
+      milesPart += 1;
+      roundedChains -= DistanceUnitService.chainsPerMile;
+    }
+    final chainText = NumberFormat('00').format(roundedChains);
+    return '$milesPart.$chainText';
+  }
+
+  double? _parseMilesChains(String raw) {
+    final cleaned = raw
+        .toLowerCase()
+        .replaceAll(',', '')
+        .replaceAll('m', '.')
+        .replaceAll('c', '.')
+        .replaceAll(RegExp(r'\s+'), '.')
+        .replaceAll(RegExp(r'\.+'), '.')
+        .trim();
+    if (cleaned.isEmpty) return null;
+
+    final parts = cleaned.split('.');
+    if (parts.isEmpty) return null;
+
+    final milesPart =
+        int.tryParse(parts[0].isEmpty ? '0' : parts[0]);
+    if (milesPart == null) return null;
+    double chainsPart = 0;
+    if (parts.length >= 2) {
+      final chainRaw = parts
+          .sublist(1)
+          .join()
+          .trim();
+      if (chainRaw.isNotEmpty) {
+        final parsedChains = double.tryParse(chainRaw);
+        if (parsedChains == null) return null;
+        chainsPart = parsedChains;
+      }
+    }
+    final totalMiles =
+        milesPart +
+        (chainsPart / DistanceUnitService.chainsPerMile);
+    return totalMiles;
+  }
+}
--- a/lib/ui/app_shell.dart
+++ b/lib/ui/app_shell.dart
@@ -3,6 +3,8 @@ import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:go_router/go_router.dart';
+import 'package:mileograph_flutter/components/pages/calculator.dart';
+import 'package:mileograph_flutter/components/pages/calculator_details.dart';
 import 'package:mileograph_flutter/components/login/login.dart';
 import 'package:mileograph_flutter/components/pages/dashboard.dart';
 import 'package:mileograph_flutter/components/pages/loco_legs.dart';
@@ -13,16 +15,19 @@ import 'package:mileograph_flutter/components/pages/new_entry.dart';
 import 'package:mileograph_flutter/components/pages/new_traction.dart';
 import 'package:mileograph_flutter/components/pages/profile.dart';
 import 'package:mileograph_flutter/components/pages/settings.dart';
+import 'package:mileograph_flutter/components/pages/stats.dart';
 import 'package:mileograph_flutter/components/pages/traction.dart';
 import 'package:mileograph_flutter/services/authservice.dart';
 import 'package:mileograph_flutter/services/data_service.dart';
 import 'package:mileograph_flutter/services/navigation_guard.dart';
 import 'package:provider/provider.dart';

-final GlobalKey<NavigatorState> _shellNavigatorKey = GlobalKey<NavigatorState>();
+final GlobalKey<NavigatorState> _shellNavigatorKey =
+    GlobalKey<NavigatorState>();

 const List<String> _contentPages = [
  "/dashboard",
+  "/calculator",
  "/logbook",
  "/traction",
  "/add",
@@ -31,13 +36,14 @@ const List<String> _contentPages = [

 const List<String> _defaultTabDestinations = [
  "/dashboard",
+  "/calculator",
  "/logbook/entries",
  "/traction",
  "/add",
  "/more",
 ];

-const int _addTabIndex = 3;
+const int _addTabIndex = 4;

 class _NavItem {
  final String label;
@@ -47,6 +53,7 @@ class _NavItem {

 const List<_NavItem> _navItems = [
  _NavItem("Home", Icons.home),
+  _NavItem("Calculator", Icons.route),
  _NavItem("Logbook", Icons.menu_book),
  _NavItem("Traction", Icons.train),
  _NavItem("Add", Icons.add),
@@ -112,10 +119,7 @@ class _MyAppState extends State<MyApp> {
        return null;
      },
      routes: [
-        GoRoute(
-          path: '/',
-          redirect: (context, state) => '/dashboard',
-        ),
+        GoRoute(path: '/', redirect: (context, state) => '/dashboard'),
        ShellRoute(
          navigatorKey: _shellNavigatorKey,
          builder: (context, state, child) => MyHomePage(child: child),
@@ -124,6 +128,17 @@ class _MyAppState extends State<MyApp> {
              path: '/dashboard',
              builder: (context, state) => const Dashboard(),
            ),
+            GoRoute(
+              path: '/calculator',
+              builder: (context, state) => const CalculatorPage(),
+              routes: [
+                GoRoute(
+                  path: 'details',
+                  builder: (context, state) =>
+                      CalculatorDetailsPage(result: state.extra),
+                ),
+              ],
+            ),
            GoRoute(
              path: '/logbook',
              redirect: (context, state) => '/logbook/entries',
@@ -198,6 +213,10 @@ class _MyAppState extends State<MyApp> {
              path: '/more/profile',
              builder: (context, state) => const ProfilePage(),
            ),
+            GoRoute(
+              path: '/more/stats',
+              builder: (context, state) => const StatsPage(),
+            ),
            GoRoute(
              path: '/more/settings',
              builder: (context, state) => const SettingsPage(),
@@ -212,7 +231,10 @@ class _MyAppState extends State<MyApp> {
            ),
          ],
        ),
-        GoRoute(path: '/login', builder: (context, state) => const LoginScreen()),
+        GoRoute(
+          path: '/login',
+          builder: (context, state) => const LoginScreen(),
+        ),
        GoRoute(
          path: '/settings',
          builder: (context, state) => const SettingsPage(),
@@ -373,7 +395,10 @@ class _MyHomePageState extends State<MyHomePage> {
              TextSpan(
                children: const [
                  TextSpan(text: "Mile"),
-                  TextSpan(text: "O", style: TextStyle(color: Colors.red)),
+                  TextSpan(
+                    text: "O",
+                    style: TextStyle(color: Colors.red),
+                  ),
                  TextSpan(text: "graph"),
                ],
                style: const TextStyle(
@@ -390,7 +415,10 @@ class _MyHomePageState extends State<MyHomePage> {
                onPressed: () => context.go('/more/settings'),
                icon: const Icon(Icons.settings),
              ),
-              IconButton(onPressed: auth.logout, icon: const Icon(Icons.logout)),
+              IconButton(
+                onPressed: auth.logout,
+                icon: const Icon(Icons.logout),
+              ),
            ],
          ),
          bottomNavigationBar: isWide
@@ -448,7 +476,8 @@ class _MyHomePageState extends State<MyHomePage> {
    return Shortcuts(
      shortcuts: <LogicalKeySet, Intent>{
        LogicalKeySet(LogicalKeyboardKey.browserBack): const _BackIntent(),
-        LogicalKeySet(LogicalKeyboardKey.browserForward): const _ForwardIntent(),
+        LogicalKeySet(LogicalKeyboardKey.browserForward):
+            const _ForwardIntent(),
      },
      child: Actions(
        actions: {
@@ -474,7 +503,10 @@ class _MyHomePageState extends State<MyHomePage> {
              canPop: false,
              onPopInvokedWithResult: (didPop, _) async {
                if (didPop) return;
-                await _handleBackNavigation(allowExit: true, recordForward: false);
+                await _handleBackNavigation(
+                  allowExit: true,
+                  recordForward: false,
+                );
              },
              child: scaffold,
            ),
@@ -494,7 +526,9 @@ class _MyHomePageState extends State<MyHomePage> {
  }

  Widget _buildRailToggleButton(bool railExtended) {
-    final collapseIcon = railExtended ? Icons.chevron_left : Icons.chevron_right;
+    final collapseIcon = railExtended
+        ? Icons.chevron_left
+        : Icons.chevron_right;
    final collapseLabel = railExtended ? 'Collapse' : 'Expand';

    if (railExtended) {
@@ -587,8 +621,9 @@ class _MyHomePageState extends State<MyHomePage> {
    final data = context.watch<DataService>();
    final notifications = data.notifications;
    final loading = data.isNotificationsLoading;
-    final listHeight =
-        isWide ? 380.0 : MediaQuery.of(context).size.height * 0.6;
+    final listHeight = isWide
+        ? 380.0
+        : MediaQuery.of(context).size.height * 0.6;

    Widget body;
    if (loading && notifications.isEmpty) {
@@ -628,9 +663,7 @@ class _MyHomePageState extends State<MyHomePage> {
                                item.title.isNotEmpty
                                    ? item.title
                                    : 'Notification',
-                                style: Theme.of(context)
-                                    .textTheme
-                                    .titleMedium
+                                style: Theme.of(context).textTheme.titleMedium
                                    ?.copyWith(fontWeight: FontWeight.w700),
                              ),
                              const SizedBox(height: 4),
@@ -642,18 +675,15 @@ class _MyHomePageState extends State<MyHomePage> {
                                const SizedBox(height: 6),
                                Text(
                                  _formatNotificationTime(item.createdAt!),
-                                  style: Theme.of(context)
-                                      .textTheme
-                                      .bodySmall
+                                  style: Theme.of(context).textTheme.bodySmall
                                      ?.copyWith(
                                        color: () {
-                                          final baseColor = Theme.of(context)
-                                              .textTheme
-                                              .bodySmall
-                                              ?.color;
+                                          final baseColor = Theme.of(
+                                            context,
+                                          ).textTheme.bodySmall?.color;
                                          if (baseColor == null) return null;
-                                          final newAlpha =
-                                              (baseColor.a * 0.7).clamp(0.0, 1.0);
+                                          final newAlpha = (baseColor.a * 0.7)
+                                              .clamp(0.0, 1.0);
                                          return baseColor.withValues(
                                            alpha: newAlpha,
                                          );
@@ -666,10 +696,8 @@ class _MyHomePageState extends State<MyHomePage> {
                        ),
                        const SizedBox(width: 8),
                        TextButton(
-                          onPressed: () => _dismissNotifications(
-                            context,
-                            [item.id],
-                          ),
+                          onPressed: () =>
+                              _dismissNotifications(context, [item.id]),
                          child: const Text('Dismiss'),
                        ),
                      ],
@@ -695,10 +723,9 @@ class _MyHomePageState extends State<MyHomePage> {
              children: [
                Text(
                  'Notifications',
-                  style: Theme.of(context)
-                      .textTheme
-                      .titleLarge
-                      ?.copyWith(fontWeight: FontWeight.bold),
+                  style: Theme.of(
+                    context,
+                  ).textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold),
                ),
                const Spacer(),
                TextButton(
@@ -729,9 +756,7 @@ class _MyHomePageState extends State<MyHomePage> {
    try {
      await context.read<DataService>().dismissNotifications(ids);
    } catch (e) {
-      messenger?.showSnackBar(
-        SnackBar(content: Text('Failed to dismiss: $e')),
-      );
+      messenger?.showSnackBar(SnackBar(content: Text('Failed to dismiss: $e')));
    }
  }

@@ -751,9 +776,7 @@ class _MyHomePageState extends State<MyHomePage> {
        color: Colors.redAccent,
        borderRadius: BorderRadius.circular(10),
      ),
-      constraints: const BoxConstraints(
-        minWidth: 20,
-      ),
+      constraints: const BoxConstraints(minWidth: 20),
      child: Text(
        label,
        style: const TextStyle(
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -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.4.3+1
+version: 0.5.1+1

 environment:
  sdk: ^3.8.1
@@ -103,6 +103,6 @@ flutter_launcher_icons:
  android: true
  ios: true
  image_path: assets/icons/app_icon.png
-  adaptive_icon_background: "#ffffff"
+  adaptive_icon_background: "#000000"
  adaptive_icon_foreground: assets/icons/app_icon.png
  min_sdk_android: 21
--- a/test/app_shell_test.dart
+++ b/test/app_shell_test.dart
@@ -8,13 +8,12 @@ void main() {
    expect(tabIndexForPath('/calculator/details'), 1);
    expect(tabIndexForPath('/legs'), 2);
    expect(tabIndexForPath('/traction/12/timeline'), 3);
-    expect(tabIndexForPath('/trips'), 4);
-    expect(tabIndexForPath('/add'), 5);
+    expect(tabIndexForPath('/trips'), 2);
+    expect(tabIndexForPath('/add'), 4);
  });

  test('tabIndexForPath ignores query when parsing uri', () {
-    expect(tabIndexForPath(Uri.parse('/trips?sort=desc').path), 4);
+    expect(tabIndexForPath(Uri.parse('/trips?sort=desc').path), 2);
    expect(tabIndexForPath(Uri.parse('/calculator/details?x=1').path), 1);
  });
 }
-
Author	SHA1	Message	Date
Pete Gregory	648872acf1	re add mileograph tags All checks were successful Release / meta (push) Successful in 10s Details Release / linux-build (push) Successful in 6m40s Details Release / android-build (push) Successful in 14m28s Details Release / release-master (push) Successful in 32s Details Release / release-dev (push) Successful in 36s Details	2026-01-01 18:06:50 +00:00
Pete Gregory	b427ed0bd3	fix failed flutter install Some checks failed Release / meta (push) Successful in 2s Details Release / android-build (push) Failing after 2m7s Details Release / linux-build (push) Failing after 2m6s Details Release / release-dev (push) Has been skipped Details Release / release-master (push) Has been skipped Details	2026-01-01 17:26:54 +00:00
Pete Gregory	66a1d149f0	remove mileograph tag Some checks failed Release / meta (push) Successful in 26s Details Release / android-build (push) Failing after 2m38s Details Release / linux-build (push) Failing after 2m58s Details Release / release-dev (push) Has been skipped Details Release / release-master (push) Has been skipped Details	2026-01-01 17:11:55 +00:00
Pete Gregory	cea483ae0b	Add ability to select distance unit Some checks failed Release / android-build (push) Blocked by required conditions Details Release / meta (push) Successful in 10s Details Release / linux-build (push) Successful in 6m39s Details Release / release-dev (push) Has been cancelled Details Release / release-master (push) Has been cancelled Details	2026-01-01 15:28:11 +00:00
Pete Gregory	7139cfcc99	add stats page All checks were successful Release / meta (push) Successful in 20s Details Release / linux-build (push) Successful in 7m21s Details Release / android-build (push) Successful in 16m39s Details Release / release-master (push) Successful in 23s Details Release / release-dev (push) Successful in 25s Details	2026-01-01 12:50:27 +00:00
Pete Gregory	1c15546b66	support new fields in adding All checks were successful Release / meta (push) Successful in 9s Details Release / linux-build (push) Successful in 6m54s Details Release / android-build (push) Successful in 23m30s Details Release / release-master (push) Successful in 30s Details Release / release-dev (push) Successful in 32s Details	2025-12-31 18:23:37 +00:00
Pete Gregory	e1ad1ea685	remove windows All checks were successful Release / meta (push) Successful in 8s Details Release / linux-build (push) Successful in 6m55s Details Release / android-build (push) Successful in 22m33s Details Release / release-dev (push) Successful in 26s Details Release / release-master (push) Successful in 25s Details	2025-12-30 12:18:37 +00:00
Pete Gregory	9b307ab56b	add windows build Some checks failed Release / meta (push) Successful in 18s Details Release / windows-build (push) Has been cancelled Details Release / release-dev (push) Has been cancelled Details Release / release-master (push) Has been cancelled Details Release / linux-build (push) Has been cancelled Details Release / android-build (push) Has been cancelled Details	2025-12-30 12:12:17 +00:00
Pete Gregory	8cf43c76e2	re add calculator page Some checks failed Release / meta (push) Successful in 11s Details Release / linux-build (push) Successful in 8m31s Details Release / release-dev (push) Has been cancelled Details Release / release-master (push) Has been cancelled Details Release / android-build (push) Has been cancelled Details	2025-12-30 11:55:46 +00:00