9/23/1

lib/views/home/map_page.dart

@@ -197,6 +197,13 @@ class MapPage extends StatelessWidget {
                               position: carLocation,
                               icon: controller.carIcon,
                               markerId: MarkerId(carLocation.toString())),
+                        for (var carLocation in controller
+                            .driverCarsLocationToPassengerAfterApplied)
+                          Marker(
+                              // anchor: const Offset(4, 4),
+                              position: carLocation,
+                              icon: controller.carIcon,
+                              markerId: MarkerId(carLocation.toString())),
                         Marker(
                           markerId: MarkerId('MyLocation'.tr),
                           position: controller.mylocation,
@@ -287,6 +294,24 @@ class MapPage extends StatelessWidget {
             const PaymentMethodPage(),
             timerForCancellTripFromPassenger(),
             const DriverTimeArrivePassengerPage(),
+            GetBuilder<MapController>(builder: (controller) {
+              if (controller.remainingTime == 0
+                  //&&
+                  // controller.newTime1.isBefore(
+                  // controller.currentTime.add(const Duration(minutes: 2)),
+                  // )
+                  ) {
+                return Center(
+                  child: Container(
+                    decoration: AppStyle.boxDecoration,
+                    height: 100,
+                    width: 100,
+                  ),
+                );
+              } else {
+                return const SizedBox();
+              }
+            }),
           ],
         ),
       ),

lib/views/home/map_widget.dart/driver_time_arrive_passenger.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:ride/views/home/map_widget.dart/hexegone_clipper.dart';
+import 'package:intl/intl.dart';
+// import 'package:intl/intl.dart';
 
 import '../../../constant/style.dart';
 import '../../../controller/home/map_page_controller.dart';
@@ -13,12 +14,9 @@ class DriverTimeArrivePassengerPage extends StatelessWidget {
     return GetBuilder<MapController>(
       builder: (controller) {
         return controller.remainingTime == 0
-            ? Positioned.directional(
+            ? Positioned(
                 bottom: Get.height * .35,
-                end: Get.width * .05,
-                textDirection: Get.locale!.languageCode == 'ar'
-                    ? TextDirection.rtl
-                    : TextDirection.ltr,
+                right: Get.width * .05,
                 child: Stack(
                   alignment: Alignment.center,
                   children: [
@@ -37,7 +35,7 @@ class DriverTimeArrivePassengerPage extends StatelessWidget {
                                 style: AppStyle.title,
                               ),
                               Text(
-                                controller.newTime1.toString(),
+                                " ${DateFormat('h:mm a').format(controller.newTime)}",
                                 style: AppStyle.title,
                               ),
                             ],