petegregoryy/mileograph_flutter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 21 Wiki Activity

major refactor
All checks were successful
Release / meta (push) Successful in 7s
Details
Release / linux-build (push) Successful in 6m36s
Details
Release / android-build (push) Successful in 15m50s
Details
Release / release-master (push) Successful in 23s
Details
Release / release-dev (push) Successful in 25s
Details

Browse Source
This commit is contained in:
Pete Gregory
2025-12-16 16:49:39 +00:00
parent 4a6aee8a15
commit 80be797322
23 changed files with 1517 additions and 1414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/components/pages/dashboard.dart
View File

@@ -1,10 +1,10 @@
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import 'package:mileograph_flutter/components/dashboard/leaderboardPanel.dart';
import 'package:mileograph_flutter/components/dashboard/topTractionPanel.dart';
import 'package:mileograph_flutter/components/dashboard/leaderboard_panel.dart';
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/dataService.dart';
import 'package:mileograph_flutter/services/data_service.dart';
import 'package:provider/provider.dart';
class Dashboard extends StatefulWidget {
@@ -78,7 +78,7 @@ class _DashboardState extends State<Dashboard> {
child: Container(
color: Theme.of(
context,
).colorScheme.surface.withOpacity(0.7),
).colorScheme.surface.withValues(alpha: 0.7),
child: const Center(
child: Column(
mainAxisSize: MainAxisSize.min,
@@ -105,7 +105,7 @@ class _DashboardState extends State<Dashboard> {
bool loading,
) {
final greetingName =
stats?.user?.full_name ?? auth.fullName ?? auth.username ?? 'there';
stats?.user?.fullName ?? auth.fullName ?? auth.username ?? 'there';
return Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start,
@@ -154,7 +154,7 @@ class _DashboardState extends State<Dashboard> {
label.toUpperCase(),
style: textTheme.labelSmall?.copyWith(
letterSpacing: 0.7,
color: textTheme.bodySmall?.color?.withOpacity(0.7),
color: textTheme.bodySmall?.color?.withValues(alpha: 0.7),
),
),
const SizedBox(height: 4),

2
lib/components/pages/legs.dart
View File

@@ -3,7 +3,7 @@ import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import 'package:mileograph_flutter/objects/objects.dart';
import 'package:mileograph_flutter/services/dataService.dart';
import 'package:mileograph_flutter/services/data_service.dart';
import 'package:provider/provider.dart';
class LegsPage extends StatefulWidget {

1060
lib/components/pages/loco_timeline.dart
View File

File diff suppressed because it is too large Load Diff

331
lib/components/pages/loco_timeline/event_editor.dart Normal file
View File

@@ -0,0 +1,331 @@
part of 'package:mileograph_flutter/components/pages/loco_timeline.dart';
class _EventEditor extends StatelessWidget {
const _EventEditor({
required this.eventFields,
required this.drafts,
required this.onAddEvent,
required this.onChange,
required this.onSave,
required this.onRemoveDraft,
required this.isSaving,
required this.canSave,
});
final List<EventField> eventFields;
final List<_EventDraft> drafts;
final VoidCallback onAddEvent;
final VoidCallback onChange;
final Future<void> Function() onSave;
final void Function(int index) onRemoveDraft;
final bool isSaving;
final bool canSave;
@override
Widget build(BuildContext context) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
'Add events',
style: Theme.of(context).textTheme.titleMedium?.copyWith(
fontWeight: FontWeight.w700,
),
),
Row(
children: [
OutlinedButton.icon(
onPressed: onAddEvent,
icon: const Icon(Icons.add),
label: const Text('New event'),
),
const SizedBox(width: 8),
FilledButton.icon(
onPressed: (!canSave || isSaving) ? null : onSave,
icon: isSaving
? const SizedBox(
height: 14,
width: 14,
child: CircularProgressIndicator(strokeWidth: 2),
)
: const Icon(Icons.save),
label: Text(isSaving ? 'Saving...' : 'Save all'),
),
],
),
],
),
const SizedBox(height: 12),
if (drafts.isEmpty)
const Text('No events yet. Add one to propose new values.')
else
...drafts.asMap().entries.map(
(entry) {
final idx = entry.key;
final draft = entry.value;
return Padding(
padding: const EdgeInsets.only(bottom: 12.0),
child: Card(
child: Padding(
padding: const EdgeInsets.all(12.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Text(
'Event ${idx + 1}',
style: Theme.of(context).textTheme.titleMedium,
),
const Spacer(),
IconButton(
tooltip: 'Remove',
onPressed: () => onRemoveDraft(idx),
icon: const Icon(Icons.delete_outline),
),
],
),
const SizedBox(height: 8),
Row(
children: [
Expanded(
child: TextField(
controller: draft.dateController,
onChanged: (_) => onChange(),
decoration: const InputDecoration(
labelText: 'Date (YYYY-MM-DD, MM/DD can be XX)',
border: OutlineInputBorder(),
),
),
),
IconButton(
tooltip: 'Pick date',
onPressed: () async {
final now = DateTime.now();
final picked = await showDatePicker(
context: context,
initialDate: draft.date ?? now,
firstDate: DateTime(1900),
lastDate: DateTime(now.year + 10),
);
if (picked != null) {
draft.date = picked;
draft.dateController.text =
DateFormat('yyyy-MM-dd').format(picked);
onChange();
}
},
icon: const Icon(Icons.calendar_month),
),
],
),
const SizedBox(height: 8),
_FieldList(
draft: draft,
eventFields: eventFields,
onChange: onChange,
),
const SizedBox(height: 12),
TextField(
controller: draft.detailsController,
onChanged: (val) {
draft.details = val;
onChange();
},
decoration: const InputDecoration(
labelText: 'Commit message / details',
border: OutlineInputBorder(),
),
),
],
),
),
),
);
},
),
],
);
}
}
class _FieldList extends StatelessWidget {
const _FieldList({
required this.draft,
required this.eventFields,
required this.onChange,
});
final _EventDraft draft;
final List<EventField> eventFields;
final VoidCallback onChange;
@override
Widget build(BuildContext context) {
final usedNames = draft.fields.map((f) => f.field.name).toSet();
final availableFields =
eventFields.where((f) => !usedNames.contains(f.name)).toList();
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Text(
'Fields',
style: Theme.of(context).textTheme.titleSmall,
),
const Spacer(),
DropdownButton<EventField>(
hint: const Text('Add field'),
value: null,
onChanged: (field) {
if (field == null) return;
draft.fields.add(_FieldEntry(field: field));
onChange();
},
items: availableFields
.map(
(f) => DropdownMenuItem(
value: f,
child: Text(f.display),
),
)
.toList(),
),
],
),
const SizedBox(height: 8),
if (draft.fields.isEmpty)
const Text('No fields added yet.')
else
...draft.fields.asMap().entries.map(
(entry) {
final idx = entry.key;
final field = entry.value;
return Padding(
padding: const EdgeInsets.symmetric(vertical: 6.0),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
field.field.display,
style: Theme.of(context)
.textTheme
.labelLarge
?.copyWith(fontWeight: FontWeight.w700),
),
const SizedBox(height: 4),
_FieldInput(
field: field.field,
value: field.value,
onChanged: (val) {
field.value = val;
onChange();
},
),
],
),
),
IconButton(
onPressed: () {
draft.fields.removeAt(idx);
onChange();
},
icon: const Icon(Icons.close),
),
],
),
);
},
),
],
);
}
}
class _FieldInput extends StatelessWidget {
const _FieldInput({
required this.field,
required this.value,
required this.onChanged,
});
final EventField field;
final dynamic value;
final ValueChanged<dynamic> onChanged;
@override
Widget build(BuildContext context) {
if (field.enumValues != null && field.enumValues!.isNotEmpty) {
final options = field.enumValues!;
return DropdownButtonFormField<String>(
value: value is String && options.contains(value) ? value : null,
decoration: const InputDecoration(border: OutlineInputBorder()),
items: options
.map((v) => DropdownMenuItem<String>(value: v, child: Text(v)))
.toList(),
onChanged: (val) => onChanged(val),
hint: const Text('Select value'),
);
}
final type = field.type?.toLowerCase();
if (type == 'bool' || type == 'boolean') {
final bool? current =
value is bool ? value : (value is String ? value == 'true' : null);
return DropdownButtonFormField<bool>(
value: current,
decoration: const InputDecoration(border: OutlineInputBorder()),
items: const [
DropdownMenuItem(value: true, child: Text('Yes')),
DropdownMenuItem(value: false, child: Text('No')),
],
onChanged: (val) => onChanged(val),
hint: const Text('Select'),
);
}
final isNumber = type == 'int' || type == 'integer';
return TextFormField(
initialValue: value?.toString(),
onChanged: (val) {
if (isNumber) {
final parsed = int.tryParse(val);
onChanged(parsed);
} else {
onChanged(val);
}
},
decoration: const InputDecoration(
border: OutlineInputBorder(),
hintText: 'Enter value',
),
keyboardType: isNumber ? TextInputType.number : TextInputType.text,
);
}
}
class _EventDraft {
DateTime? date;
String details = '';
final TextEditingController detailsController = TextEditingController();
final TextEditingController dateController = TextEditingController();
final List<_FieldEntry> fields = [];
_EventDraft();
}
class _FieldEntry {
final EventField field;
dynamic value;
_FieldEntry({required this.field});
}

700
lib/components/pages/loco_timeline/timeline_grid.dart Normal file
View File

@@ -0,0 +1,700 @@
part of 'package:mileograph_flutter/components/pages/loco_timeline.dart';
final DateFormat _dateFormat = DateFormat('yyyy-MM-dd');
class _TimelineGrid extends StatefulWidget {
const _TimelineGrid({
required this.entries,
});
final List<LocoAttrVersion> entries;
@override
State<_TimelineGrid> createState() => _TimelineGridState();
}
class _TimelineGridState extends State<_TimelineGrid> {
final ScrollController _horizontalController = ScrollController();
final ScrollController _rightVerticalController = ScrollController();
final ScrollController _leftVerticalController = ScrollController();
bool _isSyncingScroll = false;
double _scrollOffset = 0;
@override
void initState() {
super.initState();
_rightVerticalController.addListener(_syncVerticalScroll);
_horizontalController.addListener(_onHorizontalScroll);
}
@override
void dispose() {
_rightVerticalController.removeListener(_syncVerticalScroll);
_horizontalController.removeListener(_onHorizontalScroll);
_horizontalController.dispose();
_rightVerticalController.dispose();
_leftVerticalController.dispose();
super.dispose();
}
void _syncVerticalScroll() {
if (_isSyncingScroll) return;
if (!_leftVerticalController.hasClients ||
!_rightVerticalController.hasClients) {
return;
}
_isSyncingScroll = true;
_leftVerticalController.jumpTo(
_rightVerticalController.offset.clamp(
0.0,
_leftVerticalController.position.maxScrollExtent,
),
);
_isSyncingScroll = false;
}
void _onHorizontalScroll() {
if (!mounted) return;
setState(() {
_scrollOffset = _horizontalController.offset;
});
}
@override
Widget build(BuildContext context) {
final filteredEntries = widget.entries.where((e) {
final code = e.attrCode.toLowerCase();
return !{
'operational',
'gettable',
'build_prec',
'build_year',
'build_month',
'build_day',
}.contains(code);
}).toList();
final model = _TimelineModel.fromEntries(filteredEntries);
final axisSegments = model.axisSegments;
const labelWidth = 110.0;
const rowHeight = 52.0;
const double axisHeight = 48;
final rows = model.attrRows.entries.toList();
final totalRowsHeight = rows.length * rowHeight;
final axisWidth = math.max(model.axisTotalWidth, 120.0);
final double viewHeight = totalRowsHeight + axisHeight + 8;
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
SizedBox(
height: viewHeight,
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SizedBox(
width: labelWidth,
child: Column(
children: [
SizedBox(
height: axisHeight,
child: Align(
alignment: Alignment.centerLeft,
child: Text(
'Attribute',
style: Theme.of(context).textTheme.labelLarge?.copyWith(
fontWeight: FontWeight.w700,
),
),
),
),
Expanded(
child: Scrollbar(
controller: _leftVerticalController,
thumbVisibility: true,
child: ListView.builder(
controller: _leftVerticalController,
physics: const NeverScrollableScrollPhysics(),
itemExtent: rowHeight,
itemCount: rows.length,
itemBuilder: (_, index) {
final label = _formatAttrLabel(rows[index].key);
return Container(
alignment: Alignment.centerLeft,
padding: const EdgeInsets.symmetric(
horizontal: 10,
),
decoration: BoxDecoration(
color: Theme.of(context)
.colorScheme
.surfaceContainerHighest,
border: Border(
bottom: BorderSide(
color:
Theme.of(context).colorScheme.outlineVariant,
),
),
),
child: Text(
label,
style: Theme.of(context)
.textTheme
.labelLarge
?.copyWith(fontWeight: FontWeight.w700),
),
);
},
),
),
),
],
),
),
const SizedBox(width: 8),
Expanded(
child: Scrollbar(
controller: _horizontalController,
thumbVisibility: true,
child: SingleChildScrollView(
controller: _horizontalController,
scrollDirection: Axis.horizontal,
child: SizedBox(
width: axisWidth,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
_AxisRow(
segments: axisSegments,
totalWidth: axisWidth,
endLabel: model.endLabel,
),
const SizedBox(height: 8),
Expanded(
child: ListView.builder(
controller: _rightVerticalController,
itemExtent: rowHeight,
itemCount: rows.length,
itemBuilder: (_, index) {
final blocks = rows[index].value;
return Padding(
padding:
const EdgeInsets.symmetric(vertical: 2.0),
child: _AttrRow(
rowHeight: rowHeight,
blocks: blocks,
model: model,
scrollOffset: _scrollOffset,
viewportWidth: axisWidth,
),
);
},
),
),
],
),
),
),
),
),
],
),
),
],
);
}
}
class _AxisRow extends StatelessWidget {
const _AxisRow({
required this.segments,
required this.endLabel,
required this.totalWidth,
});
final List<_AxisSegment> segments;
final String endLabel;
final double totalWidth;
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
const double axisHeight = 48;
return SizedBox(
width: totalWidth,
height: axisHeight,
child: Stack(
children: [
for (int i = 0; i < segments.length; i++) ...[
Positioned(
left: segments[i].offset,
width: segments[i].width,
top: 0,
bottom: 0,
child: Align(
alignment: Alignment.centerLeft,
child: Text(
segments[i].label,
overflow: TextOverflow.ellipsis,
maxLines: 1,
style: theme.textTheme.labelSmall,
),
),
),
],
Positioned(
right: 0,
top: 0,
bottom: 0,
child: Align(
alignment: Alignment.centerRight,
child: Text(
endLabel,
overflow: TextOverflow.ellipsis,
maxLines: 1,
style: theme.textTheme.labelSmall,
),
),
),
],
),
);
}
}
class _AttrRow extends StatelessWidget {
const _AttrRow({
required this.rowHeight,
required this.blocks,
required this.model,
required this.scrollOffset,
required this.viewportWidth,
});
final double rowHeight;
final List<_ValueBlock> blocks;
final _TimelineModel model;
final double scrollOffset;
final double viewportWidth;
@override
Widget build(BuildContext context) {
final width = math.max(model.axisTotalWidth, 120.0);
final activeBlock = _activeBlock(blocks, scrollOffset);
final double stickyWidth = activeBlock == null
? 0
: (activeBlock.right - scrollOffset).clamp(20.0, viewportWidth);
return SizedBox(
width: width,
height: rowHeight,
child: Stack(
clipBehavior: Clip.hardEdge,
children: [
for (final block in blocks)
Positioned(
left: block.left,
width: block.width,
top: 0,
bottom: 0,
child: _ValueBlockView(block: block),
),
if (activeBlock != null)
Positioned(
left: scrollOffset,
width: stickyWidth,
top: 0,
bottom: 0,
child: IgnorePointer(
child: ClipRect(
child: _ValueBlockView(
block: activeBlock.copyWith(
left: scrollOffset,
width: stickyWidth,
),
clipLeftEdge: scrollOffset > activeBlock.left + 0.1,
),
),
),
),
],
),
);
}
_ValueBlock? _activeBlock(List<_ValueBlock> blocks, double offset) {
for (final block in blocks) {
if (offset >= block.left && offset < block.right) return block;
}
return null;
}
}
class _ValueBlockView extends StatelessWidget {
const _ValueBlockView({
required this.block,
this.clipLeftEdge = false,
});
final _ValueBlock block;
final bool clipLeftEdge;
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
final color = block.cell.color.withValues(alpha: 0.9);
final textColor = ThemeData.estimateBrightnessForColor(color) ==
Brightness.dark
? Colors.white
: Colors.black87;
final radius = BorderRadius.only(
topLeft: Radius.circular(clipLeftEdge ? 0 : 12),
bottomLeft: Radius.circular(clipLeftEdge ? 0 : 12),
topRight: const Radius.circular(12),
bottomRight: const Radius.circular(12),
);
return ClipRRect(
borderRadius: radius,
child: Container(
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 8),
decoration: BoxDecoration(
color: block.cell.value.isEmpty
? theme.colorScheme.surfaceContainerHighest
: color,
borderRadius: BorderRadius.zero,
border: Border.all(color: theme.colorScheme.outlineVariant),
),
child: block.cell.value.isEmpty
? const SizedBox.shrink()
: FittedBox(
alignment: Alignment.topLeft,
fit: BoxFit.scaleDown,
child: ConstrainedBox(
constraints: const BoxConstraints(minWidth: 1, minHeight: 1),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
block.cell.value,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: theme.textTheme.bodyMedium?.copyWith(
fontWeight: FontWeight.w700,
color: textColor,
) ??
TextStyle(
fontWeight: FontWeight.w700,
color: textColor,
),
),
const SizedBox(height: 4),
Text(
block.cell.rangeLabel,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: theme.textTheme.labelSmall?.copyWith(
color: textColor.withValues(alpha: 0.9),
) ??
TextStyle(color: textColor.withValues(alpha: 0.9)),
),
],
),
),
),
),
);
}
}
String? _formatDate(DateTime? date) {
if (date == null) return null;
return _dateFormat.format(date);
}
String _formatAttrLabel(String code) {
if (code.isEmpty) return 'Attribute';
final parts = code.split('_').where((p) => p.isNotEmpty).toList();
if (parts.isEmpty) return code;
return parts
.map((part) => part.length == 1
? part.toUpperCase()
: part[0].toUpperCase() + part.substring(1))
.join(' ');
}
DateTime? _parseDateString(String? value) {
if (value == null || value.isEmpty) return null;
return DateTime.tryParse(value);
}
DateTime? _effectiveStart(LocoAttrVersion entry) {
return entry.validFrom ??
_parseDateString(entry.maskedValidFrom) ??
entry.txnFrom;
}
DateTime _safeEnd(DateTime start, DateTime? end) {
if (end == null || !end.isAfter(start)) {
return start.add(const Duration(days: 1));
}
return end;
}
class _TimelineModel {
final List<_AxisSegment> axisSegments;
final Map<String, List<_ValueBlock>> attrRows;
final String endLabel;
final List<DateTime> boundaries;
final double axisTotalWidth;
_TimelineModel({
required this.axisSegments,
required this.attrRows,
required this.endLabel,
required this.boundaries,
required this.axisTotalWidth,
});
factory _TimelineModel.fromEntries(List<LocoAttrVersion> entries) {
final grouped = <String, List<LocoAttrVersion>>{};
for (final entry in entries) {
grouped.putIfAbsent(entry.attrCode, () => []).add(entry);
}
final now = DateTime.now();
DateTime? minStart;
DateTime? maxEnd;
final attrSegments = <String, List<_ValueSegment>>{};
grouped.forEach((attr, items) {
items.sort(
(a, b) => (_effectiveStart(a) ?? now)
.compareTo(_effectiveStart(b) ?? now),
);
final segments = <_ValueSegment>[];
for (int i = 0; i < items.length; i++) {
final entry = items[i];
final start = _effectiveStart(entry) ?? now;
final nextStart = i < items.length - 1
? _effectiveStart(items[i + 1])
: null;
final rawEnd = entry.validTo ?? nextStart ?? now;
final end = _safeEnd(start, rawEnd);
if (segments.isNotEmpty && segments.last.value == entry.valueLabel) {
final last = segments.removeLast();
segments.add(
last.copyWith(
end: end.isAfter(last.end) ? end : last.end,
),
);
} else {
segments.add(
_ValueSegment(
start: start,
end: end,
value: entry.valueLabel,
entry: entry,
),
);
}
minStart = minStart == null || start.isBefore(minStart!)
? start
: minStart;
maxEnd = maxEnd == null || end.isAfter(maxEnd!) ? end : maxEnd;
}
attrSegments[attr] = segments;
});
minStart ??= now.subtract(const Duration(days: 1));
final effectiveMaxEnd = maxEnd ?? now;
final boundaryDates = <DateTime>{};
for (final segments in attrSegments.values) {
for (final seg in segments) {
boundaryDates.add(seg.start);
boundaryDates.add(seg.end);
}
}
boundaryDates.add(effectiveMaxEnd);
var boundaries = boundaryDates.toList()..sort();
if (boundaries.length < 2) {
boundaries = [minStart!, effectiveMaxEnd];
}
final axisSegments = <_AxisSegment>[];
const double yearWidth = 240.0;
for (int i = 0; i < boundaries.length - 1; i++) {
final start = boundaries[i];
final end = boundaries[i + 1];
const width = yearWidth;
final double offset = axisSegments.isEmpty
? 0.0
: axisSegments.last.offset + axisSegments.last.width;
axisSegments.add(
_AxisSegment(
start: start,
end: end,
width: width,
offset: offset,
label: _formatDate(start) ?? '',
),
);
}
final axisTotalWidth =
axisSegments.fold<double>(0, (sum, seg) => sum + seg.width);
final attrRows = <String, List<_ValueBlock>>{};
for (final entry in attrSegments.entries) {
final blocks = <_ValueBlock>[];
for (final seg in entry.value) {
final left = _positionForDate(seg.start, boundaries, axisSegments);
final right = _positionForDate(seg.end, boundaries, axisSegments);
final span = right - left;
final width = span < 2.0 ? 2.0 : span;
blocks.add(
_ValueBlock(
left: left,
width: width,
cell: _RowCell.fromSegment(seg),
),
);
}
attrRows[entry.key] = blocks;
}
final endLabel = _formatDate(effectiveMaxEnd) ?? 'Now';
return _TimelineModel(
axisSegments: axisSegments,
attrRows: attrRows,
endLabel: endLabel,
boundaries: boundaries,
axisTotalWidth: axisTotalWidth,
);
}
static double _positionForDate(
DateTime date,
List<DateTime> boundaries,
List<_AxisSegment> segments,
) {
for (int i = 0; i < boundaries.length - 1; i++) {
final start = boundaries[i];
final end = boundaries[i + 1];
if (!date.isAfter(end)) {
final seg = segments[i];
final span = end.difference(start).inMilliseconds;
final elapsed = date.difference(start).inMilliseconds.clamp(0, span);
if (span <= 0) return seg.offset;
final fraction = elapsed / span;
return seg.offset + (seg.width * fraction);
}
}
return segments.isNotEmpty
? segments.last.offset + segments.last.width
: 0.0;
}
}
class _AxisSegment {
final DateTime start;
final DateTime end;
final double width;
final double offset;
final String label;
_AxisSegment({
required this.start,
required this.end,
required this.width,
required this.offset,
required this.label,
});
}
class _ValueSegment {
final DateTime start;
final DateTime end;
final String value;
final LocoAttrVersion? entry;
_ValueSegment({
required this.start,
required this.end,
required this.value,
this.entry,
});
bool overlaps(DateTime s, DateTime e) {
return start.isBefore(e) && end.isAfter(s);
}
_ValueSegment copyWith({DateTime? start, DateTime? end, String? value}) {
return _ValueSegment(
start: start ?? this.start,
end: end ?? this.end,
value: value ?? this.value,
entry: entry,
);
}
}
class _RowCell {
final String value;
final String rangeLabel;
final Color color;
const _RowCell({
required this.value,
required this.rangeLabel,
required this.color,
});
factory _RowCell.fromSegment(_ValueSegment seg) {
if (seg.value.isEmpty) {
return const _RowCell(
value: '',
rangeLabel: '',
color: Colors.transparent,
);
}
final displayStart = _formatDate(seg.start) ?? '';
return _RowCell(
value: seg.value,
rangeLabel: displayStart,
color: _colorForValue(seg.value),
);
}
}
class _ValueBlock {
final double left;
final double width;
final _RowCell cell;
const _ValueBlock({
required this.left,
required this.width,
required this.cell,
});
double get right => left + width;
_ValueBlock copyWith({
double? left,
double? width,
_RowCell? cell,
}) {
return _ValueBlock(
left: left ?? this.left,
width: width ?? this.width,
cell: cell ?? this.cell,
);
}
}
Color _colorForValue(String value) {
final hue = (value.hashCode % 360).toDouble();
final hsl = HSLColor.fromAHSL(1, hue, 0.55, 0.55);
return hsl.toColor();
}

59
lib/components/pages/new_entry.dart
View File

@@ -8,8 +8,8 @@ import 'package:intl/intl.dart';
import 'package:mileograph_flutter/components/calculator/calculator.dart';
import 'package:mileograph_flutter/components/pages/traction.dart';
import 'package:mileograph_flutter/objects/objects.dart';
import 'package:mileograph_flutter/services/apiService.dart';
import 'package:mileograph_flutter/services/dataService.dart';
import 'package:mileograph_flutter/services/api_service.dart';
import 'package:mileograph_flutter/services/data_service.dart';
import 'package:mileograph_flutter/services/navigation_guard.dart';
import 'package:provider/provider.dart';
import 'package:shared_preferences/shared_preferences.dart';
@@ -131,7 +131,7 @@ class _NewEntryPageState extends State<NewEntryPage> {
final controller = TextEditingController();
final result = await showDialog<String>(
context: context,
builder: (context) => AlertDialog(
builder: (dialogContext) => AlertDialog(
title: const Text('New Trip'),
content: TextField(
controller: controller,
@@ -140,25 +140,28 @@ class _NewEntryPageState extends State<NewEntryPage> {
),
actions: [
TextButton(
onPressed: () => Navigator.of(context).pop(),
onPressed: () => Navigator.of(dialogContext).pop(),
child: const Text('Cancel'),
),
ElevatedButton(
onPressed: () => Navigator.of(context).pop(controller.text.trim()),
onPressed: () => Navigator.of(dialogContext).pop(controller.text.trim()),
child: const Text('Add'),
),
],
),
);
if (!mounted) return;
if (!context.mounted) {
controller.dispose();
return;
}
if (result != null && result.isNotEmpty) {
final api = context.read<ApiService>();
final data = context.read<DataService>();
final messenger = ScaffoldMessenger.of(context);
final messenger = ScaffoldMessenger.maybeOf(context);
try {
await api.put('/trips/new', {"trip_name": result});
await data.fetchTrips();
if (!mounted) return;
if (!context.mounted) return;
final trips = data.tripList;
final match = trips.firstWhere(
(t) => t.tripName == result,
@@ -169,11 +172,15 @@ class _NewEntryPageState extends State<NewEntryPage> {
setState(() => _selectedTripId = match.tripId);
_saveDraft();
} catch (e) {
if (!mounted) return;
messenger.showSnackBar(
if (!context.mounted) return;
messenger?.showSnackBar(
SnackBar(content: Text('Failed to add trip: $e')),
);
} finally {
controller.dispose();
}
} else {
controller.dispose();
}
}
@@ -584,8 +591,11 @@ class _NewEntryPageState extends State<NewEntryPage> {
final confirmed = await _confirmDuplicateSubmission();
if (!confirmed) return;
}
setState(() => _submitting = true);
if (!mounted) return;
final api = context.read<ApiService>();
final dataService = context.read<DataService>();
final messenger = ScaffoldMessenger.maybeOf(context);
setState(() => _submitting = true);
final isEditingExisting = _isEditing && widget.editLegId != null;
try {
@@ -626,9 +636,9 @@ class _NewEntryPageState extends State<NewEntryPage> {
}
}
if (!mounted) return;
context.read<DataService>().refreshLegs();
dataService.refreshLegs();
if (!mounted) return;
ScaffoldMessenger.of(context).showSnackBar(
messenger?.showSnackBar(
SnackBar(
content: Text(
isEditingExisting ? 'Entry updated' : 'Entry submitted',
@@ -639,9 +649,9 @@ class _NewEntryPageState extends State<NewEntryPage> {
_activeDraftId = null;
} catch (e) {
if (!mounted) return;
ScaffoldMessenger.of(
context,
).showSnackBar(SnackBar(content: Text('Failed to submit: $e')));
messenger?.showSnackBar(
SnackBar(content: Text('Failed to submit: $e')),
);
} finally {
if (mounted) setState(() => _submitting = false);
}
@@ -1279,8 +1289,15 @@ class _NewEntryPageState extends State<NewEntryPage> {
);
}
return WillPopScope(
onWillPop: () => _handleExitIntent(),
return PopScope(
canPop: false,
onPopInvokedWithResult: (didPop, _) async {
if (didPop) return;
final allow = await _handleExitIntent();
if (allow && context.mounted) {
Navigator.of(context).maybePop();
}
},
child: Scaffold(
appBar: _isEditing
? AppBar(
@@ -1288,7 +1305,7 @@ class _NewEntryPageState extends State<NewEntryPage> {
icon: const Icon(Icons.arrow_back),
onPressed: () async {
if (!await _handleExitIntent()) return;
if (!mounted) return;
if (!context.mounted) return;
Navigator.of(context).maybePop();
},
),
@@ -1507,13 +1524,13 @@ class _DraftListBody extends StatefulWidget {
}
class _DraftListBodyState extends State<_DraftListBody> {
late List<_StoredDraft> _drafts = widget.drafts;
late final List<_StoredDraft> _drafts = List.of(widget.drafts);
@override
Widget build(BuildContext context) {
return ListView.separated(
itemCount: _drafts.length,
separatorBuilder: (_, __) => const Divider(height: 0),
separatorBuilder: (context, _) => const Divider(height: 0),
itemBuilder: (context, index) {
final draft = _drafts[index];
final routeLine = _draftSubtitle(draft);

2
lib/components/pages/new_traction.dart
View File

@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:mileograph_flutter/services/dataService.dart';
import 'package:mileograph_flutter/services/data_service.dart';
enum _SpeedUnit { kph, mph }

346
lib/components/pages/traction.dart
View File

@@ -1,7 +1,8 @@
import 'package:flutter/material.dart';
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/dataService.dart';
import 'package:mileograph_flutter/services/data_service.dart';
import 'package:provider/provider.dart';
class TractionPage extends StatefulWidget {
@@ -452,7 +453,17 @@ class _TractionPageState extends State<TractionPage> {
else
Column(
children: [
...traction.map((loco) => _buildTractionCard(context, loco)),
...traction.map(
(loco) => TractionCard(
loco: loco,
selectionMode: widget.selectionMode,
isSelected: _isSelected(loco),
onShowInfo: () => showTractionDetails(context, loco),
onOpenTimeline: () => _openTimeline(loco),
onToggleSelect:
widget.selectionMode ? () => _toggleSelection(loco) : null,
),
),
if (data.tractionHasMore || data.isTractionLoading)
Padding(
padding: const EdgeInsets.only(top: 8.0),
@@ -476,9 +487,9 @@ class _TractionPageState extends State<TractionPage> {
),
if (data.isTractionLoading)
Positioned.fill(
child: IgnorePointer(
child: Container(
color: Theme.of(context).colorScheme.surface.withOpacity(0.6),
child: IgnorePointer(
child: Container(
color: Theme.of(context).colorScheme.surface.withValues(alpha: 0.6),
child: const Center(child: CircularProgressIndicator()),
),
),
@@ -517,196 +528,23 @@ class _TractionPageState extends State<TractionPage> {
return listView;
}
Widget _buildTractionCard(BuildContext context, LocoSummary loco) {
void _toggleSelection(LocoSummary loco) {
final keyVal = '${loco.locoClass}-${loco.number}';
final isSelected = _selectedKeys.contains(keyVal);
final status = loco.status ?? 'Unknown';
final operatorName = loco.operator ?? '';
final domain = loco.domain ?? '';
final hasMileageOrTrips = _hasMileageOrTrips(loco);
final statusColors = _statusChipColors(context, status);
return Card(
child: Padding(
padding: const EdgeInsets.all(12.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Text(
loco.number,
style: Theme.of(context).textTheme.headlineSmall
?.copyWith(fontWeight: FontWeight.w800),
),
if (hasMileageOrTrips)
Padding(
padding: const EdgeInsets.only(left: 6.0),
child: Icon(
Icons.check_circle,
size: 18,
color: Colors.green.shade600,
),
),
],
),
Text(
loco.locoClass,
style: Theme.of(context).textTheme.labelMedium,
),
if ((loco.name ?? '').isNotEmpty)
Padding(
padding: const EdgeInsets.only(top: 2.0),
child: Text(
loco.name ?? '',
style: Theme.of(context).textTheme.bodyMedium
?.copyWith(fontStyle: FontStyle.italic),
),
),
],
),
Chip(
label: Text(status),
backgroundColor: statusColors.$1,
labelStyle: TextStyle(color: statusColors.$2),
),
],
),
const SizedBox(height: 8),
Row(
children: [
TextButton.icon(
onPressed: () => _showLocoInfo(loco),
icon: const Icon(Icons.info_outline),
label: const Text('Details'),
),
const SizedBox(width: 8),
TextButton.icon(
onPressed: () => _openTimeline(loco),
icon: const Icon(Icons.timeline),
label: const Text('Timeline'),
),
const Spacer(),
if (widget.selectionMode)
TextButton.icon(
onPressed: () {
if (widget.onSelect != null) {
widget.onSelect!(loco);
}
setState(() {
if (isSelected) {
_selectedKeys.remove(keyVal);
} else {
_selectedKeys.add(keyVal);
}
});
},
icon: Icon(
isSelected
? Icons.remove_circle_outline
: Icons.add_circle_outline,
),
label: Text(isSelected ? 'Remove' : 'Add to entry'),
),
],
),
Wrap(
spacing: 8,
runSpacing: 4,
children: [
_statPill(
context,
label: 'Miles',
value: _formatNumber(loco.mileage),
),
_statPill(
context,
label: 'Trips',
value: (loco.trips ?? loco.journeys ?? 0).toString(),
),
if (operatorName.isNotEmpty)
_statPill(context, label: 'Operator', value: operatorName),
if (domain.isNotEmpty)
_statPill(context, label: 'Domain', value: domain),
],
),
],
),
),
);
if (widget.onSelect != null) {
widget.onSelect!(loco);
}
setState(() {
if (_selectedKeys.contains(keyVal)) {
_selectedKeys.remove(keyVal);
} else {
_selectedKeys.add(keyVal);
}
});
}
Widget _statPill(
BuildContext context, {
required String label,
required String value,
}) {
return Container(
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6),
decoration: BoxDecoration(
color: Theme.of(context).colorScheme.surfaceContainerHighest,
borderRadius: BorderRadius.circular(10),
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Text('$label: ', style: Theme.of(context).textTheme.labelSmall),
Text(
value,
style: Theme.of(
context,
).textTheme.labelSmall?.copyWith(fontWeight: FontWeight.w700),
),
],
),
);
}
(Color, Color) _statusChipColors(BuildContext context, String status) {
final scheme = Theme.of(context).colorScheme;
final isDark = scheme.brightness == Brightness.dark;
Color blend(
Color base, {
double bgOpacity = 0.18,
double fgOpacity = 0.82,
}) {
final bg = Color.alphaBlend(
base.withOpacity(isDark ? bgOpacity + 0.07 : bgOpacity),
scheme.surface,
);
final fg = Color.alphaBlend(
base.withOpacity(isDark ? fgOpacity : fgOpacity * 0.8),
scheme.onSurface,
);
return Color.lerp(bg, fg, 0.0) ?? bg;
}
Color background;
Color foreground;
final key = status.toLowerCase();
if (key.contains('scrap')) {
background = blend(Colors.red);
foreground = Colors.red.shade200.withOpacity(isDark ? 0.85 : 0.9);
} else if (key.contains('active')) {
background = blend(scheme.primary);
foreground = scheme.primary.withOpacity(isDark ? 0.9 : 0.8);
} else if (key.contains('withdrawn')) {
background = blend(Colors.amber);
foreground = Colors.amber.shade800.withOpacity(isDark ? 0.9 : 0.8);
} else if (key.contains('stored') || key.contains('unknown')) {
background = blend(Colors.grey);
foreground = Colors.grey.shade700.withOpacity(isDark ? 0.85 : 0.75);
} else {
background = scheme.surfaceContainerHighest;
foreground = scheme.onSurface;
}
return (background, foreground);
bool _isSelected(LocoSummary loco) {
final keyVal = '${loco.locoClass}-${loco.number}';
return _selectedKeys.contains(keyVal);
}
void _openTimeline(LocoSummary loco) {
@@ -717,130 +555,6 @@ class _TractionPageState extends State<TractionPage> {
);
}
Future<void> _showLocoInfo(LocoSummary loco) async {
await showModalBottomSheet(
context: context,
isScrollControlled: true,
builder: (ctx) {
return DraggableScrollableSheet(
expand: false,
maxChildSize: 0.9,
initialChildSize: 0.65,
builder: (_, controller) {
return Padding(
padding: const EdgeInsets.all(16.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
IconButton(
icon: const Icon(Icons.close),
onPressed: () => Navigator.of(ctx).pop(),
),
const SizedBox(width: 8),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Text(
loco.number,
style: Theme.of(context).textTheme.titleLarge
?.copyWith(fontWeight: FontWeight.w800),
),
if (_hasMileageOrTrips(loco))
Padding(
padding: const EdgeInsets.only(left: 6.0),
child: Icon(
Icons.check_circle,
size: 18,
color: Colors.green.shade600,
),
),
],
),
Text(
loco.locoClass,
style: Theme.of(context).textTheme.labelMedium,
),
],
),
],
),
if ((loco.name ?? '').isNotEmpty)
Padding(
padding: const EdgeInsets.only(left: 52.0, bottom: 12),
child: Text(
loco.name ?? '',
style: Theme.of(context).textTheme.bodyMedium,
),
),
const SizedBox(height: 4),
Expanded(
child: ListView(
controller: controller,
children: [
_detailRow('Status', loco.status ?? 'Unknown'),
_detailRow('Operator', loco.operator ?? ''),
_detailRow('Domain', loco.domain ?? ''),
_detailRow('Owner', loco.owner ?? ''),
_detailRow('Livery', loco.livery ?? ''),
_detailRow('Location', loco.location ?? ''),
_detailRow('Mileage', _formatNumber(loco.mileage ?? 0)),
_detailRow(
'Trips',
(loco.trips ?? loco.journeys ?? 0).toString(),
),
_detailRow('EVN', loco.evn ?? ''),
if (loco.notes != null && loco.notes!.isNotEmpty)
_detailRow('Notes', loco.notes!),
],
),
),
],
),
);
},
);
},
);
}
Widget _detailRow(String label, String value) {
if (value.isEmpty) return const SizedBox.shrink();
return Padding(
padding: const EdgeInsets.symmetric(vertical: 6.0),
child: Row(
children: [
SizedBox(
width: 110,
child: Text(
label,
style: Theme.of(
context,
).textTheme.labelMedium?.copyWith(fontWeight: FontWeight.w600),
),
),
Expanded(
child: Text(value, style: Theme.of(context).textTheme.bodyMedium),
),
],
),
);
}
String _formatNumber(double? value) {
if (value == null) return '0';
return value.toStringAsFixed(1);
}
bool _hasMileageOrTrips(LocoSummary loco) {
final mileage = loco.mileage ?? 0;
final trips = loco.trips ?? loco.journeys ?? 0;
return mileage > 0 || trips > 0;
}
Widget _buildFilterInput(
BuildContext context,
EventField field,

2
lib/components/pages/trips.dart
View File

@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:mileograph_flutter/objects/objects.dart';
import 'package:mileograph_flutter/services/dataService.dart';
import 'package:mileograph_flutter/services/data_service.dart';
import 'package:provider/provider.dart';
class TripsPage extends StatefulWidget {