10/10/1

lib/views/home/map_page.dart

@@ -5,8 +5,9 @@ import 'package:get/get.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
 import 'package:ride/constant/colors.dart';
 import 'package:ride/constant/style.dart';
-import 'package:ride/controller/home/map_page_controller.dart';
+import 'package:ride/controller/home/map_passenger_controller.dart';
 import 'package:ride/views/home/map_widget.dart/cancel_raide_page.dart';
+import 'package:ride/views/home/map_widget.dart/ride_begin_passenger.dart';
 import 'package:ride/views/widgets/circle_container.dart';
 import 'package:ride/views/widgets/elevated_btn.dart';
 import 'package:ride/views/widgets/mycircular.dart';
@@ -30,7 +31,7 @@ class MapPage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    Get.put(MapController());
+    Get.put(MapPassengerController());
     Get.put(MyMenuController());
     return Scaffold(
       // appBar: AppBar(),
@@ -65,7 +66,7 @@ class MapPage extends StatelessWidget {
       body: SafeArea(
         child: Stack(
           children: [
-            GetBuilder<MapController>(
+            GetBuilder<MapPassengerController>(
               builder: (controller) => controller.isLoading
                   ? const MyCircularProgressIndicator()
                   : GoogleMap(
@@ -307,14 +308,15 @@ class MapPage extends StatelessWidget {
             const MenuIconMapPageWidget(),
             buttomSheetMapPage(),
             hexagonClipper(),
-            cancelRidePage(),
+
             const CancelRidePageShow(),
             const CashConfirmPageShown(),
             const PaymentMethodPage(),
             timerForCancelTripFromPassenger(),
             // const DriverTimeArrivePassengerPage(),
             const TimerToPassengerFromDriver(),
-            // const PassengerInfoWindow()
+            const RideBeginPassenger(),
+            cancelRidePage(),
           ],
         ),
       ),
@@ -329,7 +331,7 @@ class CancelRidePageShow extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return GetBuilder<MapController>(
+    return GetBuilder<MapPassengerController>(
         builder: (controller) =>
             (controller.data.isNotEmpty && controller.remainingTime > 0)
                 // ||
@@ -367,7 +369,7 @@ class PickerIconOnMap extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return GetBuilder<MapController>(
+    return GetBuilder<MapPassengerController>(
         builder: (controller) => Positioned(
               bottom: 0,
               top: 0,