ua1zbe/meshcore-sar_android
1
0
Fork 0
mirror of https://github.com/dz0ny/meshcore-sar.git synced 2026-08-12 00:40:28 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

feat: Add LocationDisplay widget for reusable location display with modal formats

Browse Source 
feat: Enhance CompassContactList and CompassSarList with relative bearing display
refactor: Update DetailedCompassDialog to integrate LocationDisplay and improve layout
This commit is contained in:
Janez T
2025-10-15 10:39:14 +02:00
parent 86711dbb27
commit dbaf09e701
4 changed files with 410 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
lib/widgets/map/compass/compass_contact_list.dart
View File

@@ -8,6 +8,7 @@ import '../../../models/contact.dart';
class CompassContactList extends StatelessWidget {
final List<Contact> contacts;
final Position? position;
final double? heading;
final Contact? selectedContact;
final ValueChanged<Contact?> onContactTap;
@@ -15,6 +16,7 @@ class CompassContactList extends StatelessWidget {
super.key,
required this.contacts,
required this.position,
this.heading,
required this.selectedContact,
required this.onContactTap,
});
@@ -106,11 +108,24 @@ class CompassContactList extends StatelessWidget {
'${_bearingToCardinal(bearing)} • ${_formatDistance(distance)}',
style: Theme.of(context).textTheme.bodySmall,
),
trailing: Text(
'${bearing.round()}°',
style: Theme.of(context).textTheme.bodySmall?.copyWith(
fontWeight: FontWeight.bold,
trailing: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Text(
'${bearing.round()}°',
style: Theme.of(context).textTheme.bodySmall?.copyWith(
fontWeight: FontWeight.bold,
),
),
if (heading != null)
Text(
_formatRelativeBearing(bearing, heading!),
style: Theme.of(context).textTheme.labelSmall?.copyWith(
color: Colors.grey,
),
),
],
),
onTap: () {
if (selectedContact == contact) {
@@ -173,4 +188,27 @@ class CompassContactList extends StatelessWidget {
return '${(meters / 1000).toStringAsFixed(1)}km';
}
}
String _formatRelativeBearing(double bearing, double heading) {
// Calculate relative bearing (how much to turn from current heading)
double relative = bearing - heading;
// Normalize to -180 to +180
while (relative > 180) {
relative -= 360;
}
while (relative < -180) {
relative += 360;
}
final absRelative = relative.abs().round();
if (absRelative < 10) {
return 'ahead';
} else if (relative > 0) {
return '$absRelative° right';
} else {
return '$absRelative° left';
}
}
}

46
lib/widgets/map/compass/compass_sar_list.dart
View File

@@ -8,6 +8,7 @@ import '../../../models/sar_marker.dart';
class CompassSarList extends StatelessWidget {
final List<SarMarker> sarMarkers;
final Position? position;
final double? heading;
final SarMarker? selectedSarMarker;
final ValueChanged<SarMarker?> onSarMarkerTap;
@@ -15,6 +16,7 @@ class CompassSarList extends StatelessWidget {
super.key,
required this.sarMarkers,
required this.position,
this.heading,
required this.selectedSarMarker,
required this.onSarMarkerTap,
});
@@ -125,11 +127,24 @@ class CompassSarList extends StatelessWidget {
'${_bearingToCardinal(bearing)} • ${_formatDistance(distance)} • ${marker.timeAgo}',
style: Theme.of(context).textTheme.bodySmall,
),
trailing: Text(
'${bearing.round()}°',
style: Theme.of(context).textTheme.bodySmall?.copyWith(
fontWeight: FontWeight.bold,
trailing: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Text(
'${bearing.round()}°',
style: Theme.of(context).textTheme.bodySmall?.copyWith(
fontWeight: FontWeight.bold,
),
),
if (heading != null)
Text(
_formatRelativeBearing(bearing, heading!),
style: Theme.of(context).textTheme.labelSmall?.copyWith(
color: Colors.grey,
),
),
],
),
onTap: () {
if (selectedSarMarker == marker) {
@@ -192,4 +207,27 @@ class CompassSarList extends StatelessWidget {
return '${(meters / 1000).toStringAsFixed(1)}km';
}
}
String _formatRelativeBearing(double bearing, double heading) {
// Calculate relative bearing (how much to turn from current heading)
double relative = bearing - heading;
// Normalize to -180 to +180
while (relative > 180) {
relative -= 360;
}
while (relative < -180) {
relative += 360;
}
final absRelative = relative.abs().round();
if (absRelative < 10) {
return 'ahead';
} else if (relative > 0) {
return '$absRelative° right';
} else {
return '$absRelative° left';
}
}
}