3/25/1

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

@@ -71,11 +71,11 @@ class GoogleDriverMap extends StatelessWidget {
           },
           markers: {
             Marker(
-              markerId: MarkerId('MyLocation'.tr),
-              position: locationController.myLocation,
-              draggable: true,
-              icon: controller.carIcon,
-            ),
+                markerId: MarkerId('MyLocation'.tr),
+                position: locationController.myLocation,
+                draggable: true,
+                icon: controller.carIcon,
+                rotation: locationController.heading),
             Marker(
               markerId: MarkerId('start'.tr),
               position: controller.latLngpassengerLocation,

lib/views/home/Captin/orderCaptin/order_request_page.dart

@@ -1,5 +1,6 @@
 import 'package:SEFER/controller/home/captin/home_captain_controller.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
 import 'package:get/get.dart';
 import 'package:SEFER/constant/box_name.dart';
 import 'package:SEFER/controller/firebase/firbase_messge.dart';
@@ -61,8 +62,8 @@ class OrderRequestPage extends StatelessWidget {
     return MyScafolld(
         title: 'Order Details'.tr,
         body: [
-          Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
+          ListView(
+            // crossAxisAlignment: CrossAxisAlignment.start,
             children: [
               // SizedBox(height: 200, child: Text(pointsList.toString())),
               // Text(message.notification!.body.toString()),

lib/views/home/Captin/orderCaptin/order_speed_request.dart

@@ -296,7 +296,7 @@ class OrderSpeedRequest extends StatelessWidget {
                           FirebaseMessagesController()
                               .sendNotificationToPassengerToken(
                             'Apply Ride',
-                            arguments['DriverList'][9].toString(),
+                            'The ${box.read(BoxName.nameDriver)} ${'accepted your order'.tr}',
                             arguments['DriverList'][9].toString(),
                             // box.read(BoxName.tokenDriver).toString(),
                             bodyToPassenger,
@@ -338,17 +338,13 @@ class OrderSpeedRequest extends StatelessWidget {
                       ),
                       GetBuilder<OrderRequestController>(
                         builder: (timerController) {
-                          final isNearEnd =
-                              timerController.remainingTimeSpeed <=
-                                  5; // Define a threshold for "near end"
-
                           return Stack(
                             alignment: Alignment.center,
                             children: [
                               CircularProgressIndicator(
                                 value: timerController.progressSpeed,
                                 // Set the color based on the "isNearEnd" condition
-                                color: isNearEnd ? Colors.red : Colors.blue,
+                                color: Colors.blue,
                               ),
                               Text(
                                 '${timerController.remainingTimeSpeed}',

lib/views/home/map_widget.dart/apply_order_widget.dart

@@ -14,7 +14,8 @@ class ApplyOrderWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return GetBuilder<MapPassengerController>(builder: (controller) {
-      if (controller.statusRide == 'Apply') {
+      if (controller.statusRide == 'Apply' &&
+          controller.isSearchingWindow == false) {
         double _height = 250;
         return Positioned(
           bottom: 0,

lib/views/home/map_widget.dart/google_map_passenger_widget.dart

@@ -144,23 +144,29 @@ class GoogleMapPassengerWidget extends StatelessWidget {
                   zoom: 15,
                 ),
                 markers: {
-                  // controller.carMarkerAplied,
-                  for (var carLocation in controller.carsLocationByPassenger)
-                    Marker(
-                      // anchor: const Offset(4, 4),
-                      position: carLocation,
-                      icon: controller.carIcon,
-                      markerId: MarkerId(carLocation.toString()),
-                      rotation: controller.angleDegrees,
-                    ), ///////////////////
-                  // controller.carMarrkerAplied,
-                  for (var carLocation
-                      in controller.driverCarsLocationToPassengerAfterApplied)
-                    Marker(
+                  if (controller.statusRide != 'Apply' ||
+                      !controller.rideTimerBegin)
+                    for (var carLocation in controller.carLocationsModels)
+                      Marker(
                         // anchor: const Offset(4, 4),
-                        position: carLocation,
+                        position: LatLng(
+                          carLocation.latitude,
+                          carLocation.longitude,
+                        ),
                         icon: controller.carIcon,
-                        markerId: MarkerId(carLocation.toString())),
+                        markerId: MarkerId(carLocation.toString()),
+                        rotation: carLocation.heading,
+                      ), ///////////////////
+                  // controller.carMarrkerAplied,
+                  if (controller.statusRide == 'Apply')
+                    for (var carLocation
+                        in controller.driverCarsLocationToPassengerAfterApplied)
+                      Marker(
+                          // anchor: const Offset(4, 4),
+                          position: carLocation,
+                          icon: controller.carIcon,
+                          rotation: controller.headingList,
+                          markerId: MarkerId(carLocation.toString())),
                   for (int i = 1;
                       i < controller.coordinatesWithoutEmpty.length - 1;
                       i++)

lib/views/home/map_widget.dart/left_main_menu_icons.dart

@@ -115,7 +115,7 @@ GetBuilder<MapPassengerController> leftMainMenuIcons() {
                   // NotificationController()
                   //     .showNotification('Order', 'hi this is', 'tone1');
                   // Get.to(() => DriverCallPage());
-                  print(controller.polylineCoordinates.toString());
+                  print(controller.carLocationsModels);
                   // PassengerCallPage(
                   //       channelName: '',
                   //       token: '',