From 304c3896692f5ad80a4e4a8d904a4fc0f1d7d33c Mon Sep 17 00:00:00 2001
From: Winston Lowe <wel97459@gmail.com>
Date: Fri, 20 Feb 2026 23:41:20 -0800
Subject: [PATCH] Refactor label display in Line Of Sight and Map screens for
 improved alignment and styling (#204)

---
 lib/screens/line_of_sight_map_screen.dart | 44 +++++++++----------
 lib/screens/map_screen.dart               | 52 ++++++++++-------------
 2 files changed, 44 insertions(+), 52 deletions(-)

diff --git a/lib/screens/line_of_sight_map_screen.dart b/lib/screens/line_of_sight_map_screen.dart
index a2d4b4a..b073685 100644
--- a/lib/screens/line_of_sight_map_screen.dart
+++ b/lib/screens/line_of_sight_map_screen.dart
@@ -802,29 +802,27 @@ class _LineOfSightMapScreenState extends State<LineOfSightMapScreen> {
             alignment: Alignment.topCenter,
             child: IgnorePointer(
               child: Transform.translate(
-                offset: const Offset(0, -26),
-                child: Container(
-                  padding: const EdgeInsets.symmetric(
-                    horizontal: 6,
-                    vertical: 2,
-                  ),
-                  decoration: BoxDecoration(
-                    color: Colors.black54,
-                    borderRadius: BorderRadius.circular(8),
-                  ),
-                  child: SizedBox(
-                    width: 96,
-                    child: FittedBox(
-                      fit: BoxFit.scaleDown,
-                      alignment: Alignment.centerLeft,
-                      child: Text(
-                        endpoint.label,
-                        maxLines: 1,
-                        overflow: TextOverflow.ellipsis,
-                        style: const TextStyle(
-                          color: Colors.white,
-                          fontSize: 10,
-                        ),
+                offset: const Offset(0, -20),
+                child: FittedBox(
+                  fit: BoxFit.contain,
+                  child: Container(
+                    padding: const EdgeInsets.symmetric(
+                      horizontal: 6,
+                      vertical: 2,
+                    ),
+                    decoration: BoxDecoration(
+                      color: Colors.black54,
+                      borderRadius: BorderRadius.circular(8),
+                    ),
+                    alignment: Alignment.center,
+                    child: Text(
+                      endpoint.label,
+                      maxLines: 1,
+                      overflow: TextOverflow.ellipsis,
+                      style: const TextStyle(
+                        color: Colors.white,
+                        fontSize: 11,
+                        fontWeight: FontWeight.w500,
                       ),
                     ),
                   ),
diff --git a/lib/screens/map_screen.dart b/lib/screens/map_screen.dart
index ce7a7d1..77ec98c 100644
--- a/lib/screens/map_screen.dart
+++ b/lib/screens/map_screen.dart
@@ -462,13 +462,10 @@ class _MapScreenState extends State<MapScreen> {
                                 ],
                               ),
                               alignment: Alignment.center,
-                              child: Text(
-                                context.l10n.pathTrace_you,
-                                style: const TextStyle(
-                                  color: Colors.black,
-                                  fontWeight: FontWeight.bold,
-                                  fontSize: 12,
-                                ),
+                              child: const Icon(
+                                Icons.person_pin_circle,
+                                color: Colors.white,
+                                size: 20,
                               ),
                             ),
                           ),
@@ -480,7 +477,7 @@ class _MapScreenState extends State<MapScreen> {
                               connector.selfLatitude!,
                               connector.selfLongitude!,
                             ),
-                            label: connector.deviceDisplayName,
+                            label: context.l10n.pathTrace_you,
                           ),
                       ],
                     ),
@@ -598,27 +595,24 @@ class _MapScreenState extends State<MapScreen> {
       alignment: Alignment.topCenter,
       child: IgnorePointer(
         child: Transform.translate(
-          offset: const Offset(0, -26),
-          child: Container(
-            padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
-            decoration: BoxDecoration(
-              color: Colors.black54,
-              borderRadius: BorderRadius.circular(8),
-            ),
-            child: SizedBox(
-              width: 96,
-              child: FittedBox(
-                fit: BoxFit.scaleDown,
-                alignment: Alignment.centerLeft,
-                child: Text(
-                  label,
-                  maxLines: 1,
-                  overflow: TextOverflow.ellipsis,
-                  style: const TextStyle(
-                    color: Colors.white,
-                    fontSize: 11,
-                    fontWeight: FontWeight.w500,
-                  ),
+          offset: const Offset(0, -20),
+          child: FittedBox(
+            fit: BoxFit.contain,
+            child: Container(
+              padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
+              decoration: BoxDecoration(
+                color: Colors.black54,
+                borderRadius: BorderRadius.circular(8),
+              ),
+              alignment: Alignment.center,
+              child: Text(
+                label,
+                maxLines: 1,
+                overflow: TextOverflow.ellipsis,
+                style: const TextStyle(
+                  color: Colors.white,
+                  fontSize: 11,
+                  fontWeight: FontWeight.w500,
                 ),
               ),
             ),