add android bundle release

.gitea/workflows/release.yml

@@ -12,6 +12,7 @@ env:
   FLUTTER_VERSION: "3.38.5"
   BUILD_WINDOWS: "false" # Windows build disabled (no runner available)
   GITEA_BASE_URL: https://git.tgj.services
+  WEB_IMAGE: "git.tgj.services/petegregoryy/mileograph-web"
 
 jobs:
   meta:
@@ -154,6 +155,18 @@ jobs:
       - name: Build Android App Bundle (release)
         run: flutter build appbundle --release
 
+      - name: Archive Android App Bundle
+        env:
+          BASE_VERSION: ${{ needs.meta.outputs.base_version }}
+        run: |
+          set -euo pipefail
+          BUNDLE_SRC="build/app/outputs/bundle/release/app-release.aab"
+          if [ ! -f "$BUNDLE_SRC" ]; then
+            echo "Bundle not found at $BUNDLE_SRC"
+            exit 1
+          fi
+          cp "$BUNDLE_SRC" "mileograph-${BASE_VERSION}.aab"
+
       - name: Download bundletool
         run: |
           BUNDLETOOL_VERSION=1.15.6
@@ -200,6 +213,12 @@ jobs:
           name: android-apk
           path: mileograph-${{ needs.meta.outputs.base_version }}.apk
 
+      - name: Upload Android AAB artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: android-aab
+          path: mileograph-${{ needs.meta.outputs.base_version }}.aab
+
   linux-build:
     runs-on:
       - mileograph
@@ -255,6 +274,108 @@ jobs:
           name: linux-bundle
           path: app-linux-x64.tar.gz
 
+  web-build:
+    runs-on:
+      - mileograph
+    needs: meta
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install OS deps (Web)
+        run: |
+          if command -v sudo >/dev/null 2>&1; then
+            SUDO="sudo"
+          else
+            SUDO=""
+          fi
+          $SUDO apt-get update
+          $SUDO apt-get install -y unzip xz-utils zip libstdc++6 liblzma-dev curl jq docker.io
+          if ! docker info >/dev/null 2>&1; then
+            $SUDO systemctl start docker 2>/dev/null || $SUDO service docker start 2>/dev/null || true
+          fi
+
+      - name: Install Flutter SDK
+        run: |
+          set -euo pipefail
+          FLUTTER_HOME="$HOME/flutter"
+          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"
+            tar -C "$HOME" -xf /tmp/flutter.tar.xz
+          fi
+          echo "$FLUTTER_HOME/bin" >> "$GITHUB_PATH"
+          "$FLUTTER_HOME/bin/flutter" --version
+
+      - name: Allow all git directories (CI)
+        run: git config --global --add safe.directory '*'
+
+      - name: Set pub cache path
+        run: echo "PUB_CACHE=${GITHUB_WORKSPACE}/.pub-cache" >> "$GITHUB_ENV"
+
+      - name: Flutter dependencies
+        run: flutter pub get
+
+      - name: Enable Flutter web
+        run: flutter config --enable-web
+
+      - name: Build Flutter web (release)
+        run: |
+          flutter build web --release --base-href=/
+          tar -C build/web -czf app-web.tar.gz .
+
+      - name: Upload Web artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: web-build
+          path: app-web.tar.gz
+
+      - name: Compute web image tags
+        id: web_meta
+        env:
+          BASE_VERSION: ${{ needs.meta.outputs.base_version }}
+          DEV_SUFFIX: ${{ needs.meta.outputs.dev_suffix }}
+        run: |
+          IMAGE="${WEB_IMAGE}"
+          TAG=""
+          ALIAS=""
+          if [ "${GITHUB_REF}" = "refs/heads/dev" ]; then
+            TAG="${BASE_VERSION}${DEV_SUFFIX}"
+            ALIAS="dev"
+          elif [ "${GITHUB_REF}" = "refs/heads/master" ]; then
+            TAG="${BASE_VERSION}"
+            ALIAS="latest"
+          fi
+
+          echo "image=${IMAGE}" >> "$GITHUB_OUTPUT"
+          echo "tag=${TAG}" >> "$GITHUB_OUTPUT"
+          echo "alias=${ALIAS}" >> "$GITHUB_OUTPUT"
+
+      - name: Login to registry
+        if: ${{ secrets.DOCKERHUB_TOKEN != '' && steps.web_meta.outputs.tag != '' }}
+        env:
+          REGISTRY_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+        run: |
+          echo "$REGISTRY_TOKEN" | docker login git.tgj.services -u petegregoryy --password-stdin
+
+      - name: Build and push web image
+        if: ${{ secrets.DOCKERHUB_TOKEN != '' && steps.web_meta.outputs.tag != '' }}
+        env:
+          IMAGE: ${{ steps.web_meta.outputs.image }}
+          TAG: ${{ steps.web_meta.outputs.tag }}
+          ALIAS: ${{ steps.web_meta.outputs.alias }}
+        run: |
+          docker buildx create --name buildx --driver=docker-container --use || docker buildx use buildx
+          TAG_ARGS=(-t "${IMAGE}:${TAG}")
+          if [ -n "$ALIAS" ]; then
+            TAG_ARGS+=(-t "${IMAGE}:${ALIAS}")
+          fi
+          docker buildx build --builder buildx --platform linux/amd64 \
+            -f Dockerfile.web \
+            --push \
+            "${TAG_ARGS[@]}" .
+
   release-dev:
     runs-on:
       - mileograph
@@ -262,6 +383,7 @@ jobs:
       - meta
       - android-build
       - linux-build
+      - web-build
     steps:
       - name: Install jq
         run: |
@@ -279,6 +401,13 @@ jobs:
           name: android-apk
           path: artifacts
 
+      - name: Download Android AAB
+        if: ${{ github.ref == 'refs/heads/dev' }}
+        uses: actions/download-artifact@v3
+        with:
+          name: android-aab
+          path: artifacts
+
       - name: Prepare APK and tag
         if: ${{ github.ref == 'refs/heads/dev' }}
         id: bundle
@@ -293,11 +422,14 @@ jobs:
 
           VERSION="${BASE}${DEV_SUFFIX}"
           APK_NAME="mileograph-${VERSION}.apk"
+          AAB_NAME="mileograph-${VERSION}.aab"
 
           mv "artifacts/mileograph-${BASE}.apk" "artifacts/${APK_NAME}"
+          mv "artifacts/mileograph-${BASE}.aab" "artifacts/${AAB_NAME}"
 
           echo "tag=${TAG}" >> "$GITHUB_OUTPUT"
           echo "apk=artifacts/${APK_NAME}" >> "$GITHUB_OUTPUT"
+          echo "aab=artifacts/${AAB_NAME}" >> "$GITHUB_OUTPUT"
 
       - name: Create prerelease on Gitea
         if: ${{ github.ref == 'refs/heads/dev' }}
@@ -338,6 +470,18 @@ jobs:
             "${GITEA_BASE_URL}/api/v1/repos/${{ github.repository }}/releases/${RELEASE_ID}/assets" \
             >/dev/null
 
+          # Attach AAB
+          AAB="${{ steps.bundle.outputs.aab }}"
+          NAME_AAB=$(basename "$AAB")
+          echo "Uploading $NAME_AAB"
+
+          curl -sS -X POST \
+            -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
+            -F "attachment=@${AAB}" \
+            -F "name=${NAME_AAB}" \
+            "${GITEA_BASE_URL}/api/v1/repos/${{ github.repository }}/releases/${RELEASE_ID}/assets" \
+            >/dev/null
+
   release-master:
     runs-on:
       - mileograph
@@ -345,6 +489,7 @@ jobs:
       - meta
       - android-build
       - linux-build
+      - web-build
     steps:
       - name: Install jq
         run: |
@@ -362,6 +507,13 @@ jobs:
           name: android-apk
           path: artifacts
 
+      - name: Download Android AAB
+        if: ${{ github.ref == 'refs/heads/master' }}
+        uses: actions/download-artifact@v3
+        with:
+          name: android-aab
+          path: artifacts
+
       - name: Prepare APK and tag
         if: ${{ github.ref == 'refs/heads/master' }}
         id: bundle
@@ -371,6 +523,7 @@ jobs:
 
           echo "tag=${TAG}" >> "$GITHUB_OUTPUT"
           echo "apk=artifacts/mileograph-${BASE}.apk" >> "$GITHUB_OUTPUT"
+          echo "aab=artifacts/mileograph-${BASE}.aab" >> "$GITHUB_OUTPUT"
 
       - name: Create release on Gitea
         if: ${{ github.ref == 'refs/heads/master' }}
@@ -409,3 +562,15 @@ jobs:
             -F "name=${NAME}" \
             "${GITEA_BASE_URL}/api/v1/repos/${{ github.repository }}/releases/${RELEASE_ID}/assets" \
             >/dev/null
+
+          # Attach AAB
+          AAB="${{ steps.bundle.outputs.aab }}"
+          NAME_AAB=$(basename "$AAB")
+          echo "Uploading $NAME_AAB"
+
+          curl -sS -X POST \
+            -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
+            -F "attachment=@${AAB}" \
+            -F "name=${NAME_AAB}" \
+            "${GITEA_BASE_URL}/api/v1/repos/${{ github.repository }}/releases/${RELEASE_ID}/assets" \
+            >/dev/null

Dockerfile.web

@@ -0,0 +1,10 @@
+FROM nginx:1.27-alpine
+
+# Use a minimal Nginx image to serve the built Flutter web app.
+# Assumes `flutter build web` has already populated build/web/ in the build context.
+COPY deploy/web/nginx.conf /etc/nginx/conf.d/default.conf
+COPY build/web /usr/share/nginx/html
+
+EXPOSE 80
+
+CMD ["nginx", "-g", "daemon off;"]

README.md

@@ -1,16 +1,67 @@
-# mileograph_flutter
+# Mileograph (Flutter)
 
-A new Flutter project.
+Mileograph is a Flutter client for logging and analysing railway journeys. It lets you record legs, group them into trips, track locomotive mileage, and view stats and leaderboards.
 
-## Getting Started
+## Features
+- Add and edit journey legs with traction, timings, routes, notes, and delays.
+- Group legs into trips and see mileage totals and traction stats.
+- Browse traction, view loco details, mileage leaderboards, timelines, and legs.
+- Dashboard with homepage stats, “On This Day”, recent traction changes, and trips.
+- Profile badges, class clearance progress, and traction progress.
+- Offline-friendly UI built with Provider, GoRouter, and Material 3 styling.
 
-This project is a starting point for a Flutter application.
+## Project layout
+- `lib/objects/objects.dart` — shared model classes and helpers.
+- `lib/services/` — API, data loading, auth, endpoints, distance units.
+- `lib/components/` — UI pages and widgets (entries, traction, dashboard, trips, settings, etc.).
+- `assets/` — icons/fonts and other bundled assets.
 
-A few resources to get you started if this is your first Flutter project:
+## Prerequisites
+- Flutter SDK (3.x or later recommended).
+- Dart SDK (bundled with Flutter).
+- A Mileograph API endpoint (set in Settings within the app).
 
-- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab)
-- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook)
+## Setup
+1) Install Flutter: follow https://docs.flutter.dev/get-started/install and ensure `flutter doctor` is green.  
+2) Get dependencies:  
+   ```bash
+   flutter pub get
+   ```
+3) Configure an API endpoint:
+   - Run the app, open Settings, and set the base URL for your Mileograph backend.
+   - The app probes the endpoint for a version string before saving.
 
-For help getting started with Flutter development, view the
-[online documentation](https://docs.flutter.dev/), which offers tutorials,
-samples, guidance on mobile development, and a full API reference.
+## Running
+- Debug (mobile/web depending on your toolchain):  
+  ```bash
+  flutter run
+  ```
+- Release build (example for Android):  
+  ```bash
+  flutter build apk --release
+  ```
+
+## Testing and linting
+- Static analysis: `flutter analyze`
+- Unit/widget tests (if present): `flutter test`
+
+## Contributing
+1) Fork or branch from `main`.  
+2) Make changes with clear, small commits.  
+3) Add tests where feasible and keep `flutter analyze` clean.  
+4) Submit a PR describing:
+   - What changed and why.
+   - How to test or reproduce.
+   - Any API or migration notes.
+
+### Coding conventions
+- Prefer stateless widgets where possible; keep state localized.
+- Use existing services in `lib/services` for API access; add new endpoints there.
+- Keep models in `objects.dart` (or nearby files) and use helper parsers for defensive JSON handling.
+- Follow Material theming already in use; keep strings user-facing and concise.
+
+### Issue reporting
+Include device/OS, Flutter version (`flutter --version`), steps to reproduce, expected vs. actual behaviour, and logs if available.
+
+## License
+Copyright © Mileograph contributors. See repository terms if provided.

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

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

deploy/web/nginx.conf

@@ -0,0 +1,28 @@
+server {
+  listen 80;
+  server_name _;
+  root /usr/share/nginx/html;
+  include /etc/nginx/mime.types;
+
+  # Serve hashed assets aggressively; keep index/service worker cacheable but not immutable.
+  location /assets/ {
+    try_files $uri =404;
+    expires 30d;
+    add_header Cache-Control "public, max-age=2592000, immutable";
+  }
+
+  location /icons/ {
+    try_files $uri =404;
+    expires 30d;
+    add_header Cache-Control "public, max-age=2592000";
+  }
+
+  location = /flutter_service_worker.js {
+    add_header Cache-Control "no-cache";
+    try_files $uri =404;
+  }
+
+  location / {
+    try_files $uri $uri/ /index.html;
+  }
+}

lib/components/legs/leg_card.dart

@@ -111,12 +111,6 @@ class _LegCardState extends State<LegCard> {
         subtitle: LayoutBuilder(
           builder: (context, constraints) {
             final isWide = constraints.maxWidth > 520;
-            final timeWidget = _timeWithDelay(
-              context,
-              leg.beginTime,
-              leg.beginDelayMinutes,
-              includeDate: widget.showDate,
-            );
             final tractionWrap = !_expanded && leg.locos.isNotEmpty
                 ? Wrap(
                     spacing: 8,

lib/components/pages/dashboard.dart

@@ -513,9 +513,9 @@ class _DashboardState extends State<Dashboard> {
   Widget _buildTripsCard(
       BuildContext context, DataService data, DistanceUnitService distanceUnits) {
     final tripsUnsorted = data.trips;
-    List trips = [];
+    List<TripSummary> trips = [];
     if (tripsUnsorted.isNotEmpty) {
-      trips = [...tripsUnsorted]..sort((a, b) => b.tripId.compareTo(a.tripId));
+      trips = [...tripsUnsorted]..sort(TripSummary.compareByDateDesc);
     }
     return _panel(
       context,

lib/components/pages/more.dart

@@ -42,6 +42,8 @@ class MorePage extends StatelessWidget {
 }
 
 class _MoreHome extends StatelessWidget {
+  const _MoreHome({super.key});
+
   @override
   Widget build(BuildContext context) {
     return ListView(

lib/components/pages/new_entry/new_entry_page.dart

@@ -128,10 +128,6 @@ class _NewEntryPageState extends State<NewEntryPage> {
     }
   }
 
-  double _manualMilesFromInput(DistanceUnitService units) {
-    return units.milesFromInput(_mileageController.text) ?? 0;
-  }
-
   double _milesFromInputWithUnit(DistanceUnit unit) {
     return DistanceFormatter(unit)
             .parseInputMiles(_mileageController.text.trim()) ??
@@ -155,7 +151,7 @@ class _NewEntryPageState extends State<NewEntryPage> {
 
   Widget _buildTripSelector(BuildContext context) {
     final trips = context.watch<DataService>().tripList;
-    final sorted = [...trips]..sort((a, b) => b.tripId.compareTo(a.tripId));
+    final sorted = [...trips]..sort(TripSummary.compareByDateDesc);
     final tripIds = sorted.map((t) => t.tripId).toSet();
     final selectedValue =
         (_selectedTripId != null && tripIds.contains(_selectedTripId))
@@ -276,6 +272,7 @@ class _NewEntryPageState extends State<NewEntryPage> {
         ),
       ),
     );
+    if (!mounted) return;
     if (result != null) {
       final units = _distanceUnits(context);
       setState(() {
@@ -1536,43 +1533,6 @@ class _NewEntryPageState extends State<NewEntryPage> {
     );
   }
 
-  Widget _timeToggleBlock({
-    required String label,
-    required bool value,
-    required ValueChanged<bool?>? onChanged,
-    required String matchLabel,
-    required bool matchValue,
-    required ValueChanged<bool?>? onMatchChanged,
-    required bool showMatch,
-    Widget? picker,
-  }) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        CheckboxListTile(
-          value: value,
-          onChanged: onChanged,
-          dense: true,
-          contentPadding: EdgeInsets.zero,
-          controlAffinity: ListTileControlAffinity.leading,
-          title: Text(label),
-        ),
-        if (showMatch)
-          CheckboxListTile(
-            value: matchValue,
-            onChanged: onMatchChanged,
-            dense: true,
-            contentPadding: const EdgeInsets.only(left: 12),
-            controlAffinity: ListTileControlAffinity.leading,
-            title: Text(matchLabel),
-          ),
-        if (picker != null) ...[
-          const SizedBox(height: 6),
-          picker,
-        ],
-      ],
-    );
-  }
 }
 
 class _UpperCaseTextFormatter extends TextInputFormatter {

lib/components/pages/new_entry/new_entry_submit_logic.dart

@@ -52,6 +52,7 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
     if (form == null) return;
     if (!form.validate()) return;
     if (!await _validateRequiredFields()) return;
+    if (!mounted) return;
     final routeStations = _routeResult?.calculatedRoute ?? [];
     final startVal = _useManualMileage
         ? _startController.text.trim()

lib/components/pages/new_traction.dart

@@ -84,6 +84,13 @@ class _NewTractionPageState extends State<NewTractionPage> {
       'traction_motors': TextEditingController(),
       'build_date': TextEditingController(),
     };
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!mounted) return;
+      final data = context.read<DataService>();
+      if (data.locoClasses.isEmpty) {
+        data.fetchClassList();
+      }
+    });
   }
 
   @override
@@ -254,6 +261,10 @@ class _NewTractionPageState extends State<NewTractionPage> {
   @override
   Widget build(BuildContext context) {
     final isActive = _statusIsActive;
+    final data = context.watch<DataService>();
+    final classOptions = [...data.locoClasses]..sort(
+        (a, b) => a.toLowerCase().compareTo(b.toLowerCase()),
+      );
     final size = MediaQuery.of(context).size;
     final isNarrow = size.width < 720;
     final fieldWidth = isNarrow ? double.infinity : 340.0;
@@ -269,6 +280,89 @@ class _NewTractionPageState extends State<NewTractionPage> {
       double? widthOverride,
       String? Function(String?)? validator,
     }) {
+      // Special autocomplete for class field using existing loco classes.
+      if (key == 'class' && classOptions.isNotEmpty) {
+        return SizedBox(
+          width: widthOverride ?? fieldWidth,
+          child: Autocomplete<String>(
+            optionsBuilder: (TextEditingValue value) {
+              final query = value.text.trim().toLowerCase();
+              if (query.isEmpty) return classOptions;
+              return classOptions.where(
+                (c) => c.toLowerCase().contains(query),
+              );
+            },
+            onSelected: (selection) {
+              _controllers[key]?.text = selection;
+              _formKey.currentState?.validate();
+            },
+            fieldViewBuilder:
+                (context, textEditingController, focusNode, onFieldSubmitted) {
+              if (textEditingController.text != _controllers[key]?.text) {
+                WidgetsBinding.instance.addPostFrameCallback((_) {
+                  if (!mounted) return;
+                  if (textEditingController.text != _controllers[key]?.text) {
+                    textEditingController.value =
+                        _controllers[key]?.value ?? textEditingController.value;
+                  }
+                });
+              }
+              return TextFormField(
+                controller: textEditingController,
+                focusNode: focusNode,
+                decoration: InputDecoration(
+                  labelText: required ? '$label *' : label,
+                  helperText: helper,
+                  suffixText: suffixText,
+                  border: const OutlineInputBorder(),
+                ),
+                keyboardType: keyboardType,
+                maxLines: maxLines,
+                validator: (val) {
+                  if (required && (val == null || val.trim().isEmpty)) {
+                    return 'Required';
+                  }
+                  return validator?.call(val);
+                },
+                onChanged: (_) {
+                  _controllers[key]?.text = textEditingController.text;
+                  _formKey.currentState?.validate();
+                },
+                onFieldSubmitted: (_) => onFieldSubmitted(),
+              );
+            },
+            optionsViewBuilder: (context, onSelected, options) {
+              final opts = options.toList();
+              if (opts.isEmpty) return const SizedBox.shrink();
+              return Align(
+                alignment: Alignment.topLeft,
+                child: Material(
+                  elevation: 4,
+                  child: ConstrainedBox(
+                    constraints: BoxConstraints(
+                      maxHeight: 280,
+                      maxWidth: widthOverride ?? fieldWidth,
+                    ),
+                    child: ListView.builder(
+                      padding: EdgeInsets.zero,
+                      itemCount: opts.length,
+                      itemBuilder: (context, index) {
+                        final option = opts[index];
+                        return ListTile(
+                          dense: true,
+                          title: Text(option),
+                          onTap: () => onSelected(option),
+                        );
+                      },
+                    ),
+                  ),
+                ),
+              );
+            },
+          ),
+        );
+      }
+
       return SizedBox(
         width: widthOverride ?? fieldWidth,
         child: TextFormField(

lib/components/pages/traction/traction_page.dart

@@ -37,6 +37,9 @@ class _TractionPageState extends State<TractionPage> {
   final Map<String, TextEditingController> _dynamicControllers = {};
   final Map<String, String?> _enumSelections = {};
   bool _restoredFromPrefs = false;
+  static const int _pageSize = 100;
+  int _lastTractionOffset = 0;
+  String? _lastQuerySignature;
 
   @override
   void initState() {
@@ -59,6 +62,9 @@ class _TractionPageState extends State<TractionPage> {
   Future<void> _initialLoad() async {
     final data = context.read<DataService>();
     await _restoreSearchState();
+    if (_lastTractionOffset == 0 && data.traction.length > _pageSize) {
+      _lastTractionOffset = data.traction.length - _pageSize;
+    }
     data.fetchClassList();
     data.fetchEventFields();
     await _refreshTraction();
@@ -103,7 +109,29 @@ class _TractionPageState extends State<TractionPage> {
         dynamicFieldsUsed;
   }
 
-  Future<void> _refreshTraction({bool append = false}) async {
+  String _tractionQuerySignature(
+    Map<String, dynamic> filters,
+    bool hadOnly,
+  ) {
+    final sortedKeys = filters.keys.toList()..sort();
+    final filterSignature = sortedKeys
+        .map((key) => '$key=${filters[key]}')
+        .join('|');
+    final classQuery = (_selectedClass ?? _classController.text).trim();
+    return [
+      'class=$classQuery',
+      'number=${_numberController.text.trim()}',
+      'name=${_nameController.text.trim()}',
+      'mileageFirst=$_mileageFirst',
+      'hadOnly=$hadOnly',
+      'filters=$filterSignature',
+    ].join(';');
+  }
+
+  Future<void> _refreshTraction({
+    bool append = false,
+    bool preservePosition = true,
+  }) async {
     final data = context.read<DataService>();
     final filters = <String, dynamic>{};
     final name = _nameController.text.trim();
@@ -118,15 +146,49 @@ class _TractionPageState extends State<TractionPage> {
       }
     });
     final hadOnly = !_hasFilters;
+    final signature = _tractionQuerySignature(filters, hadOnly);
+    final queryChanged =
+        _lastQuerySignature != null && signature != _lastQuerySignature;
+    _lastQuerySignature = signature;
+
+    if (queryChanged && !append) {
+      _lastTractionOffset = 0;
+    }
+
+    final shouldPreservePosition = preservePosition &&
+        !append &&
+        !queryChanged &&
+        _lastTractionOffset > 0;
+
+    int limit;
+    int offset;
+    if (append) {
+      offset = data.traction.length;
+      limit = _pageSize;
+      _lastTractionOffset = offset;
+    } else if (shouldPreservePosition) {
+      offset = 0;
+      limit = _pageSize + _lastTractionOffset;
+    } else {
+      offset = 0;
+      limit = _pageSize;
+    }
+
     await data.fetchTraction(
       hadOnly: hadOnly,
       locoClass: _selectedClass ?? _classController.text.trim(),
       locoNumber: _numberController.text.trim(),
-      offset: append ? data.traction.length : 0,
+      offset: offset,
+      limit: limit,
       append: append,
       filters: filters,
       mileageFirst: _mileageFirst,
     );
+
+    if (!append && !shouldPreservePosition) {
+      _lastTractionOffset = 0;
+    }
+
     await _persistSearchState();
   }
 

lib/components/pages/traction/traction_persistence.dart

@@ -39,6 +39,16 @@ extension _TractionPersistence on _TractionPageState {
           enumValues[entry.key.toString()] = entry.value?.toString();
         }
       }
+      final lastOffsetRaw = decoded['lastOffset'];
+      if (lastOffsetRaw is int) {
+        _lastTractionOffset = lastOffsetRaw;
+      } else if (lastOffsetRaw is num) {
+        _lastTractionOffset = lastOffsetRaw.toInt();
+      }
+      final lastSig = decoded['querySignature']?.toString();
+      if (lastSig != null && lastSig.isNotEmpty) {
+        _lastQuerySignature = lastSig;
+      }
 
       for (final entry in dynamicValues.entries) {
         _dynamicControllers.putIfAbsent(
@@ -76,6 +86,8 @@ extension _TractionPersistence on _TractionPageState {
       'showAdvancedFilters': _showAdvancedFilters,
       'dynamic': _dynamicControllers.map((k, v) => MapEntry(k, v.text)),
       'enum': _enumSelections,
+      'lastOffset': _lastTractionOffset,
+      'querySignature': _lastQuerySignature,
     };
 
     try {

lib/components/pages/trips.dart

@@ -232,7 +232,7 @@ class _TripsPageState extends State<TripsPage> {
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
                       Text(
-                        'Trip',
+                        'Trip #${trip.id}',
                         style: Theme.of(context).textTheme.labelMedium,
                       ),
                       const SizedBox(height: 4),

lib/components/traction/traction_card.dart

@@ -1,5 +1,7 @@
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:mileograph_flutter/objects/objects.dart';
+import 'package:mileograph_flutter/services/api_service.dart';
 import 'package:mileograph_flutter/services/distance_unit_service.dart';
 import 'package:provider/provider.dart';
 
@@ -210,6 +212,11 @@ Future<void> showTractionDetails(
 ) async {
   final hasMileageOrTrips = _hasMileageOrTrips(loco);
   final distanceUnits = context.read<DistanceUnitService>();
+  final api = context.read<ApiService>();
+  final leaderboardId = _leaderboardId(loco);
+  final leaderboardFuture = leaderboardId == null
+      ? Future.value(const <LeaderboardEntry>[])
+      : _fetchLocoLeaderboard(api, leaderboardId);
   await showModalBottomSheet(
     context: context,
     isScrollControlled: true,
@@ -295,6 +302,63 @@ Future<void> showTractionDetails(
                       _detailRow(context, 'EVN', loco.evn ?? ''),
                       if (loco.notes != null && loco.notes!.isNotEmpty)
                         _detailRow(context, 'Notes', loco.notes!),
+                      const SizedBox(height: 16),
+                      Text(
+                        'Leaderboard',
+                        style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                              fontWeight: FontWeight.w700,
+                            ),
+                      ),
+                      const SizedBox(height: 8),
+                      FutureBuilder<List<LeaderboardEntry>>(
+                        future: leaderboardFuture,
+                        builder: (context, snapshot) {
+                          if (snapshot.connectionState == ConnectionState.waiting) {
+                            return const Padding(
+                              padding: EdgeInsets.symmetric(vertical: 12.0),
+                              child: Center(
+                                child: SizedBox(
+                                  height: 24,
+                                  width: 24,
+                                  child: CircularProgressIndicator(strokeWidth: 2),
+                                ),
+                              ),
+                            );
+                          }
+                          if (snapshot.hasError) {
+                            return Padding(
+                              padding: const EdgeInsets.symmetric(vertical: 8.0),
+                              child: Text(
+                                'Failed to load leaderboard',
+                                style: Theme.of(context).textTheme.labelMedium?.copyWith(
+                                      color: Theme.of(context).colorScheme.error,
+                                    ),
+                              ),
+                            );
+                          }
+                          final entries = snapshot.data ?? const <LeaderboardEntry>[];
+                          if (entries.isEmpty) {
+                            return Padding(
+                              padding: const EdgeInsets.symmetric(vertical: 8.0),
+                              child: Text(
+                                'No mileage leaderboard yet.',
+                                style: Theme.of(context).textTheme.bodyMedium,
+                              ),
+                            );
+                          }
+                          return Column(
+                            children: entries.asMap().entries.map((entry) {
+                              final rank = entry.key + 1;
+                              return _leaderboardRow(
+                                context,
+                                rank,
+                                entry.value,
+                                distanceUnits,
+                              );
+                            }).toList(),
+                          );
+                        },
+                      ),
                     ],
                   ),
                 ),
@@ -307,6 +371,105 @@ Future<void> showTractionDetails(
   );
 }
 
+Future<List<LeaderboardEntry>> _fetchLocoLeaderboard(
+  ApiService api,
+  int locoId,
+) async {
+  try {
+    final json = await api.get('/loco/leaderboard/id/$locoId');
+    Iterable<dynamic>? raw;
+    if (json is List) {
+      raw = json;
+    } else if (json is Map) {
+      for (final key in ['data', 'leaderboard', 'results']) {
+        final value = json[key];
+        if (value is List) {
+          raw = value;
+          break;
+        }
+      }
+    }
+    if (raw == null) return const [];
+    return raw.whereType<Map>().map((e) {
+      return LeaderboardEntry.fromJson(
+        e.map((key, value) => MapEntry(key.toString(), value)),
+      );
+    }).toList();
+  } catch (e) {
+    debugPrint('Failed to fetch loco leaderboard for $locoId: $e');
+    rethrow;
+  }
+}
+
+int? _leaderboardId(LocoSummary loco) {
+  int? parse(dynamic value) {
+    if (value == null) return null;
+    if (value is int) return value == 0 ? null : value;
+    if (value is num) return value.toInt() == 0 ? null : value.toInt();
+    return int.tryParse(value.toString());
+  }
+
+  return parse(loco.extra['loco_id']) ??
+      parse(loco.extra['id']) ??
+      parse(loco.id);
+}
+
+Widget _leaderboardRow(
+  BuildContext context,
+  int rank,
+  LeaderboardEntry entry,
+  DistanceUnitService distanceUnits,
+) {
+  final theme = Theme.of(context);
+  final primaryName =
+      entry.userFullName.isNotEmpty ? entry.userFullName : entry.username;
+  final mileageLabel = distanceUnits.format(entry.mileage, decimals: 1);
+
+  return Padding(
+    padding: const EdgeInsets.symmetric(vertical: 6.0),
+    child: Row(
+      children: [
+        Container(
+          width: 36,
+          height: 36,
+          alignment: Alignment.center,
+          decoration: BoxDecoration(
+            color: theme.colorScheme.primaryContainer,
+            borderRadius: BorderRadius.circular(10),
+          ),
+          child: Text(
+            '#$rank',
+            style: theme.textTheme.labelMedium?.copyWith(
+              fontWeight: FontWeight.w700,
+              color: theme.colorScheme.onPrimaryContainer,
+            ),
+          ),
+        ),
+        const SizedBox(width: 10),
+        Expanded(
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(
+                primaryName,
+                style: theme.textTheme.bodyMedium?.copyWith(
+                  fontWeight: FontWeight.w700,
+                ),
+              ),
+            ],
+          ),
+        ),
+        Text(
+          mileageLabel,
+          style: theme.textTheme.bodyMedium?.copyWith(
+            fontWeight: FontWeight.w700,
+          ),
+        ),
+      ],
+    ),
+  );
+}
+
 Widget _detailRow(BuildContext context, String label, String value) {
   if (value.isEmpty) return const SizedBox.shrink();
   return Padding(

lib/objects/objects.dart

@@ -66,6 +66,29 @@ DateTime _asDateTime(dynamic value, [DateTime? fallback]) {
   return parsed ?? (fallback ?? DateTime.fromMillisecondsSinceEpoch(0));
 }
 
+DateTime? _asNullableDateTime(dynamic value) {
+  if (value == null) return null;
+  if (value is DateTime) return value;
+  return DateTime.tryParse(value.toString());
+}
+
+int compareTripsByDateDesc(
+  DateTime? aDate,
+  DateTime? bDate,
+  int aId,
+  int bId,
+) {
+  if (aDate != null && bDate != null) {
+    final cmp = bDate.compareTo(aDate);
+    if (cmp != 0) return cmp;
+  } else if (aDate != null) {
+    return -1;
+  } else if (bDate != null) {
+    return 1;
+  }
+  return bId.compareTo(aId);
+}
+
 class DestinationObject {
   const DestinationObject(
     this.label,
@@ -443,7 +466,7 @@ class LocoSummary extends Loco {
        );
 
   factory LocoSummary.fromJson(Map<String, dynamic> json) => LocoSummary(
-    locoId: json['loco_id'] ?? json['id'] ?? 0,
+    locoId: _asInt(json['loco_id'] ?? json['id']),
     locoType: json['type'] ?? json['loco_type'] ?? '',
     locoNumber: json['number'] ?? json['loco_number'] ?? '',
     locoName: json['name'] ?? json['loco_name'] ?? "",
@@ -722,9 +745,12 @@ class TripSummary {
   final double tripMileage;
   final int legCount;
   final List<TripLocoStat> locoStats;
+  final DateTime? startDate;
+  final DateTime? endDate;
 
   int get locoHadCount => locoStats.length;
   int get winnersCount => locoStats.where((e) => e.won).length;
+  DateTime? get primaryDate => endDate ?? startDate;
 
   TripSummary({
     required this.tripId,
@@ -732,20 +758,72 @@ class TripSummary {
     required this.tripMileage,
     this.legCount = 0,
     List<TripLocoStat>? locoStats,
+    this.startDate,
+    this.endDate,
   }) : 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'],
-    ),
-  );
+  static int compareByDateDesc(TripSummary a, TripSummary b) =>
+      compareTripsByDateDesc(a.primaryDate, b.primaryDate, a.tripId, b.tripId);
+
+  factory TripSummary.fromJson(Map<String, dynamic> json) {
+    DateTime? startDate;
+    DateTime? endDate;
+
+    DateTime? parseDate(dynamic value) => _asNullableDateTime(value);
+
+    for (final key in [
+      'trip_begin_time',
+      'trip_start',
+      'trip_start_time',
+      'trip_date',
+      'start_date',
+      'date',
+    ]) {
+      startDate ??= parseDate(json[key]);
+    }
+
+    for (final key in [
+      'trip_end_time',
+      'trip_finish_time',
+      'trip_end',
+      'end_date',
+    ]) {
+      endDate ??= parseDate(json[key]);
+    }
+
+    if (json['trip_legs'] is List) {
+      for (final leg in json['trip_legs'] as List) {
+        DateTime? begin;
+        if (leg is TripLeg) {
+          begin = leg.beginTime;
+        } else if (leg is Map) {
+          begin = parseDate(leg['leg_begin_time']);
+        }
+        if (begin == null) continue;
+        if (startDate == null || begin.isBefore(startDate)) {
+          startDate = begin;
+        }
+        if (endDate == null || begin.isAfter(endDate)) {
+          endDate = begin;
+        }
+      }
+    }
+
+    return 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'],
+      ),
+      startDate: startDate,
+      endDate: endDate,
+    );
+  }
 }
 
 class Leg {
@@ -941,6 +1019,34 @@ class TripDetail {
 
   int get locoHadCount => locoStats.length;
   int get winnersCount => locoStats.where((e) => e.won).length;
+  DateTime? get startDate {
+    DateTime? earliest;
+    for (final leg in legs) {
+      final begin = leg.beginTime;
+      if (begin == null) continue;
+      if (earliest == null || begin.isBefore(earliest)) {
+        earliest = begin;
+      }
+    }
+    return earliest;
+  }
+
+  DateTime? get endDate {
+    DateTime? latest;
+    for (final leg in legs) {
+      final begin = leg.beginTime;
+      if (begin == null) continue;
+      if (latest == null || begin.isAfter(latest)) {
+        latest = begin;
+      }
+    }
+    return latest;
+  }
+
+  DateTime? get primaryDate => endDate ?? startDate;
+
+  static int compareByDateDesc(TripDetail a, TripDetail b) =>
+      compareTripsByDateDesc(a.primaryDate, b.primaryDate, a.id, b.id);
 
   TripDetail({
     required this.id,

lib/services/data_service/data_service_core.dart

@@ -151,7 +151,8 @@ class DataService extends ChangeNotifier {
     try {
       final json = await api.get('/stats/homepage');
       _homepageStats = HomepageStats.fromJson(json);
-      _trips = _homepageStats?.trips ?? [];
+      _trips = [...(_homepageStats?.trips ?? const [])]
+        ..sort(TripSummary.compareByDateDesc);
     } catch (e) {
       debugPrint('Failed to fetch homepage stats: $e');
       _homepageStats = null;

lib/services/data_service/data_service_traction.dart

@@ -13,7 +13,7 @@ extension DataServiceTraction on DataService {
   Future<void> fetchTraction({
     bool hadOnly = false,
     int offset = 0,
-    int limit = 50,
+    int limit = 100,
     String? locoClass,
     String? locoNumber,
     bool mileageFirst = true,

lib/services/data_service/data_service_trips.dart

@@ -6,7 +6,7 @@ extension DataServiceTrips on DataService {
     try {
       final json = await api.get('/trips/info');
       final tripDetails = _parseTripInfoList(json);
-      _tripDetails = [...tripDetails]..sort((a, b) => b.id.compareTo(a.id));
+      _tripDetails = [...tripDetails]..sort(TripDetail.compareByDateDesc);
       _tripList = tripDetails
           .map(
             (detail) => TripSummary(
@@ -15,10 +15,12 @@ extension DataServiceTrips on DataService {
               tripMileage: detail.mileage,
               legCount: detail.legCount,
               locoStats: detail.locoStats,
+              startDate: detail.startDate,
+              endDate: detail.endDate,
             ),
           )
           .toList()
-        ..sort((a, b) => b.tripId.compareTo(a.tripId));
+        ..sort(TripSummary.compareByDateDesc);
     } catch (e) {
       debugPrint('Failed to fetch trip_map: $e');
       _tripDetails = [];
@@ -49,7 +51,7 @@ extension DataServiceTrips on DataService {
             .map((e) => TripSummary.fromJson(e))
             .toList();
 
-        _tripList = [...tripMap]..sort((a, b) => b.tripId.compareTo(a.tripId));
+        _tripList = [...tripMap]..sort(TripSummary.compareByDateDesc);
       } else {
         debugPrint('Unexpected trip list response: $json');
         _tripList = [];
@@ -83,7 +85,7 @@ extension DataServiceTrips on DataService {
             .map((e) => TripSummary.fromJson(e))
             .toList();
 
-        _tripList = [...tripMap]..sort((a, b) => b.tripId.compareTo(a.tripId));
+        _tripList = [...tripMap]..sort(TripSummary.compareByDateDesc);
       } else {
         debugPrint('Unexpected trip list response: $json');
         _tripList = [];
@@ -105,7 +107,7 @@ extension DataServiceTrips on DataService {
     } else {
       _tripList = [trip, ..._tripList];
     }
-    _tripList.sort((a, b) => b.tripId.compareTo(a.tripId));
+    _tripList.sort(TripSummary.compareByDateDesc);
     _notifyAsync();
   }
 

lib/services/distance_unit_service.dart

@@ -158,7 +158,7 @@ class DistanceFormatter {
     return NumberFormat(pattern);
   }
 
-  String _formatMilesChains(double miles, {int decimals = 1}) {
+  String _formatMilesChains(double miles) {
     final totalChains = miles * DistanceUnitService.chainsPerMile;
     var milesPart = totalChains ~/ DistanceUnitService.chainsPerMile;
     final chainRemainder =

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.5.1+1
+version: 0.5.4+1
 
 environment:
   sdk: ^3.8.1
@@ -102,6 +102,15 @@ flutter:
 flutter_launcher_icons:
   android: true
   ios: true
+  remove_alpha_ios: true
+  linux:
+    generate: true
+  web:
+    generate: true
+    background_colour: "#000000"
+    theme_color: "#0175C2"
+  windows:
+    generate: true
   image_path: assets/icons/app_icon.png
   adaptive_icon_background: "#000000"
   adaptive_icon_foreground: assets/icons/app_icon.png

web/index.html

@@ -18,18 +18,19 @@
 
   <meta charset="UTF-8">
   <meta content="IE=Edge" http-equiv="X-UA-Compatible">
-  <meta name="description" content="A new Flutter project.">
+  <meta name="description" content="Log and explore your Mileograph journeys.">
+  <meta name="theme-color" content="#0175C2">
 
   <!-- iOS meta tags & icons -->
   <meta name="mobile-web-app-capable" content="yes">
   <meta name="apple-mobile-web-app-status-bar-style" content="black">
-  <meta name="apple-mobile-web-app-title" content="mileograph_flutter">
+  <meta name="apple-mobile-web-app-title" content="Mileograph">
   <link rel="apple-touch-icon" href="icons/Icon-192.png">
 
   <!-- Favicon -->
   <link rel="icon" type="image/png" href="favicon.png"/>
 
-  <title>mileograph_flutter</title>
+  <title>Mileograph</title>
   <link rel="manifest" href="manifest.json">
 </head>
 <body>

web/manifest.json

@@ -1,35 +1,36 @@
 {
-  "name": "mileograph_flutter",
-  "short_name": "mileograph_flutter",
-  "start_url": ".",
-  "display": "standalone",
-  "background_color": "#0175C2",
-  "theme_color": "#0175C2",
-  "description": "A new Flutter project.",
-  "orientation": "portrait-primary",
-  "prefer_related_applications": false,
-  "icons": [
-    {
-      "src": "icons/Icon-192.png",
-      "sizes": "192x192",
-      "type": "image/png"
-    },
-    {
-      "src": "icons/Icon-512.png",
-      "sizes": "512x512",
-      "type": "image/png"
-    },
-    {
-      "src": "icons/Icon-maskable-192.png",
-      "sizes": "192x192",
-      "type": "image/png",
-      "purpose": "maskable"
-    },
-    {
-      "src": "icons/Icon-maskable-512.png",
-      "sizes": "512x512",
-      "type": "image/png",
-      "purpose": "maskable"
-    }
-  ]
-}
+    "name": "Mileograph",
+    "short_name": "Mileograph",
+    "start_url": "/",
+    "scope": "/",
+    "display": "standalone",
+    "background_color": "#0175C2",
+    "theme_color": "#0175C2",
+    "description": "Log and explore your Mileograph journeys.",
+    "orientation": "portrait-primary",
+    "prefer_related_applications": false,
+    "icons": [
+        {
+            "src": "icons/Icon-192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "icons/Icon-512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        },
+        {
+            "src": "icons/Icon-maskable-192.png",
+            "sizes": "192x192",
+            "type": "image/png",
+            "purpose": "maskable"
+        },
+        {
+            "src": "icons/Icon-maskable-512.png",
+            "sizes": "512x512",
+            "type": "image/png",
+            "purpose": "maskable"
+        }
+    ]
+}