25-6-23/1

lib/views/home/Captin/mapDriverWidgets/passenger_info_window.dart

@@ -13,8 +13,11 @@ import 'package:sefer_driver/controller/firebase/firbase_messge.dart';
 import 'package:sefer_driver/controller/home/captin/map_driver_controller.dart';
 import 'package:sefer_driver/views/widgets/elevated_btn.dart';
 
+import '../../../../constant/box_name.dart';
 import '../../../../constant/style.dart';
 import '../../../../controller/functions/launch.dart';
+import '../../../../main.dart';
+import '../../../../print.dart';
 
 class PassengerInfoWindow extends StatelessWidget {
   const PassengerInfoWindow({super.key});
@@ -179,7 +182,7 @@ class PassengerInfoWindow extends StatelessWidget {
                                         if (await controller
                                                 .calculateDistanceBetweenDriverAndPassengerLocation() <
                                             140) {
-                                          FirebaseMessagesController()
+                                          Get.find<FirebaseMessagesController>()
                                               .sendNotificationToDriverMAP(
                                             'Hi ,I Arrive your site',
                                             'I Arrive at your site'.tr,
@@ -245,7 +248,7 @@ class PassengerInfoWindow extends StatelessWidget {
                                   MyDialog().getDialog(
                                       'Are you sure to cancel?'.tr, '',
                                       () async {
-                                    FirebaseMessagesController()
+                                    Get.find<FirebaseMessagesController>()
                                         .sendNotificationToDriverMAP(
                                       'Driver Cancelled Your Trip',
                                       'You will need to pay the cost to the driver, or it will be deducted from your next trip'
@@ -254,6 +257,9 @@ class PassengerInfoWindow extends StatelessWidget {
                                       [],
                                       'cancel.wav',
                                     );
+                                    Log.print(
+                                        'rideStatus from passenge info 261 : ${box.read(BoxName.rideStatus)}');
+                                    box.write(BoxName.rideStatus, 'Cancel');
                                     await controller
                                         .addWaitingTimeCostFromPassengerToDriverWallet();
                                     controller.isdriverWaitTimeEnd = false;
@@ -296,7 +302,7 @@ class PassengerInfoWindow extends StatelessWidget {
         _buildMessageTile(
           text: "Where are you, sir?".tr,
           onTap: () {
-            FirebaseMessagesController().sendNotificationToDriverMAP(
+            Get.find<FirebaseMessagesController>().sendNotificationToDriverMAP(
               'message From Driver',
               "Where are you, sir?".tr,
               controller.tokenPassenger,
@@ -309,7 +315,7 @@ class PassengerInfoWindow extends StatelessWidget {
         _buildMessageTile(
           text: "I've been trying to reach you but your phone is off.".tr,
           onTap: () {
-            FirebaseMessagesController().sendNotificationToDriverMAP(
+            Get.find<FirebaseMessagesController>().sendNotificationToDriverMAP(
               'message From Driver',
               "I've been trying to reach you but your phone is off.".tr,
               controller.tokenPassenger,
@@ -324,7 +330,7 @@ class PassengerInfoWindow extends StatelessWidget {
               "Please don't be late, I'm waiting for you at the specified location."
                   .tr,
           onTap: () {
-            FirebaseMessagesController().sendNotificationToDriverMAP(
+            Get.find<FirebaseMessagesController>().sendNotificationToDriverMAP(
               'message From Driver',
               "Please don't be late, I'm waiting for you at the specified location."
                   .tr,
@@ -338,7 +344,7 @@ class PassengerInfoWindow extends StatelessWidget {
         _buildMessageTile(
           text: "Please don't be late".tr,
           onTap: () {
-            FirebaseMessagesController().sendNotificationToDriverMAP(
+            Get.find<FirebaseMessagesController>().sendNotificationToDriverMAP(
               'message From Driver',
               "Please don't be late".tr,
               controller.tokenPassenger,
@@ -364,7 +370,8 @@ class PassengerInfoWindow extends StatelessWidget {
             ),
             IconButton(
               onPressed: () {
-                FirebaseMessagesController().sendNotificationToDriverMAP(
+                Get.find<FirebaseMessagesController>()
+                    .sendNotificationToDriverMAP(
                   'message From Driver',
                   controller.messageToPassenger.text,
                   controller.tokenPassenger,

lib/views/home/Captin/mapDriverWidgets/sos_connect.dart

@@ -171,7 +171,7 @@ class SosConnect extends StatelessWidget {
       } else {
         throw 'Could not launch google maps';
       }
-    };
+    }();
   }
 
   void _sendWhatsAppMessage(MapDriverController mapDriverController) {