fix : twice back press for exit application on live stock

packages/livestock/lib/presentation/page/map/widget/map_widget/logic.dart

@@ -67,7 +67,6 @@ class MapWidgetLogic extends GetxController with GetTickerProviderStateMixin {
     super.onReady();
     determineCurrentPosition();
     getLoc();
-
   }
 
   @override
@@ -189,13 +188,12 @@ class MapWidgetLogic extends GetxController with GetTickerProviderStateMixin {
       final newLat = currentPosition.latitude + (dy / 111000.0);
 
       // 1 درجه lon ≈ 111km * cos(lat)
-      final newLng = currentPosition.longitude +
+      final newLng =
-          (dx / (111000.0 * cos(currentPosition.latitude * pi / 180)));
+          currentPosition.longitude + (dx / (111000.0 * cos(currentPosition.latitude * pi / 180)));
 
       locations.add(LatLng(newLat, newLng));
     }
 
     return locations;
   }
-
 }

packages/livestock/lib/presentation/page/root/logic.dart

@@ -3,9 +3,6 @@ import 'dart:math';
 
 import 'package:flutter/material.dart';
 import 'package:rasadyar_core/core.dart';
-import 'package:rasadyar_livestock/data/repository/livestock/livestock_repository.dart';
-import 'package:rasadyar_livestock/data/repository/livestock/livestock_repository_imp.dart';
-import 'package:rasadyar_livestock/injection/live_stock_di.dart';
 import 'package:rasadyar_livestock/presentation/page/map/view.dart';
 import 'package:rasadyar_livestock/presentation/page/profile/view.dart';
 import 'package:rasadyar_livestock/presentation/page/request_tagging/view.dart';
@@ -14,9 +11,13 @@ import 'package:rasadyar_livestock/presentation/routes/app_pages.dart';
 
 class RootLogic extends GetxController {
   List<Widget> pages = [
-    MapPage(),
     Navigator(
       key: Get.nestedKey(0),
+      onGenerateRoute: (settings) => GetPageRoute(page: () => MapPage()),
+    ),
+
+    Navigator(
+      key: Get.nestedKey(1),
       initialRoute: LiveStockRoutes.requests,
       onGenerateRoute: (settings) {
         switch (settings.name) {
@@ -30,7 +31,10 @@ class RootLogic extends GetxController {
       },
     ),
 
-    ProfilePage(),
+    Navigator(
+      key: Get.nestedKey(2),
+      onGenerateRoute: (settings) => GetPageRoute(page: () => ProfilePage()),
+    ),
   ];
 
   RxInt currentIndex = 0.obs;
@@ -48,7 +52,7 @@ class RootLogic extends GetxController {
       }
     });
 
-  /*  GetIt.instance.allReady().then((value) async {
+    /*  GetIt.instance.allReady().then((value) async {
       await diLiveStock.get<LivestockRepositoryImp>().addLocations(generateRandomPoints());
     });*/
   }

packages/livestock/lib/presentation/page/root/view.dart

@@ -1,40 +1,41 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:rasadyar_core/core.dart';
 
 import 'logic.dart';
 
 class RootPage extends GetView<RootLogic> {
-  const RootPage({super.key});
+  RootPage({super.key});
+
+  DateTime? _lastBackPressed;
 
   @override
   Widget build(BuildContext context) {
     return ObxValue((currentIndex) {
       return PopScope(
         canPop: false,
-        onPopInvokedWithResult: (didPop, result) {
+        onPopInvokedWithResult: (didPop, result) async {
-          final navigatorKey = Get.nestedKey(currentIndex);
+          final nestedKey = Get.nestedKey(controller.currentIndex.value);
-          eLog('Pop invoked with result: $result, didPop: $didPop');
+          final currentNavigator = nestedKey?.currentState;
-          navigatorKey?.currentState?.pop();
 
-          /*eLog('Pop invoked with result: $result, didPop: $didPop');
+          if (currentNavigator?.canPop() ?? false) {
-          iLog(Get.currentRoute);
+            currentNavigator?.pop();
-          iLog(Get.previousRoute);
+          } else {
-
+            final now = DateTime.now();
-          final navigatorKey = Get.nestedKey(currentIndex);
+            if (_lastBackPressed == null ||
-
+                now.difference(_lastBackPressed!) > Duration(seconds: 2)) {
-          if (currentIndex.value == 0 &&
+              _lastBackPressed = now;
-
+              Get.snackbar(
-              navigatorKey != null &&
+                'خروج از برنامه',
-              navigatorKey.currentState != null) {
+                'برای خروج دوباره بازگشت را بزنید',
-            if (navigatorKey.currentState!.canPop()) {
+                snackPosition: SnackPosition.TOP,
-              navigatorKey.currentState!.pop();
+                duration: Duration(seconds: 2),
-              return;
+                backgroundColor: AppColor.warning,
+              );
+            } else {
+              await SystemNavigator.pop();
             }
-
+          }
-            if (!didPop) {
-              return;
-            }
-          }*/
         },
 
         child: Scaffold(

packages/livestock/lib/presentation/routes/app_routes.dart

@@ -6,6 +6,7 @@ sealed class LiveStockRoutes {
   static const auth = '/AuthLiveStock';
   static const init = '/liveStock';
   static const requests = '/requests';
+  static const map = '/map';
   static const profile = '/profile';
 
   //static const requestTagging = '$init/tagging';