26-1-22/3

android/app/build.gradle

@@ -44,8 +44,8 @@ android {
         applicationId = "com.intaleq_driver"
         minSdkVersion = 23
         targetSdk = 36
-        versionCode = 56
+        versionCode = 57
-        versionName = '1.0.56' // I've used the higher version name
+        versionName = '1.1.57' // I've used the higher version name
         multiDexEnabled = true
 
         ndk {

lib/controller/firebase/local_notification.dart

@@ -485,6 +485,15 @@ class NotificationController extends GetxController {
     }
   }
 
+// ==============================================================================
+  // دالة حذف إشعار الطلب (تستدعى عند أخذ الطلب من سائق آخر)
+  // ==============================================================================
+  Future<void> cancelOrderNotification() async {
+    // 1001 هو نفس الآيدي الذي استخدمناه عند عرض الإشعار
+    await _flutterLocalNotificationsPlugin.cancel(1001);
+    print("🗑️ Order Notification Cancelled (Taken by another driver)");
+  }
+
   Future<void> _scheduleNotificationForTime(
     int dayOffset,
     int hour,

lib/controller/home/captin/order_request_controller.dart

@@ -18,6 +18,7 @@ import '../../../print.dart';
 import '../../../views/home/Captin/driver_map_page.dart';
 import '../../../views/home/Captin/orderCaptin/marker_generator.dart';
 import '../../../views/widgets/mydialoug.dart';
+import '../../firebase/local_notification.dart';
 import '../../functions/crud.dart';
 import '../../functions/location_controller.dart';
 import '../../home/captin/home_captain_controller.dart';
@@ -484,6 +485,8 @@ class OrderRequestController extends GetxController
         if (takenRideId == myCurrentRideId && whoTookIt != myDriverId) {
           _isRideTakenHandled = true;
           endTimer();
+          // 1. حذف الإشعار من شريط التنبيهات فوراً
+          NotificationController().cancelOrderNotification();
           if (Get.isSnackbarOpen) Get.closeCurrentSnackbar();
           if (Get.isDialogOpen ?? false) Get.back();
           Get.back();