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

dashboard overhaul
All checks were successful
Release / meta (push) Successful in 8s
Details
Release / linux-build (push) Successful in 7m15s
Details
Release / android-build (push) Successful in 18m37s
Details
Release / release-master (push) Successful in 23s
Details
Release / release-dev (push) Successful in 26s
Details

Browse Source
This commit is contained in:
Pete Gregory
2025-12-22 19:39:50 +00:00
parent 7feb672e7e
commit b1a8f7baf4
6 changed files with 659 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/components/dashboard/latest_loco_changes_panel.dart
View File

@@ -38,9 +38,25 @@ class _LatestLocoChangesPanelState extends State<LatestLocoChangesPanel> {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
Text( Row(
'Latest loco changes', children: [
style: textTheme.titleMedium?.copyWith(fontWeight: FontWeight.w700), const Icon(Icons.bolt, size: 20),
const SizedBox(width: 8),
Expanded(
child: Text(
'Latest loco changes',
style: textTheme.titleMedium?.copyWith(
fontWeight: FontWeight.w800,
),
),
),
if (isLoading && changes.isNotEmpty)
const SizedBox(
width: 18,
height: 18,
child: CircularProgressIndicator(strokeWidth: 2),
),
],
), ),
const SizedBox(height: 8), const SizedBox(height: 8),
if (isLoading && changes.isEmpty) if (isLoading && changes.isEmpty)

98
lib/components/dashboard/leaderboard_panel.dart
View File

@@ -10,6 +10,7 @@ class LeaderboardPanel extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
final data = context.watch<DataService>(); final data = context.watch<DataService>();
final leaderboard = data.homepageStats?.leaderboard ?? []; final leaderboard = data.homepageStats?.leaderboard ?? [];
final textTheme = Theme.of(context).textTheme;
if (data.isHomepageLoading && leaderboard.isEmpty) { if (data.isHomepageLoading && leaderboard.isEmpty) {
return const Padding( return const Padding(
padding: EdgeInsets.all(16.0), padding: EdgeInsets.all(16.0),
@@ -23,12 +24,32 @@ class LeaderboardPanel extends StatelessWidget {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
Text( Row(
"Leaderboard", children: [
style: TextStyle( const Icon(Icons.emoji_events, size: 20),
fontSize: 18, const SizedBox(width: 8),
fontWeight: FontWeight.bold, Expanded(
), child: Text(
"Leaderboard",
style: textTheme.titleMedium?.copyWith(
fontWeight: FontWeight.w800,
),
),
),
if (leaderboard.isNotEmpty)
Container(
padding:
const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
decoration: BoxDecoration(
color: Theme.of(context).colorScheme.surfaceContainerHighest,
borderRadius: BorderRadius.circular(10),
),
child: Text(
'Top ${leaderboard.length}',
style: textTheme.labelSmall,
),
),
],
), ),
const SizedBox(height: 8), const SizedBox(height: 8),
if (leaderboard.isEmpty) if (leaderboard.isEmpty)
@@ -38,43 +59,38 @@ class LeaderboardPanel extends StatelessWidget {
) )
else else
Column( Column(
children: List.generate( children: [
leaderboard.length, for (int index = 0; index < leaderboard.length; index++) ...[
(index) { ListTile(
final leaderboardEntry = leaderboard[index]; contentPadding: EdgeInsets.zero,
return Container( dense: true,
width: double.infinity, leading: CircleAvatar(
margin: const EdgeInsets.symmetric( radius: 18,
horizontal: 0, vertical: 8), backgroundColor:
child: Padding( Theme.of(context).colorScheme.secondaryContainer,
padding: const EdgeInsets.symmetric(vertical: 6), child: Text(
child: Row( '${index + 1}',
mainAxisAlignment: MainAxisAlignment.spaceBetween, style: textTheme.labelLarge?.copyWith(
children: [ fontWeight: FontWeight.w800,
Text.rich( ),
TextSpan(
children: [
TextSpan(
text: '${index + 1}. ',
style: const TextStyle(
fontWeight: FontWeight.bold,
),
),
TextSpan(
text: leaderboardEntry.userFullName,
),
],
),
),
Text(
'${leaderboardEntry.mileage.toStringAsFixed(1)} mi',
),
],
), ),
), ),
); title: Text(
}, leaderboard[index].userFullName,
), style: textTheme.titleSmall?.copyWith(
fontWeight: FontWeight.w700,
),
),
trailing: Text(
'${leaderboard[index].mileage.toStringAsFixed(1)} mi',
style: textTheme.labelLarge?.copyWith(
fontWeight: FontWeight.w700,
),
),
),
if (index != leaderboard.length - 1) const Divider(height: 12),
],
],
), ),
], ],
), ),

102
lib/components/dashboard/top_traction_panel.dart
View File

@@ -11,6 +11,7 @@ class TopTractionPanel extends StatelessWidget {
final data = context.watch<DataService>(); final data = context.watch<DataService>();
final stats = data.homepageStats; final stats = data.homepageStats;
final locos = stats?.topLocos ?? []; final locos = stats?.topLocos ?? [];
final textTheme = Theme.of(context).textTheme;
if (data.isHomepageLoading && locos.isEmpty) { if (data.isHomepageLoading && locos.isEmpty) {
return const Padding( return const Padding(
padding: EdgeInsets.all(16.0), padding: EdgeInsets.all(16.0),
@@ -24,12 +25,19 @@ class TopTractionPanel extends StatelessWidget {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
Text( Row(
"Top Traction", children: [
style: TextStyle( const Icon(Icons.train, size: 20),
fontSize: 18, const SizedBox(width: 8),
fontWeight: FontWeight.bold, Expanded(
), child: Text(
"Top traction",
style: textTheme.titleMedium?.copyWith(
fontWeight: FontWeight.w800,
),
),
),
],
), ),
const SizedBox(height: 8), const SizedBox(height: 8),
if (locos.isEmpty) if (locos.isEmpty)
@@ -39,52 +47,46 @@ class TopTractionPanel extends StatelessWidget {
) )
else else
Column( Column(
children: List.generate( children: [
locos.length, for (int index = 0; index < locos.length; index++) ...[
(index) { ListTile(
final loco = locos[index]; contentPadding: EdgeInsets.zero,
return Container( dense: true,
width: double.infinity, leading: CircleAvatar(
margin: radius: 18,
const EdgeInsets.symmetric(horizontal: 0, vertical: 8), backgroundColor:
child: Padding( Theme.of(context).colorScheme.primaryContainer,
padding: const EdgeInsets.symmetric(vertical: 6), child: Text(
child: Row( '${index + 1}',
mainAxisAlignment: MainAxisAlignment.spaceBetween, style: textTheme.labelLarge?.copyWith(
children: [ fontWeight: FontWeight.w800,
Column( ),
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text.rich(
TextSpan(
children: [
TextSpan(
text: '${index + 1}. ',
style: const TextStyle(
fontWeight: FontWeight.bold,
),
),
TextSpan(
text:
'${loco.locoClass} ${loco.number}',
),
],
),
),
Text(
loco.name ?? '',
style:
const TextStyle(fontStyle: FontStyle.italic),
),
],
),
Text('${loco.mileage?.toStringAsFixed(1)} mi'),
],
), ),
), ),
); title: Text(
}, '${locos[index].locoClass} ${locos[index].number}',
), style: textTheme.titleSmall?.copyWith(
fontWeight: FontWeight.w700,
),
),
subtitle: (locos[index].name ?? '').isEmpty
? null
: Text(
locos[index].name ?? '',
style: textTheme.bodySmall?.copyWith(
fontStyle: FontStyle.italic,
),
),
trailing: Text(
'${locos[index].mileage?.toStringAsFixed(1)} mi',
style: textTheme.labelLarge?.copyWith(
fontWeight: FontWeight.w700,
),
),
),
if (index != locos.length - 1) const Divider(height: 12),
],
],
), ),
], ],
), ),

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

@@ -1,5 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
import 'package:intl/intl.dart';
import 'package:mileograph_flutter/components/dashboard/latest_loco_changes_panel.dart'; import 'package:mileograph_flutter/components/dashboard/latest_loco_changes_panel.dart';
import 'package:mileograph_flutter/components/dashboard/leaderboard_panel.dart'; import 'package:mileograph_flutter/components/dashboard/leaderboard_panel.dart';
import 'package:mileograph_flutter/components/dashboard/top_traction_panel.dart'; import 'package:mileograph_flutter/components/dashboard/top_traction_panel.dart';
@@ -38,41 +39,16 @@ class _DashboardState extends State<Dashboard> {
}, },
child: LayoutBuilder( child: LayoutBuilder(
builder: (context, constraints) { builder: (context, constraints) {
final isWide = constraints.maxWidth > 1100; const spacing = 16.0;
final metricChips = _buildMetricChips( final maxWidth = constraints.maxWidth;
context,
totalMileage: stats?.totalMileage ?? 0,
currentYearMileage: data.getMileageForCurrentYear(),
legCount: stats?.legCount ?? data.trips.length,
);
return Stack( return Stack(
children: [ children: [
ListView( ListView(
padding: const EdgeInsets.all(16), padding: const EdgeInsets.all(16),
children: [ children: [
_buildHeader(context, auth, stats, data.isHomepageLoading), _buildHero(context, auth, data, stats),
const SizedBox(height: 12), const SizedBox(height: spacing),
Wrap(spacing: 12, runSpacing: 12, children: metricChips), _buildTiles(context, data, maxWidth, spacing),
const SizedBox(height: 16),
isWide
? Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(child: _buildMainColumn(context, data)),
const SizedBox(width: 16),
SizedBox(
width: 360,
child: _buildSidebar(context, data),
),
],
)
: Column(
children: [
_buildMainColumn(context, data),
const SizedBox(height: 16),
_buildSidebar(context, data),
],
),
], ],
), ),
if (isInitialLoading) if (isInitialLoading)
@@ -100,139 +76,451 @@ class _DashboardState extends State<Dashboard> {
); );
} }
Widget _buildHeader( Widget _buildHero(
BuildContext context, BuildContext context,
AuthService auth, AuthService auth,
DataService data,
HomepageStats? stats, HomepageStats? stats,
bool loading,
) { ) {
final colorScheme = Theme.of(context).colorScheme;
final isCompact = MediaQuery.of(context).size.width < 720;
final greetingName = final greetingName =
stats?.user?.fullName ?? auth.fullName ?? auth.username ?? 'there'; stats?.user?.fullName ?? auth.fullName ?? auth.username ?? 'there';
return Row( final totalMileage = stats?.totalMileage ?? 0;
mainAxisAlignment: MainAxisAlignment.spaceBetween, final currentYearMileage = data.getMileageForCurrentYear();
crossAxisAlignment: CrossAxisAlignment.start, final legCount = stats?.legCount ?? data.trips.length;
children: [ final progress = totalMileage == 0
Column( ? 0.0
: (currentYearMileage / totalMileage).clamp(0, 1).toDouble();
return Card(
clipBehavior: Clip.antiAlias,
elevation: 2,
child: Container(
decoration: BoxDecoration(
gradient: LinearGradient(
colors: [
colorScheme.primaryContainer,
colorScheme.secondaryContainer,
],
begin: Alignment.topLeft,
end: Alignment.bottomRight,
),
),
padding: const EdgeInsets.all(18),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text('Dashboard', style: Theme.of(context).textTheme.labelMedium), isCompact
const SizedBox(height: 2), ? Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
_heroHeading(context, greetingName, colorScheme),
const SizedBox(height: 12),
_heroActions(context, colorScheme, wrap: true),
],
)
: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(
child: _heroHeading(context, greetingName, colorScheme),
),
_heroActions(context, colorScheme, wrap: false),
],
),
const SizedBox(height: 18),
Wrap(
spacing: 12,
runSpacing: 12,
children: [
_metricTile(
context,
label: 'Total mileage',
value: '${totalMileage.toStringAsFixed(1)} mi',
icon: Icons.route,
color: colorScheme.onPrimaryContainer,
),
_metricTile(
context,
label: 'This year',
value: '${currentYearMileage.toStringAsFixed(1)} mi',
icon: Icons.calendar_today,
color: colorScheme.onPrimaryContainer,
),
_metricTile(
context,
label: 'Entries logged',
value: legCount.toString(),
icon: Icons.format_list_bulleted,
color: colorScheme.onPrimaryContainer,
),
],
),
const SizedBox(height: 16),
ClipRRect(
borderRadius: BorderRadius.circular(12),
child: LinearProgressIndicator(
value: progress.isNaN ? 0 : progress,
minHeight: 10,
backgroundColor: colorScheme.onPrimaryContainer.withValues(
alpha: 0.2,
),
valueColor: AlwaysStoppedAnimation<Color>(
colorScheme.onPrimaryContainer,
),
),
),
const SizedBox(height: 6),
Text( Text(
'Welcome back, $greetingName', totalMileage == 0
style: Theme.of(context).textTheme.headlineSmall, ? 'Log a new entry to start your timeline.'
: 'Year-to-date is ${(progress * 100).toStringAsFixed(0)}% of all mileage.',
style: Theme.of(context).textTheme.labelSmall?.copyWith(
color: colorScheme.onPrimaryContainer.withValues(alpha: 0.8),
),
), ),
], ],
), ),
if (loading) ),
const Padding(
padding: EdgeInsets.only(right: 8.0),
child: SizedBox(
height: 24,
width: 24,
child: CircularProgressIndicator(strokeWidth: 2),
),
),
],
); );
} }
List<Widget> _buildMetricChips( Widget _metricTile(
BuildContext context, { BuildContext context, {
required double totalMileage, required String label,
required double currentYearMileage, required String value,
required int legCount, required IconData icon,
required Color color,
}) { }) {
final textTheme = Theme.of(context).textTheme; final bg = Colors.white.withValues(alpha: 0.14);
Widget metricCard(String label, String value) { return Container(
return Card( padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
elevation: 1, decoration: BoxDecoration(
child: Padding( color: bg,
padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 14), borderRadius: BorderRadius.circular(12),
child: Column( border: Border.all(color: Colors.white.withValues(alpha: 0.18)),
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(icon, color: color),
const SizedBox(width: 10),
Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [ children: [
Text( Text(
label.toUpperCase(), label,
style: textTheme.labelSmall?.copyWith( style: Theme.of(context).textTheme.labelSmall?.copyWith(
letterSpacing: 0.7, color: color.withValues(alpha: 0.85),
color: textTheme.bodySmall?.color?.withValues(alpha: 0.7), letterSpacing: 0.4,
), ),
), ),
const SizedBox(height: 4),
Text( Text(
value, value,
style: textTheme.titleMedium?.copyWith( style: Theme.of(context).textTheme.titleMedium?.copyWith(
fontWeight: FontWeight.w700, fontWeight: FontWeight.w800,
color: color,
), ),
), ),
], ],
), ),
), ],
); ),
}
return [
metricCard('Total mileage', '${totalMileage.toStringAsFixed(1)} mi'),
metricCard('This year', '${currentYearMileage.toStringAsFixed(1)} mi'),
metricCard('Entries logged', legCount.toString()),
];
}
Widget _buildMainColumn(BuildContext context, DataService data) {
return Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
_buildCard(
context,
title: 'On this day',
action:
data.onThisDay
.where((leg) => leg.beginTime.year != DateTime.now().year)
.length >
5
? TextButton(
onPressed: () => setState(() {
_showAllOnThisDay = !_showAllOnThisDay;
}),
child: Text(_showAllOnThisDay ? 'Show less' : 'Show more'),
)
: null,
trailing: data.isOnThisDayLoading
? const SizedBox(
height: 18,
width: 18,
child: CircularProgressIndicator(strokeWidth: 2),
)
: null,
child: _buildLegList(
context,
data.onThisDay,
showAll: _showAllOnThisDay,
emptyMessage: 'No historical moves for today yet.',
),
),
const SizedBox(height: 12),
_buildTripsCard(context, data),
],
); );
} }
Widget _buildSidebar(BuildContext context, DataService data) { Widget _buildTiles(
BuildContext context,
DataService data,
double maxWidth,
double spacing,
) {
final isWide = maxWidth >= 1200;
if (isWide) {
return Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(
flex: 2,
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
_buildOnThisDayCard(context, data),
const SizedBox(height: 16),
_buildTripsCard(context, data),
],
),
),
const SizedBox(width: 16),
Expanded(
flex: 1,
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: const [
TopTractionPanel(),
SizedBox(height: 16),
LeaderboardPanel(),
SizedBox(height: 16),
LatestLocoChangesPanel(),
],
),
),
],
);
}
return Column( return Column(
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
_buildOnThisDayCard(context, data),
const SizedBox(height: 16),
const TopTractionPanel(), const TopTractionPanel(),
const SizedBox(height: 12), const SizedBox(height: 16),
const LeaderboardPanel(), const LeaderboardPanel(),
const SizedBox(height: 12), const SizedBox(height: 16),
_buildTripsCard(context, data),
const SizedBox(height: 16),
const LatestLocoChangesPanel(), const LatestLocoChangesPanel(),
], ],
); );
} }
Widget _buildCard( Widget _heroHeading(
BuildContext context,
String greetingName,
ColorScheme colorScheme,
) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'Dashboard',
style: Theme.of(context).textTheme.labelMedium?.copyWith(
color: colorScheme.onPrimaryContainer,
letterSpacing: 0.4,
),
),
const SizedBox(height: 2),
Text(
'Welcome back, $greetingName',
style: Theme.of(context).textTheme.headlineSmall?.copyWith(
color: colorScheme.onPrimaryContainer,
fontWeight: FontWeight.w800,
),
),
],
);
}
Widget _heroActions(
BuildContext context,
ColorScheme colorScheme, {
required bool wrap,
}) {
final buttons = [
FilledButton.icon(
style: FilledButton.styleFrom(
backgroundColor: Colors.white,
foregroundColor: colorScheme.primary,
),
onPressed: () => context.go('/add'),
icon: const Icon(Icons.add_circle_outline),
label: const Text('Add entry'),
),
FilledButton.tonalIcon(
onPressed: () => context.go('/traction'),
icon: const Icon(Icons.train),
label: const Text('Traction'),
),
FilledButton.tonalIcon(
onPressed: () => context.go('/trips'),
icon: const Icon(Icons.book),
label: const Text('Trips'),
),
];
if (wrap) {
return Wrap(spacing: 8, runSpacing: 8, children: buttons);
}
return Row(
mainAxisSize: MainAxisSize.min,
children: [
...buttons
.map(
(btn) => Padding(
padding: const EdgeInsets.only(left: 8.0),
child: btn,
),
)
.toList(),
],
);
}
Widget _buildOnThisDayCard(BuildContext context, DataService data) {
final filtered = data.onThisDay
.where((leg) => leg.beginTime.year != DateTime.now().year)
.toList();
final textTheme = Theme.of(context).textTheme;
final showMore = filtered.length > 5;
final visible = _showAllOnThisDay ? filtered : filtered.take(6).toList();
return _panel(
context,
icon: Icons.history_toggle_off,
title: 'On this day',
trailing: data.isOnThisDayLoading
? const SizedBox(
height: 18,
width: 18,
child: CircularProgressIndicator(strokeWidth: 2),
)
: null,
action: showMore
? TextButton(
onPressed: () =>
setState(() => _showAllOnThisDay = !_showAllOnThisDay),
child: Text(_showAllOnThisDay ? 'Show less' : 'Show more'),
)
: null,
child: filtered.isEmpty
? Text(
'No historical moves for today yet.',
style: textTheme.bodyMedium,
)
: Column(
children: [
for (int idx = 0; idx < visible.length; idx++) ...[
_otdRow(context, visible[idx], textTheme),
if (idx != visible.length - 1) const Divider(height: 12),
],
],
),
);
}
Widget _otdRow(BuildContext context, Leg leg, TextTheme textTheme) {
final traction = leg.locos;
return Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Container(
width: 64,
height: 56,
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6),
decoration: BoxDecoration(
color: Theme.of(context).colorScheme.surfaceContainerHighest,
borderRadius: BorderRadius.circular(12),
),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
leg.beginTime.year.toString(),
style: textTheme.titleMedium?.copyWith(
fontWeight: FontWeight.w800,
),
),
const SizedBox(height: 2),
Text(_formatTime(leg.beginTime), style: textTheme.labelSmall),
],
),
),
const SizedBox(width: 12),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'${leg.start} → ${leg.end}',
style: textTheme.titleSmall?.copyWith(
fontWeight: FontWeight.w700,
),
maxLines: 2,
overflow: TextOverflow.ellipsis,
),
if (leg.headcode.isNotEmpty) ...[
const SizedBox(height: 4),
Row(
children: [
Text(
leg.headcode,
style: textTheme.labelSmall?.copyWith(
color: textTheme.bodySmall?.color?.withValues(
alpha: 0.7,
),
),
),
],
),
],
const SizedBox(height: 4),
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const SizedBox(width: 6),
Expanded(
child: traction.isEmpty
? Text(
'No traction recorded',
style: textTheme.labelSmall?.copyWith(
color: textTheme.bodySmall?.color?.withValues(
alpha: 0.7,
),
),
)
: Wrap(
spacing: 8,
runSpacing: 4,
children: traction.map((loco) {
final iconColor = loco.powering
? Theme.of(context).colorScheme.primary
: Theme.of(context).hintColor;
final label = '${loco.locoClass} ${loco.number}';
return Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(Icons.train, size: 14, color: iconColor),
const SizedBox(width: 4),
Text(
label,
style: textTheme.labelSmall?.copyWith(
color: textTheme.bodySmall?.color
?.withValues(alpha: 0.85),
),
),
],
);
}).toList(),
),
),
],
),
],
),
),
const SizedBox(width: 12),
Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Text(
'${leg.mileage.toStringAsFixed(1)} mi',
style: textTheme.labelLarge?.copyWith(
fontWeight: FontWeight.w800,
),
),
],
),
],
);
}
Widget _panel(
BuildContext context, { BuildContext context, {
required IconData icon,
required String title, required String title,
required Widget child, required Widget child,
Widget? trailing, Widget? trailing,
@@ -241,29 +529,29 @@ class _DashboardState extends State<Dashboard> {
return Card( return Card(
clipBehavior: Clip.antiAlias, clipBehavior: Clip.antiAlias,
child: Padding( child: Padding(
padding: const EdgeInsets.all(16), padding: const EdgeInsets.all(16.0),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Icon(icon, size: 20),
title, const SizedBox(width: 8),
style: Theme.of(context).textTheme.titleMedium?.copyWith( Expanded(
fontWeight: FontWeight.w700, child: Text(
title,
style: Theme.of(context).textTheme.titleMedium?.copyWith(
fontWeight: FontWeight.w800,
),
), ),
), ),
Row( if (action != null)
mainAxisSize: MainAxisSize.min, Padding(
children: [ padding: const EdgeInsets.only(right: 8.0),
if (action != null) action, child: action,
if (trailing != null) ...[ ),
const SizedBox(width: 8), if (trailing != null) trailing,
trailing,
],
],
),
], ],
), ),
const SizedBox(height: 12), const SizedBox(height: 12),
@@ -274,56 +562,15 @@ class _DashboardState extends State<Dashboard> {
); );
} }
Widget _buildLegList(
BuildContext context,
List<Leg> legs, {
required String emptyMessage,
bool showAll = false,
}) {
final filtered = legs
.where((leg) => leg.beginTime.year != DateTime.now().year)
.toList();
if (filtered.isEmpty) {
return Text(emptyMessage, style: Theme.of(context).textTheme.bodyMedium);
}
final toShow = showAll ? filtered : filtered.take(5).toList();
return Column(
children: toShow.map((leg) {
return ListTile(
dense: true,
contentPadding: EdgeInsets.zero,
leading: CircleAvatar(
backgroundColor: Theme.of(context).colorScheme.primaryContainer,
child: const Icon(Icons.train),
),
title: Text('${leg.start} → ${leg.end}'),
subtitle: Text(_formatDate(leg.beginTime)),
trailing: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text('${leg.mileage.toStringAsFixed(1)} mi'),
if (leg.headcode.isNotEmpty)
Text(
leg.headcode,
style: Theme.of(context).textTheme.labelSmall?.copyWith(
color: Theme.of(context).hintColor,
),
),
],
),
);
}).toList(),
);
}
Widget _buildTripsCard(BuildContext context, DataService data) { Widget _buildTripsCard(BuildContext context, DataService data) {
final tripsUnsorted = data.trips; final tripsUnsorted = data.trips;
List trips = []; List trips = [];
if (tripsUnsorted.isNotEmpty) { if (tripsUnsorted.isNotEmpty) {
trips = [...tripsUnsorted]..sort((a, b) => b.tripId.compareTo(a.tripId)); trips = [...tripsUnsorted]..sort((a, b) => b.tripId.compareTo(a.tripId));
} }
return _buildCard( return _panel(
context, context,
icon: Icons.bookmark,
title: 'Trips', title: 'Trips',
action: TextButton( action: TextButton(
onPressed: () => context.push('/trips'), onPressed: () => context.push('/trips'),
@@ -335,19 +582,46 @@ class _DashboardState extends State<Dashboard> {
style: Theme.of(context).textTheme.bodyMedium, style: Theme.of(context).textTheme.bodyMedium,
) )
: Column( : Column(
children: trips.take(5).map((trip) { children: trips.take(6).map((trip) {
return ListTile( return Padding(
contentPadding: EdgeInsets.zero, padding: const EdgeInsets.symmetric(vertical: 6.0),
title: Text(trip.tripName), child: Row(
subtitle: Text('${trip.tripMileage.toStringAsFixed(1)} mi'), children: [
Container(
width: 42,
height: 42,
decoration: BoxDecoration(
color: Theme.of(context).colorScheme.primaryContainer,
borderRadius: BorderRadius.circular(12),
),
child: const Icon(Icons.book, size: 18),
),
const SizedBox(width: 10),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
trip.tripName,
style: Theme.of(context).textTheme.titleSmall
?.copyWith(fontWeight: FontWeight.w700),
),
Text(
'${trip.tripMileage.toStringAsFixed(1)} mi',
style: Theme.of(context).textTheme.labelMedium,
),
],
),
),
],
),
); );
}).toList(), }).toList(),
), ),
); );
} }
String _formatDate(DateTime? dt) { String _formatTime(DateTime date) {
if (dt == null) return ''; return DateFormat('HH:mm').format(date);
return '${dt.year.toString().padLeft(4, '0')}-${dt.month.toString().padLeft(2, '0')}-${dt.day.toString().padLeft(2, '0')}';
} }
} }

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

@@ -268,6 +268,7 @@ class _TripsPageState extends State<TripsPage> {
isScrollControlled: true, isScrollControlled: true,
builder: (_) { builder: (_) {
bool renaming = false; bool renaming = false;
bool deleting = false;
String tripName = trip.name; String tripName = trip.name;
return StatefulBuilder( return StatefulBuilder(
builder: (sheetCtx, setSheetState) { builder: (sheetCtx, setSheetState) {
@@ -285,6 +286,58 @@ class _TripsPageState extends State<TripsPage> {
} }
} }
Future<void> handleDelete() async {
if (deleting || trip.legs.isNotEmpty) return;
final ok = await showDialog<bool>(
context: sheetCtx,
builder: (ctx) {
return AlertDialog(
title: const Text('Delete trip?'),
content: Text(
'This will delete "${trip.name}". This cannot be undone.',
),
actions: [
TextButton(
onPressed: () => Navigator.of(ctx).pop(false),
child: const Text('Cancel'),
),
FilledButton(
onPressed: () => Navigator.of(ctx).pop(true),
child: const Text('Delete'),
),
],
);
},
);
if (ok != true) 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}');
await Future.wait([
data.fetchTripDetails(),
data.fetchTrips(),
]);
if (context.mounted) {
messenger?.showSnackBar(
SnackBar(content: Text('Deleted "${trip.name}"')),
);
Navigator.of(sheetCtx).pop();
}
} catch (e) {
if (context.mounted) {
messenger?.showSnackBar(
SnackBar(content: Text('Failed to delete trip: $e')),
);
}
} finally {
if (mounted) setSheetState(() => deleting = false);
}
}
return SafeArea( return SafeArea(
child: Padding( child: Padding(
padding: const EdgeInsets.all(16.0), padding: const EdgeInsets.all(16.0),
@@ -317,6 +370,21 @@ class _TripsPageState extends State<TripsPage> {
tooltip: 'Rename trip', tooltip: 'Rename trip',
onPressed: renaming ? null : handleRename, onPressed: renaming ? null : handleRename,
), ),
if (trip.legs.isEmpty) ...[
const SizedBox(width: 4),
IconButton(
icon: deleting
? const SizedBox(
width: 18,
height: 18,
child: CircularProgressIndicator(strokeWidth: 2),
)
: const Icon(Icons.delete_outline),
tooltip: 'Delete trip',
onPressed: deleting ? null : handleDelete,
color: Theme.of(context).colorScheme.error,
),
],
const SizedBox(width: 4), const SizedBox(width: 4),
Text('${trip.mileage.toStringAsFixed(1)} mi'), Text('${trip.mileage.toStringAsFixed(1)} mi'),
], ],

2
pubspec.yaml
View File

@@ -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.0+1 version: 0.3.1+1
environment: environment:
sdk: ^3.8.1 sdk: ^3.8.1