8-18/1

lib/views/home/map_page.dart

@@ -3,13 +3,17 @@ import 'package:get/get.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
 import 'package:ride/constant/colors.dart';
 import 'package:ride/controller/home/map_page_controller.dart';
+import 'package:ride/views/home/map_widget.dart/cancel_raide_page.dart';
+import 'package:ride/views/widgets/circle_container.dart';
 import 'package:ride/views/widgets/mycircular.dart';
 
 import '../../controller/home/menu_controller.dart';
 import 'map_widget.dart/buttom_sheet_map_show.dart';
+import 'map_widget.dart/cash_confirm_bottom_page.dart';
 import 'map_widget.dart/main_bottom_Menu_map.dart';
 import 'map_widget.dart/map_menu_widget.dart';
 import 'map_widget.dart/menu_map_page.dart';
+import 'map_widget.dart/payment_method.page.dart';
 import 'map_widget.dart/picker_animation_container.dart';
 
 class MapPage extends StatelessWidget {
@@ -153,11 +157,29 @@ class MapPage extends StatelessWidget {
                 )),
           ),
           const PickerIconOnMap(),
-          PickerAnimtionContainerFormPlaces(),
-          // MainBottomMenuMap(),
+          // PickerAnimtionContainerFormPlaces(),
+          MainBottomMenuMap(),
           const MapMenuWidget(),
           const MenuIconMapPageWidget(),
-          buttomSheetMapPage()
+          buttomSheetMapPage(),
+          cancelRidePage(),
+          GetBuilder<MapController>(
+              builder: (controller) => controller.data.isNotEmpty
+                  ? Positioned(
+                      right: 5,
+                      top: 55,
+                      child: GestureDetector(
+                        onTap: () {
+                          controller.changeCancelRidePageShow();
+                        },
+                        child: const Icon(
+                          Icons.clear,
+                          size: 30,
+                        ),
+                      ))
+                  : const SizedBox()),
+          CashConfirmPageShown(),
+          PaymentMethodPage()
         ],
       ),
     );