Update: 2026-07-06 04:21:17

siro_rider/lib/views/home/navigation/navigation_view.dart

@@ -43,23 +43,26 @@ class NavigationView extends StatelessWidget {
           builder: (_) => Stack(
             children: [
               // ── 1. Map Layer ──────────────────────────────────────────────
-              IntaleqMap(
+              Listener(
-                apiKey: Env.mapSaasKey,
+                onPointerDown: (_) => c.onUserPanned(),
-                onMapCreated: c.onMapCreated,
+                child: IntaleqMap(
-                onStyleLoaded: c.onStyleLoaded,
+                  apiKey: Env.mapSaasKey,
-                onLongPress: (latlng) => c.onMapLongPressed(Point(0, 0), latlng),
+                  onMapCreated: c.onMapCreated,
-                onTap: (latlng) => c.onMapTapped(Point(0, 0), latlng),
+                  onStyleLoaded: c.onStyleLoaded,
-                markers: c.markers,
+                  onLongPress: (latlng) => c.onMapLongPressed(Point(0, 0), latlng),
-                polylines: c.polylines,
+                  onTap: (latlng) => c.onMapTapped(Point(0, 0), latlng),
-                circles: c.circles,
+                  markers: c.markers,
-                polygons: c.polygons,
+                  polylines: c.polylines,
-                mapType: Get.isDarkMode
+                  circles: c.circles,
-                    ? IntaleqMapType.normal
+                  polygons: c.polygons,
-                    : IntaleqMapType.light,
+                  mapType: Get.isDarkMode
-                initialCameraPosition: CameraPosition(
+                      ? IntaleqMapType.normal
-                    target: c.myLocation ?? const LatLng(33.5138, 36.2765),
+                      : IntaleqMapType.light,
-                    zoom: 16.0),
+                  initialCameraPosition: CameraPosition(
-                myLocationEnabled: false,
+                      target: c.myLocation ?? const LatLng(33.5138, 36.2765),
+                      zoom: 16.0),
+                  myLocationEnabled: false,
+                ),
               ),
 
               // ── 2. Top UI (Explore Mode) ──────────────────────────────────
@@ -89,10 +92,10 @@ class NavigationView extends StatelessWidget {
               _LocationPickerOverlay(controller: c),
 
               // ── 10. Recenter Button ───────────────────────────────────────
-              if (!c.isCameraLocked && !c.isNavigating)
+              if (!c.isCameraLocked)
                 Positioned(
                   right: 16,
-                  bottom: 250,
+                  bottom: c.isNavigating ? 150 : 250,
                   child: _buildMapFAB(
                     icon: Icons.my_location_rounded,
                     onTap: () => c.relockCameraToUser(),