Update map_camera.dart

lib/src/map_camera.dart

@@ -1,7 +1,7 @@
 import 'package:intl/intl.dart';
 import 'dart:ui' as ui;
 import 'package:latlong2/latlong.dart' as lat;
-import '../../map_camera_flutter.dart';
+import 'package:map_camera_flutter/map_camera_flutter.dart';
 
 ///import 'package:your_app/map_camera_flutter.dart'; // Import the file where the MapCameraLocation widget is defined
 
@@ -103,19 +103,7 @@ class _MapCameraLocationState extends State<MapCameraLocation> {
 
   /// Represents geocoded location information.
 
-  String? latitudeServer;
+  LocationData? locationData;
-
-  /// Latitude value of the current location as a string.
-
-  String? longitudeServer;
-
-  /// Longitude value of the current location as a string.
-
-  String? locationName;
-
-  /// Name of the current location as a string.
-
-  String? subLocation;
 
   /// SubLocation of the current location as a string.
 
@@ -123,18 +111,18 @@ class _MapCameraLocationState extends State<MapCameraLocation> {
   ImageAndLocationData getImageAndLocationData() {
     return ImageAndLocationData(
       imagePath: cameraImagePath?.path,
-      latitude: latitudeServer,
+      locationData: locationData,
-      longitude: longitudeServer,
-      locationName: locationName,
-      subLocation: subLocation,
     );
   }
 
+  Timer? _positionTimer;
   @override
   void initState() {
     super.initState();
-    Timer.periodic(const Duration(seconds: 1), (timer) async {
+    _positionTimer = Timer.periodic(const Duration(seconds: 1), (timer) async {
+      if (mounted) {
         await updatePosition(context);
+      }
     });
 
     // Initialize the camera controller
@@ -154,9 +142,24 @@ class _MapCameraLocationState extends State<MapCameraLocation> {
   void dispose() {
     _controller.dispose();
     _followCurrentLocationStreamController.close();
+    _positionTimer?.cancel();
     super.dispose();
   }
 
+
+  @override
+  void setState(fn) {
+    if (mounted) {
+      super.setState(fn);
+    } else {
+      WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
+        if (mounted) {
+          super.setState(fn);
+        }
+      });
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -165,7 +168,8 @@ class _MapCameraLocationState extends State<MapCameraLocation> {
         future: _initializeControllerFuture,
         builder: (context, snapshot) {
           if (snapshot.connectionState == ConnectionState.done) {
-            return RepaintBoundary(
+            return Center(
+              child: RepaintBoundary(
                 key: globalKey,
                 child: Stack(
                   children: [
@@ -185,18 +189,19 @@ class _MapCameraLocationState extends State<MapCameraLocation> {
                               crossAxisAlignment: CrossAxisAlignment.start,
                               children: [
                                 Padding(
-                                padding:
+                                  padding: const EdgeInsets.symmetric(
-                                    const EdgeInsets.symmetric(horizontal: 8.0),
+                                      horizontal: 8.0),
                                   child: Card(
                                     elevation: 3,
                                     shape: RoundedRectangleBorder(
-                                      borderRadius: BorderRadius.circular(8.0)),
+                                        borderRadius:
+                                            BorderRadius.circular(8.0)),
                                     child: SizedBox(
                                       // height: 130,
                                       width: 120,
                                       child: Padding(
                                         padding: const EdgeInsets.all(5.0),
-                                      child: latitudeServer == null
+                                        child: locationData == null
                                             ? const Center(
                                                 child:
                                                     CircularProgressIndicator())
@@ -250,7 +255,8 @@ class _MapCameraLocationState extends State<MapCameraLocation> {
                                           CrossAxisAlignment.start,
                                       children: [
                                         Text(
-                                        locationName ?? "Loading...",
+                                          locationData?.locationName ??
+                                              "Loading...",
                                           maxLines: 1,
                                           overflow: TextOverflow.ellipsis,
                                           softWrap: false,
@@ -263,7 +269,8 @@ class _MapCameraLocationState extends State<MapCameraLocation> {
                                           height: 5,
                                         ),
                                         Text(
-                                        subLocation ?? "Loading ..",
+                                          locationData?.subLocation ??
+                                              "Loading ..",
                                           maxLines: 2,
                                           overflow: TextOverflow.ellipsis,
                                           softWrap: false,
@@ -276,7 +283,7 @@ class _MapCameraLocationState extends State<MapCameraLocation> {
                                           height: 5,
                                         ),
                                         Text(
-                                        "Lat ${latitudeServer ?? "Loading.."}",
+                                          "Lat ${locationData?.latitude ?? "Loading.."}",
                                           maxLines: 2,
                                           overflow: TextOverflow.ellipsis,
                                           softWrap: false,
@@ -289,7 +296,7 @@ class _MapCameraLocationState extends State<MapCameraLocation> {
                                           height: 5,
                                         ),
                                         Text(
-                                        "Long ${longitudeServer ?? "Loading.."}",
+                                          "Long ${locationData?.longitude ?? "Loading.."}",
                                           maxLines: 2,
                                           overflow: TextOverflow.ellipsis,
                                           softWrap: false,
@@ -326,6 +333,7 @@ class _MapCameraLocationState extends State<MapCameraLocation> {
                     ),
                   ],
                 ),
+              ),
             );
           } else {
             return const Center(child: CircularProgressIndicator());
@@ -386,10 +394,7 @@ class _MapCameraLocationState extends State<MapCameraLocation> {
       if (widget.onImageCaptured != null) {
         ImageAndLocationData data = ImageAndLocationData(
           imagePath: imgFile.path,
-          latitude: latitudeServer,
+          locationData: locationData,
-          longitude: longitudeServer,
-          locationName: locationName,
-          subLocation: subLocation,
         );
         widget.onImageCaptured!(data);
       }
@@ -411,39 +416,43 @@ class _MapCameraLocationState extends State<MapCameraLocation> {
       final placeMarks =
           await placemarkFromCoordinates(position.latitude, position.longitude);
 
+      LocationData locationData;
       if (placeMarks.isNotEmpty) {
         final placeMark = placeMarks.first;
 
+        locationData = LocationData(
+            latitude: position.latitude.toString(),
+            longitude: position.longitude.toString(),
+            locationName:
+                "${placeMark.locality ?? ""}, ${placeMark.administrativeArea ?? ""}, ${placeMark.country ?? ""}",
+            subLocation:
+                "${placeMark.street ?? ""}, ${placeMark.thoroughfare ?? ""} ${placeMark.administrativeArea ?? ""}");
+      } else {
+        locationData = LocationData(
+            longitude: null,
+            latitude: null,
+            locationName: 'No Location Data',
+            subLocation: "");
+      }
+      if (locationData != this.locationData) {
         // Update the state variables with the retrieved location data
         setState(() {
-          latitudeServer = position.latitude.toString();
+          this.locationData = locationData;
-          longitudeServer = position.longitude.toString();
-          locationName =
-              "${placeMark.locality ?? ""}, ${placeMark.administrativeArea ?? ""}, ${placeMark.country ?? ""}";
-          subLocation =
-              "${placeMark.street ?? ""}, ${placeMark.thoroughfare ?? ""} ${placeMark.administrativeArea ?? ""}";
         });
+      }
 
       if (kDebugMode) {
         print(
-              "Latitude: $latitudeServer, Longitude: $longitudeServer, Location: $locationName");
+            "Latitude: ${locationData.latitude}, Longitude: ${locationData.longitude}, Location: ${locationData.locationName}");
-        }
-      } else {
-        // Handle case when no placeMark is available
-        setState(() {
-          latitudeServer = null;
-          longitudeServer = null;
-          locationName = 'No Location Data';
-          subLocation = '';
-        });
       }
     } catch (e) {
       // Handle any errors that occurred during location retrieval
       setState(() {
-        latitudeServer = null;
+        locationData = LocationData(
-        longitudeServer = null;
+            longitude: null,
-        locationName = 'Error Retrieving Location';
+            latitude: null,
-        subLocation = '';
+            locationName: 'Error Retrieving Location',
+            subLocation: "");
       });
     }
   }