From 087b102d9aeb8a9afc76ca539bbac128ef44d7de Mon Sep 17 00:00:00 2001
From: Hamza Aleghwairyeen <hamzaaleghwairyeen@Hamzas-MBP.lan>
Date: Wed, 3 Apr 2024 01:59:19 +0300
Subject: [PATCH] 4/3/2

---
 lib/controller/home/captin/map_driver_controller.dart    | 9 +++++----
 lib/views/home/Captin/driver_map_page.dart               | 6 ++++--
 .../Captin/mapDriverWidgets/driver_end_ride_bar.dart     | 3 ++-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/controller/home/captin/map_driver_controller.dart b/lib/controller/home/captin/map_driver_controller.dart
index f2a942c..dec3f39 100644
--- a/lib/controller/home/captin/map_driver_controller.dart
+++ b/lib/controller/home/captin/map_driver_controller.dart
@@ -109,9 +109,9 @@ class MapDriverController extends GetxController {
       CameraUpdate.newLatLng(Get.find<LocationController>().myLocation),
     );
     // Set up a timer or interval to trigger the marker update every 3 seconds.
-    timer = Timer.periodic(const Duration(seconds: 1), (_) {
-      updateMarker();
-    });
+    // timer = Timer.periodic(const Duration(seconds: 1), (_) {
+    //   updateMarker();
+    // });
   }
 
   void changeStatusDriver() {
@@ -598,6 +598,7 @@ class MapDriverController extends GetxController {
       progressTimerRideBegin = i / durationOfRide;
       remainingTimeTimerRideBegin = durationOfRide - i;
       remainingTimeTimerRideBegin < 60 ? driverEndPage = 160 : 100;
+      updateMarker();
       if (remainingTimeTimerRideBegin < 120) {
         // to make driver available on last 2 minute in his trip
         box.write(BoxName.statusDriverLocation, 'off');
@@ -828,7 +829,7 @@ class MapDriverController extends GetxController {
   late Duration durationToAdd;
   int hours = 0;
   int minutes = 0;
-  late String carType = '';
+  late String carType;
   late String kazan;
   @override
   void onInit() async {
diff --git a/lib/views/home/Captin/driver_map_page.dart b/lib/views/home/Captin/driver_map_page.dart
index c20cd0c..872026a 100644
--- a/lib/views/home/Captin/driver_map_page.dart
+++ b/lib/views/home/Captin/driver_map_page.dart
@@ -16,12 +16,14 @@ import 'mapDriverWidgets/sos_connect.dart';
 class PassengerLocationMapPage extends StatelessWidget {
   PassengerLocationMapPage({super.key});
   final LocationController locationController = Get.put(LocationController());
+  final MapDriverController mapDriverController =
+      Get.put(MapDriverController());
   @override
   Widget build(BuildContext context) {
-    Get.put(MapDriverController());
+    // Get.put(MapDriverController());
 
     return MyScafolld(
-        title: Get.find<MapDriverController>().carType,
+        title: 'Map Passenger'.tr + mapDriverController.carType,
         body: [
           GoogleDriverMap(locationController: locationController),
           const PassengerInfoWindow(),
diff --git a/lib/views/home/Captin/mapDriverWidgets/driver_end_ride_bar.dart b/lib/views/home/Captin/mapDriverWidgets/driver_end_ride_bar.dart
index 795113b..fbbc4a2 100644
--- a/lib/views/home/Captin/mapDriverWidgets/driver_end_ride_bar.dart
+++ b/lib/views/home/Captin/mapDriverWidgets/driver_end_ride_bar.dart
@@ -70,7 +70,8 @@ GetBuilder<MapDriverController> driverEndRideBar() {
                         Text(mapDriverController.price.toStringAsFixed(0)),
                       ],
                     ),
-                    mapDriverController.carType == 'Free Ride'
+                    mapDriverController.carType == 'Free Ride' ||
+                            mapDriverController.carType == 'Comfort'
                         ? Row(
                             mainAxisAlignment: MainAxisAlignment.center,
                             children: [