Layout changes, fix bugs in new entry page
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:mileograph_flutter/components/legs/leg_card.dart';
|
||||
import 'package:mileograph_flutter/objects/objects.dart';
|
||||
import 'package:mileograph_flutter/services/data_service.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
|
||||
@@ -211,7 +212,7 @@ class _LegsPageState extends State<LegsPage> {
|
||||
else
|
||||
Column(
|
||||
children: [
|
||||
...legs.map((leg) => LegCard(leg: leg)),
|
||||
..._buildLegsWithDividers(context, legs),
|
||||
const SizedBox(height: 8),
|
||||
if (data.legsHasMore || data.isLegsLoading)
|
||||
Align(
|
||||
@@ -238,6 +239,57 @@ class _LegsPageState extends State<LegsPage> {
|
||||
);
|
||||
}
|
||||
|
||||
List<Widget> _buildLegsWithDividers(BuildContext context, List<Leg> legs) {
|
||||
final widgets = <Widget>[];
|
||||
String? currentDate;
|
||||
double dayMileage = 0;
|
||||
final dayLegs = <Leg>[];
|
||||
|
||||
void flushDay() {
|
||||
if (currentDate == null) return;
|
||||
widgets.add(
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(vertical: 8.0),
|
||||
child: Row(
|
||||
children: [
|
||||
Expanded(
|
||||
child: Text(
|
||||
currentDate!,
|
||||
style: Theme.of(context).textTheme.labelMedium?.copyWith(
|
||||
fontWeight: FontWeight.w700,
|
||||
),
|
||||
),
|
||||
),
|
||||
Text(
|
||||
'${dayMileage.toStringAsFixed(1)} mi',
|
||||
style: Theme.of(context).textTheme.labelMedium,
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
widgets.add(const Divider());
|
||||
widgets.addAll(
|
||||
dayLegs.map((leg) => LegCard(leg: leg, showDate: false)),
|
||||
);
|
||||
dayLegs.clear();
|
||||
}
|
||||
|
||||
for (final leg in legs) {
|
||||
final dateStr = _formatDate(leg.beginTime) ?? '';
|
||||
if (currentDate != null && dateStr != currentDate) {
|
||||
flushDay();
|
||||
dayMileage = 0;
|
||||
}
|
||||
currentDate = dateStr;
|
||||
dayLegs.add(leg);
|
||||
dayMileage += leg.mileage;
|
||||
}
|
||||
|
||||
flushDay();
|
||||
return widgets;
|
||||
}
|
||||
|
||||
String? _formatDate(DateTime? date) {
|
||||
if (date == null) return null;
|
||||
return '${date.year.toString().padLeft(4, '0')}-${date.month.toString().padLeft(2, '0')}-${date.day.toString().padLeft(2, '0')}';
|
||||
|
||||
Reference in New Issue
Block a user