Update: 2026-07-11 05:39:23

siro_rider/lib/views/home/map_page_passenger.dart

@@ -15,7 +15,7 @@ import '../../views/home/map_widget.dart/ride_begin_passenger.dart';
 
 import '../../controller/home/menu_controller.dart';
 import 'map_widget.dart/apply_order_widget.dart';
-import 'map_widget.dart/buttom_sheet_map_show.dart';
+import 'map_widget.dart/legacy_destination_bottom_sheet.dart';
 import 'map_widget.dart/car_details_widget_to_go.dart';
 import 'map_widget.dart/cash_confirm_bottom_page.dart';
 import 'map_widget.dart/google_map_passenger_widget.dart';
@@ -23,8 +23,8 @@ import 'map_widget.dart/left_main_menu_icons.dart';
 import 'route_planner/route_planner.dart';
 import 'map_widget.dart/map_menu_widget.dart';
 import '../../controller/functions/package_info.dart';
-import 'map_widget.dart/passengerRideLoctionWidget.dart';
-import 'map_widget.dart/payment_method.page.dart';
+import 'map_widget.dart/passenger_ride_location_widget.dart';
+import 'map_widget.dart/payment_method_page.dart';
 import 'map_widget.dart/points_page_for_rider.dart';
 import 'map_widget.dart/ride_from_start_app.dart';
 import 'map_widget.dart/searching_captain_window.dart';
@@ -65,35 +65,26 @@ class MapPagePassenger extends StatelessWidget {
             // OsmMapPassengerWidget(),
             leftMainMenuIcons(),
             // PaymobPackage(),
+            // ── New Route Planner ──
             const RpCenterPin(),
-            // PickerAnimtionContainerFormPlaces(),
             const RoutePlannerSheet(),
-            // NewMainBottomSheet(),
-
-            buttomSheetMapPage(),
             CarDetailsTypeToChoose(),
             // const HeaderDestination(),
             const BurcMoney(),
             // const PromoCode(),
             ApplyOrderWidget(),
             const MapMenuWidget(),
-            // hexagonClipper(),
             const CancelRidePageShow(),
             CashConfirmPageShown(),
             const PaymentMethodPage(),
             const SearchingCaptainWindow(),
             AttributionMap(),
-            // timerForCancelTripFromPassenger(),
-            // const DriverTimeArrivePassengerPage(),
-            // const TimerToPassengerFromDriver(),
             const PassengerRideLocationWidget(),
             const RideBeginPassenger(),
             const VipRideBeginPassenger(),
             const RideFromStartApp(),
+            PointsPageForRider(),
 
-            // cancelRidePage(),
-            // const MenuIconMapPageWidget(),
-            PointsPageForRider()
           ],
         ),
       ),
@@ -171,8 +162,8 @@ class CancelRidePageShow extends StatelessWidget {
 
         return showCancelButton
             ? Positioned(
-                right: box.read(BoxName.lang) != 'ar' ? 10 : null,
-                left: box.read(BoxName.lang) == 'ar' ? 10 : null,
+                right: box.read(BoxName.lang) == 'ar' ? 10 : null,
+                left: box.read(BoxName.lang) != 'ar' ? 10 : null,
                 top: Get.height * .013,
                 child: GestureDetector(
                   onTap: () {