Merge pull request #413 from ericszimmermann/ez_marker_update_squashed

Improve SharedMarker handling

lib/screens/chat_screen.dart

@@ -9,7 +9,6 @@ import 'package:meshcore_open/screens/path_trace_map.dart';
 import 'package:provider/provider.dart';
 
 import '../utils/platform_info.dart';
-import 'package:latlong2/latlong.dart';
 
 import '../connector/meshcore_connector.dart';
 import '../connector/meshcore_protocol.dart';
@@ -507,6 +506,7 @@ class _ChatScreenState extends State<ChatScreen> {
                 senderName: resolvedContact.type == advTypeRoom
                     ? "${contact.name} [$fourByteHex]"
                     : contact.name,
+                sourceId: widget.contact.publicKeyHex,
                 isRoomServer: resolvedContact.type == advTypeRoom,
                 textScale: textScale,
                 onTap: () => _openMessagePath(message, contact),
@@ -1630,10 +1630,12 @@ class _MessageBubble extends StatelessWidget {
   final VoidCallback? onLongPress;
   final void Function(Message message, String emoji)? onRetryReaction;
   final double textScale;
+  final String sourceId;
 
   const _MessageBubble({
     required this.message,
     required this.senderName,
+    required this.sourceId,
     required this.isRoomServer,
     required this.textScale,
     this.onTap,
@@ -1648,7 +1650,7 @@ class _MessageBubble extends StatelessWidget {
     final isOutgoing = message.isOutgoing;
     final colorScheme = Theme.of(context).colorScheme;
     final gifId = GifHelper.parseGif(message.text);
-    final poi = _parsePoiMessage(message.text);
+    final poi = parseMarkerText(message.text);
     final isFailed = message.status == MessageStatus.failed;
     final bubbleColor = isFailed
         ? colorScheme.errorContainer
@@ -1740,6 +1742,7 @@ class _MessageBubble extends StatelessWidget {
                             textColor,
                             metaColor,
                             textScale,
+                            senderName,
                             trailing: (!enableTracing && isOutgoing)
                                 ? Padding(
                                     padding: const EdgeInsets.only(bottom: 2),
@@ -1921,25 +1924,13 @@ class _MessageBubble extends StatelessWidget {
     );
   }
 
-  _PoiInfo? _parsePoiMessage(String text) {
-    final trimmed = text.trim();
-    final match = RegExp(
-      r'^m:([\-0-9.]+),([\-0-9.]+)\|([^|]*)\|.*$',
-    ).firstMatch(trimmed);
-    if (match == null) return null;
-    final lat = double.tryParse(match.group(1) ?? '');
-    final lon = double.tryParse(match.group(2) ?? '');
-    if (lat == null || lon == null) return null;
-    final label = match.group(3) ?? '';
-    return _PoiInfo(lat: lat, lon: lon, label: label);
-  }
-
   Widget _buildPoiMessage(
     BuildContext context,
-    _PoiInfo poi,
+    MarkerPayload poi,
     Color textColor,
     Color metaColor,
-    double textScale, {
+    double textScale,
+    String senderName, {
     Widget? trailing,
   }) {
     return Row(
@@ -1949,13 +1940,23 @@ class _MessageBubble extends StatelessWidget {
           icon: Icon(Icons.location_on_outlined, color: textColor),
           padding: EdgeInsets.zero,
           constraints: const BoxConstraints(minWidth: 32, minHeight: 32),
-          onPressed: () {
+          onPressed: () async {
+            final selfName = context.read<MeshCoreConnector>().selfName ?? 'Me';
+            final fromName = message.isOutgoing ? selfName : senderName;
+            final key = buildSharedMarkerKey(
+              sourceId: sourceId,
+              label: poi.label,
+              fromName: fromName,
+              flags: poi.flags,
+              isChannel: false,
+            );
             Navigator.push(
               context,
               MaterialPageRoute(
                 builder: (context) => MapScreen(
-                  highlightPosition: LatLng(poi.lat, poi.lon),
+                  highlightPosition: poi.position,
                   highlightLabel: poi.label,
+                  highlightMarkerKey: key,
                 ),
               ),
             );
@@ -2136,11 +2137,3 @@ class _MessageBubble extends StatelessWidget {
     return '$hour:$minute';
   }
 }
-
-class _PoiInfo {
-  final double lat;
-  final double lon;
-  final String label;
-
-  const _PoiInfo({required this.lat, required this.lon, required this.label});
-}