Merge branch 'main' into unread-peoplefirst

This commit is contained in:
Serge Tarkovski
2026-02-09 13:16:05 +02:00
48 changed files with 3451 additions and 296 deletions
+41 -4
View File
@@ -349,6 +349,43 @@ class _MapScreenState extends State<MapScreen> {
),
..._buildMarkers(contactsWithLocation, settings),
...sharedMarkers.map(_buildSharedMarker),
if (connector.selfLatitude != null &&
connector.selfLongitude != null)
Marker(
point: LatLng(
connector.selfLatitude!,
connector.selfLongitude!,
),
width: 35,
height: 35,
child: Container(
padding: const EdgeInsets.all(4),
decoration: BoxDecoration(
color: Colors.teal,
shape: BoxShape.circle,
border: Border.all(
color: Colors.white,
width: 2,
),
boxShadow: [
BoxShadow(
color: Colors.black.withValues(alpha: 0.3),
blurRadius: 4,
offset: const Offset(0, 2),
),
],
),
alignment: Alignment.center,
child: Text(
context.l10n.pathTrace_you,
style: const TextStyle(
color: Colors.black,
fontWeight: FontWeight.bold,
fontSize: 12,
),
),
),
),
],
),
],
@@ -396,14 +433,14 @@ class _MapScreenState extends State<MapScreen> {
final marker = Marker(
point: LatLng(contact.latitude!, contact.longitude!),
width: 80,
height: 80,
width: 35,
height: 35,
child: GestureDetector(
onTap: () => _showNodeInfo(context, contact),
child: Column(
children: [
Container(
padding: const EdgeInsets.all(8),
padding: const EdgeInsets.all(4),
decoration: BoxDecoration(
color: _getNodeColor(contact.type),
shape: BoxShape.circle,
@@ -419,7 +456,7 @@ class _MapScreenState extends State<MapScreen> {
child: Icon(
_getNodeIcon(contact.type),
color: Colors.white,
size: 24,
size: 20,
),
),
],