Compare commits
2 Commits
v0.3.1-dev
...
v0.3.2-dev
| Author | SHA1 | Date | |
|---|---|---|---|
| 950978b021 | |||
| dc5ed2567f |
13
lib/app.dart
13
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/api_service.dart';
|
||||||
import 'package:mileograph_flutter/services/authservice.dart';
|
import 'package:mileograph_flutter/services/authservice.dart';
|
||||||
import 'package:mileograph_flutter/services/data_service.dart';
|
import 'package:mileograph_flutter/services/data_service.dart';
|
||||||
|
import 'package:mileograph_flutter/services/endpoint_service.dart';
|
||||||
import 'package:mileograph_flutter/ui/app_shell.dart';
|
import 'package:mileograph_flutter/ui/app_shell.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
|
|
||||||
@@ -12,8 +13,16 @@ class App extends StatelessWidget {
|
|||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return MultiProvider(
|
return MultiProvider(
|
||||||
providers: [
|
providers: [
|
||||||
Provider<ApiService>(
|
ChangeNotifierProvider<EndpointService>(
|
||||||
create: (_) => ApiService(baseUrl: 'http://localhost:8000/api/v1'),
|
create: (_) => EndpointService(),
|
||||||
|
),
|
||||||
|
ProxyProvider<EndpointService, ApiService>(
|
||||||
|
update: (_, endpoint, api) {
|
||||||
|
final service = api ?? ApiService(baseUrl: endpoint.baseUrl);
|
||||||
|
service.setBaseUrl(endpoint.baseUrl);
|
||||||
|
return service;
|
||||||
|
},
|
||||||
|
create: (_) => ApiService(baseUrl: EndpointService.defaultBaseUrl),
|
||||||
),
|
),
|
||||||
ChangeNotifierProvider<AuthService>(
|
ChangeNotifierProvider<AuthService>(
|
||||||
create: (context) => AuthService(api: context.read<ApiService>()),
|
create: (context) => AuthService(api: context.read<ApiService>()),
|
||||||
|
|||||||
@@ -80,7 +80,8 @@ class _LatestLocoChangesPanelState extends State<LatestLocoChangesPanel> {
|
|||||||
child: ListView.separated(
|
child: ListView.separated(
|
||||||
controller: _controller,
|
controller: _controller,
|
||||||
itemCount: changes.length,
|
itemCount: changes.length,
|
||||||
separatorBuilder: (_, __) => const Divider(height: 1),
|
separatorBuilder: (context, index) =>
|
||||||
|
const Divider(height: 1),
|
||||||
itemBuilder: (context, index) {
|
itemBuilder: (context, index) {
|
||||||
final change = changes[index];
|
final change = changes[index];
|
||||||
return ListTile(
|
return ListTile(
|
||||||
|
|||||||
@@ -140,7 +140,7 @@ class LegCard extends StatelessWidget {
|
|||||||
: textTheme.bodyMedium?.copyWith(color: theme.disabledColor);
|
: textTheme.bodyMedium?.copyWith(color: theme.disabledColor);
|
||||||
final background = powering
|
final background = powering
|
||||||
? theme.colorScheme.surfaceContainerHighest
|
? theme.colorScheme.surfaceContainerHighest
|
||||||
: theme.colorScheme.surfaceVariant;
|
: theme.colorScheme.surfaceContainerLow;
|
||||||
return Chip(
|
return Chip(
|
||||||
label: Text(
|
label: Text(
|
||||||
'${loco.locoClass} ${loco.number}',
|
'${loco.locoClass} ${loco.number}',
|
||||||
|
|||||||
@@ -81,6 +81,12 @@ class _LoginScreenState extends State<LoginScreen> {
|
|||||||
),
|
),
|
||||||
const SizedBox(height: 50),
|
const SizedBox(height: 50),
|
||||||
const LoginPanel(),
|
const LoginPanel(),
|
||||||
|
const SizedBox(height: 16),
|
||||||
|
IconButton(
|
||||||
|
icon: const Icon(Icons.settings, color: Colors.grey),
|
||||||
|
tooltip: 'Settings',
|
||||||
|
onPressed: () => context.go('/settings'),
|
||||||
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -348,14 +348,11 @@ class _DashboardState extends State<Dashboard> {
|
|||||||
return Row(
|
return Row(
|
||||||
mainAxisSize: MainAxisSize.min,
|
mainAxisSize: MainAxisSize.min,
|
||||||
children: [
|
children: [
|
||||||
...buttons
|
for (final btn in buttons)
|
||||||
.map(
|
Padding(
|
||||||
(btn) => Padding(
|
padding: const EdgeInsets.only(left: 8.0),
|
||||||
padding: const EdgeInsets.only(left: 8.0),
|
child: btn,
|
||||||
child: btn,
|
),
|
||||||
),
|
|
||||||
)
|
|
||||||
.toList(),
|
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -246,7 +246,8 @@ class _LegsPageState extends State<LegsPage> {
|
|||||||
final dayLegs = <Leg>[];
|
final dayLegs = <Leg>[];
|
||||||
|
|
||||||
void flushDay() {
|
void flushDay() {
|
||||||
if (currentDate == null) return;
|
final date = currentDate;
|
||||||
|
if (date == null) return;
|
||||||
widgets.add(
|
widgets.add(
|
||||||
Padding(
|
Padding(
|
||||||
padding: const EdgeInsets.symmetric(vertical: 8.0),
|
padding: const EdgeInsets.symmetric(vertical: 8.0),
|
||||||
@@ -254,7 +255,7 @@ class _LegsPageState extends State<LegsPage> {
|
|||||||
children: [
|
children: [
|
||||||
Expanded(
|
Expanded(
|
||||||
child: Text(
|
child: Text(
|
||||||
currentDate!,
|
date,
|
||||||
style: Theme.of(context).textTheme.labelMedium?.copyWith(
|
style: Theme.of(context).textTheme.labelMedium?.copyWith(
|
||||||
fontWeight: FontWeight.w700,
|
fontWeight: FontWeight.w700,
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -445,7 +445,7 @@ class _ValueBlockMenu extends StatelessWidget {
|
|||||||
|
|
||||||
Future<void> showContextMenuAt(Offset globalPosition) async {
|
Future<void> showContextMenuAt(Offset globalPosition) async {
|
||||||
final overlay = Overlay.of(context);
|
final overlay = Overlay.of(context);
|
||||||
final renderBox = overlay?.context.findRenderObject() as RenderBox?;
|
final renderBox = overlay.context.findRenderObject() as RenderBox?;
|
||||||
if (renderBox == null) return;
|
if (renderBox == null) return;
|
||||||
// Translate from global screen coordinates into the overlay's local space
|
// Translate from global screen coordinates into the overlay's local space
|
||||||
// so the menu appears where the gesture happened.
|
// so the menu appears where the gesture happened.
|
||||||
|
|||||||
213
lib/components/pages/settings.dart
Normal file
213
lib/components/pages/settings.dart
Normal 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,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -288,6 +288,11 @@ class _TripsPageState extends State<TripsPage> {
|
|||||||
|
|
||||||
Future<void> handleDelete() async {
|
Future<void> handleDelete() async {
|
||||||
if (deleting || trip.legs.isNotEmpty) return;
|
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>(
|
final ok = await showDialog<bool>(
|
||||||
context: sheetCtx,
|
context: sheetCtx,
|
||||||
builder: (ctx) {
|
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);
|
setSheetState(() => deleting = true);
|
||||||
try {
|
try {
|
||||||
await api.delete('/trips/delete/${trip.id}');
|
await api.delete('/trips/delete/${trip.id}');
|
||||||
@@ -321,18 +323,16 @@ class _TripsPageState extends State<TripsPage> {
|
|||||||
data.fetchTripDetails(),
|
data.fetchTripDetails(),
|
||||||
data.fetchTrips(),
|
data.fetchTrips(),
|
||||||
]);
|
]);
|
||||||
if (context.mounted) {
|
if (!mounted) return;
|
||||||
messenger?.showSnackBar(
|
messenger?.showSnackBar(
|
||||||
SnackBar(content: Text('Deleted "${trip.name}"')),
|
SnackBar(content: Text('Deleted "${trip.name}"')),
|
||||||
);
|
);
|
||||||
Navigator.of(sheetCtx).pop();
|
navigator.pop();
|
||||||
}
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
if (context.mounted) {
|
if (!mounted) return;
|
||||||
messenger?.showSnackBar(
|
messenger?.showSnackBar(
|
||||||
SnackBar(content: Text('Failed to delete trip: $e')),
|
SnackBar(content: Text('Failed to delete trip: $e')),
|
||||||
);
|
);
|
||||||
}
|
|
||||||
} finally {
|
} finally {
|
||||||
if (mounted) setSheetState(() => deleting = false);
|
if (mounted) setSheetState(() => deleting = false);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -197,7 +197,7 @@ class LocoSummary extends Loco {
|
|||||||
this.livery,
|
this.livery,
|
||||||
this.location,
|
this.location,
|
||||||
Map<String, dynamic>? extra,
|
Map<String, dynamic>? extra,
|
||||||
bool powering = true,
|
super.powering = true,
|
||||||
}) : extra = extra ?? const {},
|
}) : extra = extra ?? const {},
|
||||||
super(
|
super(
|
||||||
id: locoId,
|
id: locoId,
|
||||||
@@ -207,7 +207,6 @@ class LocoSummary extends Loco {
|
|||||||
operator: locoOperator,
|
operator: locoOperator,
|
||||||
notes: locoNotes,
|
notes: locoNotes,
|
||||||
evn: locoEvn,
|
evn: locoEvn,
|
||||||
powering: powering,
|
|
||||||
);
|
);
|
||||||
|
|
||||||
factory LocoSummary.fromJson(Map<String, dynamic> json) => LocoSummary(
|
factory LocoSummary.fromJson(Map<String, dynamic> json) => LocoSummary(
|
||||||
@@ -400,7 +399,7 @@ class LocoChange {
|
|||||||
});
|
});
|
||||||
|
|
||||||
factory LocoChange.fromJson(Map<String, dynamic> json) {
|
factory LocoChange.fromJson(Map<String, dynamic> json) {
|
||||||
String _clean(dynamic value) {
|
String cleanValue(dynamic value) {
|
||||||
final str = value?.toString().trim() ?? '';
|
final str = value?.toString().trim() ?? '';
|
||||||
if (str.isEmpty || str == '-' || str == '?') return '';
|
if (str.isEmpty || str == '-' || str == '?') return '';
|
||||||
return str;
|
return str;
|
||||||
@@ -417,15 +416,15 @@ class LocoChange {
|
|||||||
final validFromRaw = json['valid_from'] ?? json['validFrom'];
|
final validFromRaw = json['valid_from'] ?? json['validFrom'];
|
||||||
return LocoChange(
|
return LocoChange(
|
||||||
locoId: _asInt(json['loco_id']),
|
locoId: _asInt(json['loco_id']),
|
||||||
locoClass: _clean(json['loco_class']),
|
locoClass: cleanValue(json['loco_class']),
|
||||||
locoNumber: _clean(json['loco_number']),
|
locoNumber: cleanValue(json['loco_number']),
|
||||||
locoName: _clean(json['loco_name']),
|
locoName: cleanValue(json['loco_name']),
|
||||||
attrCode: _asString(json['attr_code']),
|
attrCode: _asString(json['attr_code']),
|
||||||
attrDisplay: _clean(json['attr_display']),
|
attrDisplay: cleanValue(json['attr_display']),
|
||||||
valueDisplay: _clean(valueLabel),
|
valueDisplay: cleanValue(valueLabel),
|
||||||
validFrom: DateTime.tryParse(validFromRaw?.toString() ?? ''),
|
validFrom: DateTime.tryParse(validFromRaw?.toString() ?? ''),
|
||||||
approvedAt: DateTime.tryParse(approvedRaw?.toString() ?? ''),
|
approvedAt: DateTime.tryParse(approvedRaw?.toString() ?? ''),
|
||||||
approvedBy: _clean(json['approved_by']),
|
approvedBy: cleanValue(json['approved_by']),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,17 +5,24 @@ typedef TokenProvider = String? Function();
|
|||||||
typedef UnauthorizedHandler = Future<void> Function();
|
typedef UnauthorizedHandler = Future<void> Function();
|
||||||
|
|
||||||
class ApiService {
|
class ApiService {
|
||||||
final String baseUrl;
|
String _baseUrl;
|
||||||
final http.Client _client;
|
final http.Client _client;
|
||||||
final Duration timeout;
|
final Duration timeout;
|
||||||
TokenProvider? _getToken;
|
TokenProvider? _getToken;
|
||||||
UnauthorizedHandler? _onUnauthorized;
|
UnauthorizedHandler? _onUnauthorized;
|
||||||
|
|
||||||
ApiService({
|
ApiService({
|
||||||
required this.baseUrl,
|
required String baseUrl,
|
||||||
http.Client? client,
|
http.Client? client,
|
||||||
this.timeout = const Duration(seconds: 30),
|
this.timeout = const Duration(seconds: 30),
|
||||||
}) : _client = client ?? http.Client();
|
}) : _baseUrl = baseUrl,
|
||||||
|
_client = client ?? http.Client();
|
||||||
|
|
||||||
|
String get baseUrl => _baseUrl;
|
||||||
|
|
||||||
|
void setBaseUrl(String url) {
|
||||||
|
_baseUrl = url;
|
||||||
|
}
|
||||||
|
|
||||||
void setTokenProvider(TokenProvider provider) {
|
void setTokenProvider(TokenProvider provider) {
|
||||||
_getToken = provider;
|
_getToken = provider;
|
||||||
|
|||||||
36
lib/services/endpoint_service.dart
Normal file
36
lib/services/endpoint_service.dart
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
import 'package:flutter/foundation.dart';
|
||||||
|
import 'package:shared_preferences/shared_preferences.dart';
|
||||||
|
|
||||||
|
class EndpointService extends ChangeNotifier {
|
||||||
|
EndpointService() {
|
||||||
|
_load();
|
||||||
|
}
|
||||||
|
|
||||||
|
static const String defaultBaseUrl = 'https://mileograph.co.uk/api/v1';
|
||||||
|
static const String _prefsKey = 'api_base_url';
|
||||||
|
|
||||||
|
String _baseUrl = defaultBaseUrl;
|
||||||
|
bool _loaded = false;
|
||||||
|
|
||||||
|
String get baseUrl => _baseUrl;
|
||||||
|
bool get isLoaded => _loaded;
|
||||||
|
|
||||||
|
Future<void> _load() async {
|
||||||
|
final prefs = await SharedPreferences.getInstance();
|
||||||
|
final saved = prefs.getString(_prefsKey);
|
||||||
|
if (saved != null && saved.trim().isNotEmpty) {
|
||||||
|
_baseUrl = saved;
|
||||||
|
}
|
||||||
|
_loaded = true;
|
||||||
|
notifyListeners();
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> setBaseUrl(String url) async {
|
||||||
|
final trimmed = url.trim();
|
||||||
|
if (trimmed.isEmpty) return;
|
||||||
|
_baseUrl = trimmed;
|
||||||
|
final prefs = await SharedPreferences.getInstance();
|
||||||
|
await prefs.setString(_prefsKey, _baseUrl);
|
||||||
|
notifyListeners();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -11,6 +11,7 @@ import 'package:mileograph_flutter/components/pages/loco_legs.dart';
|
|||||||
import 'package:mileograph_flutter/components/pages/loco_timeline.dart';
|
import 'package:mileograph_flutter/components/pages/loco_timeline.dart';
|
||||||
import 'package:mileograph_flutter/components/pages/new_entry.dart';
|
import 'package:mileograph_flutter/components/pages/new_entry.dart';
|
||||||
import 'package:mileograph_flutter/components/pages/new_traction.dart';
|
import 'package:mileograph_flutter/components/pages/new_traction.dart';
|
||||||
|
import 'package:mileograph_flutter/components/pages/settings.dart';
|
||||||
import 'package:mileograph_flutter/components/pages/traction.dart';
|
import 'package:mileograph_flutter/components/pages/traction.dart';
|
||||||
import 'package:mileograph_flutter/components/pages/trips.dart';
|
import 'package:mileograph_flutter/components/pages/trips.dart';
|
||||||
import 'package:mileograph_flutter/services/authservice.dart';
|
import 'package:mileograph_flutter/services/authservice.dart';
|
||||||
@@ -154,6 +155,10 @@ class _MyAppState extends State<MyApp> {
|
|||||||
return NewEntryPage(editLegId: legId);
|
return NewEntryPage(editLegId: legId);
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
|
GoRoute(
|
||||||
|
path: '/settings',
|
||||||
|
builder: (context, state) => const SettingsPage(),
|
||||||
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
GoRoute(path: '/login', builder: (context, state) => const LoginScreen()),
|
GoRoute(path: '/login', builder: (context, state) => const LoginScreen()),
|
||||||
@@ -334,6 +339,11 @@ class _MyHomePageState extends State<MyHomePage> {
|
|||||||
onPressed: null,
|
onPressed: null,
|
||||||
icon: Icon(Icons.account_circle),
|
icon: Icon(Icons.account_circle),
|
||||||
),
|
),
|
||||||
|
IconButton(
|
||||||
|
tooltip: 'Settings',
|
||||||
|
onPressed: () => context.go('/settings'),
|
||||||
|
icon: const Icon(Icons.settings),
|
||||||
|
),
|
||||||
IconButton(onPressed: auth.logout, icon: const Icon(Icons.logout)),
|
IconButton(onPressed: auth.logout, icon: const Icon(Icons.logout)),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -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
|
# 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
|
# 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.
|
# of the product and file versions while build-number is used as the build suffix.
|
||||||
version: 0.3.1+1
|
version: 0.3.2+1
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
sdk: ^3.8.1
|
sdk: ^3.8.1
|
||||||
|
|||||||
Reference in New Issue
Block a user