new settings panel for url pickup
All checks were successful
Release / meta (push) Successful in 12s
Release / linux-build (push) Successful in 7m42s
Release / android-build (push) Successful in 16m34s
Release / release-dev (push) Successful in 38s
Release / release-master (push) Successful in 37s

This commit is contained in:
2025-12-22 22:45:33 +00:00
parent dc5ed2567f
commit 950978b021
14 changed files with 322 additions and 43 deletions

View File

@@ -80,7 +80,8 @@ class _LatestLocoChangesPanelState extends State<LatestLocoChangesPanel> {
child: ListView.separated(
controller: _controller,
itemCount: changes.length,
separatorBuilder: (_, __) => const Divider(height: 1),
separatorBuilder: (context, index) =>
const Divider(height: 1),
itemBuilder: (context, index) {
final change = changes[index];
return ListTile(

View File

@@ -140,7 +140,7 @@ class LegCard extends StatelessWidget {
: textTheme.bodyMedium?.copyWith(color: theme.disabledColor);
final background = powering
? theme.colorScheme.surfaceContainerHighest
: theme.colorScheme.surfaceVariant;
: theme.colorScheme.surfaceContainerLow;
return Chip(
label: Text(
'${loco.locoClass} ${loco.number}',

View File

@@ -81,6 +81,12 @@ class _LoginScreenState extends State<LoginScreen> {
),
const SizedBox(height: 50),
const LoginPanel(),
const SizedBox(height: 16),
IconButton(
icon: const Icon(Icons.settings, color: Colors.grey),
tooltip: 'Settings',
onPressed: () => context.go('/settings'),
),
],
),
),

View File

@@ -348,14 +348,11 @@ class _DashboardState extends State<Dashboard> {
return Row(
mainAxisSize: MainAxisSize.min,
children: [
...buttons
.map(
(btn) => Padding(
padding: const EdgeInsets.only(left: 8.0),
child: btn,
),
)
.toList(),
for (final btn in buttons)
Padding(
padding: const EdgeInsets.only(left: 8.0),
child: btn,
),
],
);
}

View File

@@ -246,7 +246,8 @@ class _LegsPageState extends State<LegsPage> {
final dayLegs = <Leg>[];
void flushDay() {
if (currentDate == null) return;
final date = currentDate;
if (date == null) return;
widgets.add(
Padding(
padding: const EdgeInsets.symmetric(vertical: 8.0),
@@ -254,7 +255,7 @@ class _LegsPageState extends State<LegsPage> {
children: [
Expanded(
child: Text(
currentDate!,
date,
style: Theme.of(context).textTheme.labelMedium?.copyWith(
fontWeight: FontWeight.w700,
),

View File

@@ -445,7 +445,7 @@ class _ValueBlockMenu extends StatelessWidget {
Future<void> showContextMenuAt(Offset globalPosition) async {
final overlay = Overlay.of(context);
final renderBox = overlay?.context.findRenderObject() as RenderBox?;
final renderBox = overlay.context.findRenderObject() as RenderBox?;
if (renderBox == null) return;
// Translate from global screen coordinates into the overlay's local space
// so the menu appears where the gesture happened.

View File

@@ -0,0 +1,213 @@
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/endpoint_service.dart';
import 'package:mileograph_flutter/services/data_service.dart';
import 'package:provider/provider.dart';
class SettingsPage extends StatefulWidget {
const SettingsPage({super.key});
@override
State<SettingsPage> createState() => _SettingsPageState();
}
class _SettingsPageState extends State<SettingsPage> {
late final TextEditingController _endpointController;
bool _saving = false;
@override
void initState() {
super.initState();
final endpoint = context.read<EndpointService>().baseUrl;
_endpointController = TextEditingController(text: endpoint);
}
@override
void dispose() {
_endpointController.dispose();
super.dispose();
}
Future<String?> _probeVersion(String url) async {
try {
var uri = Uri.parse(url.trim());
if (uri.scheme.isEmpty) {
uri = Uri.parse('https://$url');
}
// Probe the provided API endpoint as-is.
final target = uri;
final res = await http.get(target).timeout(const Duration(seconds: 10));
debugPrint(
'Endpoint probe ${target.toString()} -> ${res.statusCode} ${res.body}',
);
if (res.statusCode < 200 || res.statusCode >= 300) return null;
final body = res.body.trim();
debugPrint('Endpoint probe body: $body');
// Try JSON first
String? version;
try {
final parsed = jsonDecode(body);
debugPrint('Endpoint probe parsed: $parsed');
if (parsed is Map && parsed['version'] is String) {
version = parsed['version'] as String;
} else if (parsed is String) {
final candidate = parsed.trim().replaceAll('"', '');
if (RegExp(r'^\d+\.\d+\.\d+$').hasMatch(candidate)) {
version = candidate;
}
}
} catch (_) {
// fall back to raw body parsing
}
version ??= body.split(RegExp(r'\s+')).firstWhere(
(part) => RegExp(r'^\d+\.\d+\.\d+$').hasMatch(part),
orElse: () => '',
);
if (version.isEmpty) return null;
final isValid = RegExp(r'^\d+\.\d+\.\d+$').hasMatch(version);
return isValid ? version : null;
} catch (_) {
return null;
}
}
Future<void> _save() async {
final endpointService = context.read<EndpointService>();
final dataService = context.read<DataService>();
final messenger = ScaffoldMessenger.of(context);
final value = _endpointController.text.trim();
if (value.isEmpty) {
messenger.showSnackBar(
const SnackBar(content: Text('Please enter an endpoint URL.')),
);
return;
}
setState(() => _saving = true);
try {
final version = await _probeVersion(value);
if (version == null) {
if (mounted) {
messenger.showSnackBar(
const SnackBar(
content: Text('Endpoint test failed: no valid version returned.'),
),
);
}
return;
}
await endpointService.setBaseUrl(value);
if (mounted) {
messenger.showSnackBar(
SnackBar(content: Text('Endpoint set to "$value" ($version)')),
);
await Future.wait([
dataService.fetchHomepageStats(),
dataService.fetchOnThisDay(),
dataService.fetchTrips(),
dataService.fetchHadTraction(),
dataService.fetchLatestLocoChanges(),
dataService.fetchLegs(),
]);
}
} catch (e) {
if (mounted) {
messenger.showSnackBar(
SnackBar(content: Text('Failed to save endpoint: $e')),
);
}
} finally {
if (mounted) {
setState(() => _saving = false);
}
}
}
@override
Widget build(BuildContext context) {
final endpointService = context.watch<EndpointService>();
if (!endpointService.isLoaded) {
return const Scaffold(
body: Center(child: CircularProgressIndicator()),
);
}
return Scaffold(
appBar: AppBar(
title: const Text('Settings'),
leading: IconButton(
icon: const Icon(Icons.arrow_back),
onPressed: () {
final navigator = Navigator.of(context);
if (navigator.canPop()) {
navigator.pop();
} else {
context.go('/');
}
},
),
),
body: Padding(
padding: const EdgeInsets.all(16.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'API endpoint',
style: Theme.of(context).textTheme.titleMedium?.copyWith(
fontWeight: FontWeight.w700,
),
),
const SizedBox(height: 8),
Text(
'Set the base URL for the Mileograph API. Leave blank to use the default.',
style: Theme.of(context).textTheme.bodySmall,
),
const SizedBox(height: 16),
TextField(
controller: _endpointController,
decoration: const InputDecoration(
labelText: 'Endpoint URL',
hintText: 'https://mileograph.co.uk/api/v1',
border: OutlineInputBorder(),
),
),
const SizedBox(height: 16),
Row(
children: [
FilledButton.icon(
onPressed: _saving ? null : _save,
icon: _saving
? const SizedBox(
width: 18,
height: 18,
child: CircularProgressIndicator(strokeWidth: 2),
)
: const Icon(Icons.save),
label: const Text('Save endpoint'),
),
const SizedBox(width: 12),
TextButton(
onPressed: _saving
? null
: () {
_endpointController.text =
EndpointService.defaultBaseUrl;
},
child: const Text('Reset to default'),
),
],
),
const SizedBox(height: 12),
Text(
'Current: ${endpointService.baseUrl}',
style: Theme.of(context).textTheme.labelSmall,
),
],
),
),
);
}
}

View File

@@ -288,6 +288,11 @@ class _TripsPageState extends State<TripsPage> {
Future<void> handleDelete() async {
if (deleting || trip.legs.isNotEmpty) return;
final data = context.read<DataService>();
final api = data.api;
final messenger = ScaffoldMessenger.maybeOf(sheetCtx);
final navigator = Navigator.of(sheetCtx);
final ok = await showDialog<bool>(
context: sheetCtx,
builder: (ctx) {
@@ -309,11 +314,8 @@ class _TripsPageState extends State<TripsPage> {
);
},
);
if (ok != true) return;
if (ok != true || !mounted) return;
final data = context.read<DataService>();
final api = data.api;
final messenger = ScaffoldMessenger.maybeOf(context);
setSheetState(() => deleting = true);
try {
await api.delete('/trips/delete/${trip.id}');
@@ -321,18 +323,16 @@ class _TripsPageState extends State<TripsPage> {
data.fetchTripDetails(),
data.fetchTrips(),
]);
if (context.mounted) {
messenger?.showSnackBar(
SnackBar(content: Text('Deleted "${trip.name}"')),
);
Navigator.of(sheetCtx).pop();
}
if (!mounted) return;
messenger?.showSnackBar(
SnackBar(content: Text('Deleted "${trip.name}"')),
);
navigator.pop();
} catch (e) {
if (context.mounted) {
messenger?.showSnackBar(
SnackBar(content: Text('Failed to delete trip: $e')),
);
}
if (!mounted) return;
messenger?.showSnackBar(
SnackBar(content: Text('Failed to delete trip: $e')),
);
} finally {
if (mounted) setSheetState(() => deleting = false);
}