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

Add new friends system, and sharing legs support
All checks were successful
Release / meta (push) Successful in 9s
Details
Release / linux-build (push) Successful in 6m37s
Details
Release / web-build (push) Successful in 5m29s
Details
Release / android-build (push) Successful in 15m58s
Details
Release / release-master (push) Successful in 20s
Details
Release / release-dev (push) Successful in 26s
Details

Browse Source
This commit is contained in:
Pete Gregory
2026-01-03 01:07:08 +00:00
parent 42af39b442
commit 89b760508d
19 changed files with 2832 additions and 712 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,7 @@ 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/api_service.dart';
import 'package:mileograph_flutter/services/authservice.dart';
import 'package:mileograph_flutter/services/data_service.dart';
import 'package:mileograph_flutter/services/distance_unit_service.dart';
import 'package:mileograph_flutter/services/navigation_guard.dart';

7
lib/components/pages/new_entry/new_entry_draft_logic.dart
View File

@@ -4,6 +4,7 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
Future<bool> _handleExitIntent() async {
if (!mounted) return false;
if (_isEditing) return true;
if (_activeLegShare != null) return true;
if (_formIsEmpty()) return true;
if (_activeDraftId != null && !_draftChangedFromBaseline()) {
return true;
@@ -82,6 +83,7 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
}
Future<void> _openDrafts() async {
if (_activeLegShare != null) return;
final selected = await Navigator.of(context).push<_StoredDraft>(
MaterialPageRoute(
builder: (_) => _DraftListPage(
@@ -97,6 +99,7 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
}
Future<void> _saveDraftManually() async {
if (_activeLegShare != null) return;
if (_savingDraft) return;
if (_formIsEmpty()) {
ScaffoldMessenger.maybeOf(context)?.showSnackBar(
@@ -123,7 +126,9 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
}
Future<void> _saveDraft() async {
if (_restoringDraft || !_draftPersistenceEnabled) return;
if (_restoringDraft || !_draftPersistenceEnabled || _activeLegShare != null) {
return;
}
final prefs = await SharedPreferences.getInstance();
final draft = {
"date": _selectedDate.toIso8601String(),

451
lib/components/pages/new_entry/new_entry_page.dart
View File

@@ -1,9 +1,10 @@
part of 'new_entry.dart';
class NewEntryPage extends StatefulWidget {
const NewEntryPage({super.key, this.editLegId});
const NewEntryPage({super.key, this.editLegId, this.legShare});
final int? editLegId;
final LegShareData? legShare;
@override
State<NewEntryPage> createState() => _NewEntryPageState();
@@ -52,9 +53,15 @@ class _NewEntryPageState extends State<NewEntryPage> {
const DeepCollectionEquality();
String? _activeDraftId;
DistanceUnit? _lastDistanceUnit;
Set<String> _shareUserIds = {};
List<UserSummary> _shareUsers = [];
LegShareData? _activeLegShare;
String? _sharedFromUser;
int? _shareNotificationId;
bool get _isEditing => widget.editLegId != null;
bool get _draftPersistenceEnabled =>
_activeLegShare == null &&
false; // legacy single draft disabled in favor of draft list
@override
@@ -69,16 +76,28 @@ class _NewEntryPageState extends State<NewEntryPage> {
data.fetchClassList();
data.fetchTripOptions();
_loadStations();
if (_draftPersistenceEnabled) {
if (_draftPersistenceEnabled && widget.legShare == null) {
_loadDraft();
}
_loadStations();
if (_isEditing && widget.editLegId != null) {
_loadLegForEdit(widget.editLegId!);
} else if (widget.legShare != null) {
_applyLegShare(widget.legShare!);
}
});
}
@override
void didUpdateWidget(covariant NewEntryPage oldWidget) {
super.didUpdateWidget(oldWidget);
if (widget.legShare != null &&
(oldWidget.legShare == null ||
widget.legShare!.id != oldWidget.legShare!.id)) {
_applyLegShare(widget.legShare!);
}
}
@override
void dispose() {
NavigationGuard.unregister(_exitGuard);
@@ -134,6 +153,282 @@ class _NewEntryPageState extends State<NewEntryPage> {
0;
}
List<UserSummary> _friendsFromFriendships(
DataService data,
String? selfId,
) {
final friends = <UserSummary>[];
for (final f in data.friendships) {
final other = _friendFromFriendship(f, selfId);
if (other != null &&
other.userId.isNotEmpty &&
!friends.any((u) => u.userId == other.userId)) {
friends.add(other);
}
}
return friends;
}
UserSummary? _friendFromFriendship(Friendship friendship, String? selfId) {
final self = selfId ?? '';
if (friendship.requesterId == self) return friendship.addressee;
if (friendship.addresseeId == self) return friendship.requester;
if (friendship.addressee != null) return friendship.addressee;
if (friendship.requester != null) return friendship.requester;
return null;
}
Widget _buildShareSection(BuildContext context) {
final selected = _shareUsers;
final label = selected.isEmpty
? 'Share with friends'
: 'Shared with ${selected.length} friend${selected.length == 1 ? '' : 's'}';
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
OutlinedButton.icon(
onPressed: _submitting ? null : _openShareSheet,
icon: const Icon(Icons.share),
label: Text(label),
),
if (selected.isNotEmpty) ...[
const SizedBox(height: 8),
Wrap(
spacing: 8,
runSpacing: 8,
children: selected
.map(
(u) => InputChip(
label: Text(u.displayName),
avatar: const Icon(Icons.person, size: 16),
onDeleted: _submitting
? null
: () {
setState(() {
_shareUserIds.remove(u.userId);
_shareUsers.removeWhere(
(item) => item.userId == u.userId,
);
});
},
),
)
.toList(),
),
],
],
);
}
Widget _buildSharedBanner() {
final from = _sharedFromUser;
return Container(
width: double.infinity,
padding: const EdgeInsets.all(12),
decoration: BoxDecoration(
color: Colors.orange.withValues(alpha: 0.1),
borderRadius: BorderRadius.circular(8),
border: Border.all(color: Colors.orange.withValues(alpha: 0.4)),
),
child: Row(
children: [
const Icon(Icons.share, color: Colors.orange),
const SizedBox(width: 8),
Expanded(
child: Text(
from != null && from.isNotEmpty
? 'This entry was shared by $from.'
: 'This entry was shared with you.',
style: const TextStyle(fontWeight: FontWeight.w600),
),
),
],
),
);
}
Future<void> _openShareSheet() async {
if (_activeLegShare != null) return;
final data = context.read<DataService>();
final auth = context.read<AuthService>();
try {
await data.fetchFriendships();
} catch (_) {}
if (!mounted) return;
final baseFriends = _friendsFromFriendships(data, auth.userId);
final initialSelectedIds = {..._shareUserIds};
final initialSelectedUsers = {
for (final u in _shareUsers) u.userId: u,
};
final result = await showModalBottomSheet<List<UserSummary>>(
context: context,
isScrollControlled: true,
builder: (ctx) {
final searchController = TextEditingController();
List<UserSummary> searchResults = [];
bool searching = false;
String searchTerm = '';
String? searchError;
final selectedIds = {...initialSelectedIds};
final selectedUsers = {...initialSelectedUsers};
return StatefulBuilder(
builder: (modalContext, setModalState) {
Future<void> runSearch(String term) async {
final trimmed = term.trim();
if (trimmed.isEmpty) {
setModalState(() {
searchTerm = '';
searchResults = [];
searchError = null;
});
return;
}
setModalState(() {
searchTerm = trimmed;
searching = true;
searchError = null;
});
try {
final results =
await data.searchUsers(trimmed, friendsOnly: true);
setModalState(() {
searchResults = results;
});
} catch (e) {
setModalState(() {
searchError = 'Search failed';
});
} finally {
setModalState(() {
searching = false;
});
}
}
final list = searchTerm.isNotEmpty ? searchResults : baseFriends;
return Padding(
padding: EdgeInsets.only(
bottom: MediaQuery.of(modalContext).viewInsets.bottom + 16,
left: 16,
right: 16,
top: 16,
),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
const Expanded(
child: Text(
'Share with friends',
style: TextStyle(
fontSize: 18,
fontWeight: FontWeight.w600,
),
),
),
IconButton(
onPressed: () => Navigator.of(modalContext).pop(),
icon: const Icon(Icons.close),
),
],
),
const SizedBox(height: 8),
TextField(
controller: searchController,
decoration: InputDecoration(
labelText: 'Search friends',
border: const OutlineInputBorder(),
suffixIcon: IconButton(
icon: const Icon(Icons.search),
onPressed: () => runSearch(searchController.text),
),
),
onSubmitted: runSearch,
),
if (searching)
const Padding(
padding: EdgeInsets.only(top: 8.0),
child: LinearProgressIndicator(minHeight: 2),
),
if (searchError != null)
Padding(
padding: const EdgeInsets.only(top: 8.0),
child: Text(
searchError!,
style: const TextStyle(color: Colors.red),
),
),
const SizedBox(height: 12),
SizedBox(
height: 320,
child: list.isEmpty
? const Center(child: Text('No friends found'))
: ListView.builder(
itemCount: list.length,
itemBuilder: (_, index) {
final user = list[index];
final isSelected =
selectedIds.contains(user.userId);
return CheckboxListTile(
value: isSelected,
title: Text(user.displayName),
subtitle: user.username.isNotEmpty
? Text('@${user.username}')
: null,
onChanged: (checked) {
setModalState(() {
if (checked == true) {
selectedIds.add(user.userId);
selectedUsers[user.userId] = user;
} else {
selectedIds.remove(user.userId);
selectedUsers.remove(user.userId);
}
});
},
);
},
),
),
const SizedBox(height: 12),
Row(
children: [
TextButton(
onPressed: () => Navigator.of(modalContext).pop(),
child: const Text('Cancel'),
),
const Spacer(),
ElevatedButton(
onPressed: () => Navigator.of(modalContext).pop(
selectedIds
.map((id) => selectedUsers[id])
.whereType<UserSummary>()
.toList(),
),
child: const Text('Save'),
),
],
),
],
),
);
},
);
},
);
if (result != null && mounted) {
setState(() {
_shareUsers = result;
_shareUserIds = result.map((u) => u.userId).toSet();
});
}
}
void _syncManualFieldUnit(DistanceUnit currentUnit) {
if (!_useManualMileage) {
_lastDistanceUnit = currentUnit;
@@ -571,6 +866,96 @@ class _NewEntryPageState extends State<NewEntryPage> {
}
}
void _applyLegShare(LegShareData share) {
final entry = share.entry;
final beginTime = entry.beginTime;
final endTime = entry.endTime;
final routeStations = entry.route;
final mileageVal = entry.mileage;
final units = _distanceUnits(context);
final useManual = routeStations.isEmpty;
final routeResult = useManual
? null
: RouteResult(
inputRoute: routeStations,
calculatedRoute: routeStations,
costs: const <double>[],
distance: mileageVal,
);
final tractionItems = _buildTractionFromApi(
entry.locos
.map((l) => {
"loco_id": l.id,
"type": l.type,
"number": l.number,
"class": l.locoClass,
"name": l.name,
"operator": l.operator,
"notes": l.notes,
"evn": l.evn,
"alloc_pos": l.allocPos,
"alloc_powering": l.powering ? 1 : 0,
})
.toList(),
);
final beginDelay = entry.beginDelayMinutes ?? 0;
final endDelay = entry.endDelayMinutes ?? 0;
final originTime = entry.originTime;
final destinationTime = entry.destinationTime;
final hasOriginTime = originTime != null;
final hasDestinationTime = destinationTime != null;
final hasEndTime = endTime != null || endDelay != 0;
_restoringDraft = true;
setState(() {
_activeLegShare = share;
_sharedFromUser = share.sharedFromName;
_shareNotificationId = share.notificationId;
_selectedTripId = null;
_selectedDate = beginTime;
_selectedTime = TimeOfDay.fromDateTime(beginTime);
_selectedEndDate = endTime ?? beginTime;
_selectedEndTime = TimeOfDay.fromDateTime(endTime ?? beginTime);
_hasEndTime = hasEndTime;
_selectedOriginDate = originTime ?? beginTime;
_selectedOriginTime = TimeOfDay.fromDateTime(originTime ?? beginTime);
_selectedDestinationDate = destinationTime ?? endTime ?? beginTime;
_selectedDestinationTime =
TimeOfDay.fromDateTime(destinationTime ?? endTime ?? beginTime);
_hasOriginTime = hasOriginTime;
_hasDestinationTime = hasDestinationTime;
_useManualMileage = useManual;
_routeResult = routeResult;
_startController.text = entry.start;
_endController.text = entry.end;
_headcodeController.text = entry.headcode.toUpperCase();
_notesController.text = entry.notes;
_networkController.text = entry.network.toUpperCase();
_originController.text = entry.origin;
_destinationController.text = entry.destination;
_beginDelayController.text = beginDelay.toString();
_endDelayController.text = endDelay.toString();
_mileageController.text = mileageVal == 0
? ''
: _formatDistance(
units,
mileageVal,
decimals: 2,
includeUnit: false,
);
_tractionItems
..clear()
..addAll(tractionItems);
if (_tractionItems.where((e) => e.isMarker).isEmpty) {
_tractionItems.insert(0, _TractionItem.marker());
}
_lastSubmittedSnapshot = null;
_shareUserIds.clear();
_shareUsers.clear();
});
_restoringDraft = false;
}
List<String> _parseRouteStations(dynamic raw) {
if (raw is List) {
return raw.map((e) => e.toString()).toList();
@@ -809,7 +1194,8 @@ class _NewEntryPageState extends State<NewEntryPage> {
minimumSize: const Size(0, 36),
tapTargetSize: MaterialTapTargetSize.shrinkWrap,
),
onPressed: _isEditing ? null : _openDrafts,
onPressed:
_isEditing || _activeLegShare != null ? null : _openDrafts,
icon: const Icon(Icons.list_alt, size: 16),
label: const Text('Drafts'),
),
@@ -817,23 +1203,26 @@ class _NewEntryPageState extends State<NewEntryPage> {
TextButton.icon(
style: TextButton.styleFrom(
padding: EdgeInsets.zero,
minimumSize: const Size(0, 36),
tapTargetSize: MaterialTapTargetSize.shrinkWrap,
),
onPressed: _isEditing || _savingDraft || _submitting
? null
: _saveDraftManually,
icon: _savingDraft
? const SizedBox(
width: 16,
height: 16,
child: CircularProgressIndicator(strokeWidth: 2),
minimumSize: const Size(0, 36),
tapTargetSize: MaterialTapTargetSize.shrinkWrap,
),
onPressed: _isEditing ||
_savingDraft ||
_submitting ||
_activeLegShare != null
? null
: _saveDraftManually,
icon: _savingDraft
? const SizedBox(
width: 16,
height: 16,
child: CircularProgressIndicator(strokeWidth: 2),
)
: const Icon(Icons.save_alt, size: 16),
label: Text(_savingDraft ? 'Saving...' : 'Save to drafts'),
),
const Spacer(),
TextButton.icon(
),
const Spacer(),
TextButton.icon(
style: TextButton.styleFrom(
padding: EdgeInsets.zero,
minimumSize: const Size(0, 36),
@@ -844,11 +1233,17 @@ class _NewEntryPageState extends State<NewEntryPage> {
: () => _resetFormState(clearDraft: true),
icon: const Icon(Icons.clear, size: 16),
label: const Text('Clear form'),
),
],
),
_buildTripSelector(context),
_dateTimeGroup(
],
),
if (_activeLegShare != null) ...[
const SizedBox(height: 8),
_buildSharedBanner(),
],
_buildTripSelector(context),
const SizedBox(height: 12),
if (_activeLegShare == null) _buildShareSection(context),
_dateTimeGroup(
context,
title: 'Departure time',
onDateTap: _pickDate,
@@ -1100,11 +1495,15 @@ class _NewEntryPageState extends State<NewEntryPage> {
child: CircularProgressIndicator(strokeWidth: 2),
)
: const Icon(Icons.send),
label: Text(
_submitting
? (_isEditing ? 'Saving...' : 'Submitting...')
: (_isEditing ? 'Save changes' : 'Submit entry'),
),
label: () {
final shareMode = _activeLegShare != null;
if (_submitting) {
if (shareMode) return const Text('Accepting...');
return Text(_isEditing ? 'Saving...' : 'Submitting...');
}
if (shareMode) return const Text('Accept entry');
return Text(_isEditing ? 'Save changes' : 'Submit entry');
}(),
),
],
),

17
lib/components/pages/new_entry/new_entry_submit_logic.dart
View File

@@ -108,6 +108,8 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
"leg_begin_delay": beginDelay,
if (_hasEndTime) "leg_end_delay": endDelay,
"locos": tractionPayload,
if (_activeLegShare != null) "leg_share_id": _activeLegShare!.id,
"share_user_ids": _shareUserIds.toList(),
};
if (_useManualMileage) {
final body = {
@@ -136,6 +138,9 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
if (!mounted) return;
dataService.refreshLegs();
await dataService.fetchNotifications();
if (_shareNotificationId != null) {
await dataService.dismissNotifications([_shareNotificationId!]);
}
if (!mounted) return;
messenger?.showSnackBar(
SnackBar(
@@ -188,6 +193,8 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
"headcode": _headcodeController.text.trim(),
"beginDelay": beginDelay,
"endDelay": endDelay,
"legShareId": _activeLegShare?.id,
"shareUserIds": _shareUserIds.toList(),
"locos": tractionPayload,
"routeResult": _routeResult == null
? null
@@ -223,6 +230,7 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
}
Future<void> _resetFormState({bool clearDraft = false}) async {
final hadShare = _activeLegShare != null || widget.legShare != null;
_formKey.currentState?.reset();
_startController.clear();
_endController.clear();
@@ -252,6 +260,11 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
_matchDestinationToEntry = false;
_matchUpdateScheduled = false;
_routeResult = null;
_activeLegShare = null;
_sharedFromUser = null;
_shareNotificationId = null;
_shareUserIds.clear();
_shareUsers.clear();
_tractionItems
..clear()
..add(_TractionItem.marker());
@@ -261,6 +274,10 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
_savingDraft = false;
_loadedDraftSnapshot = null;
});
if (hadShare && mounted) {
// Clear any share params from the URL when resetting.
GoRouter.of(context).go('/add');
}
if (clearDraft) {
await _clearDraft();
}