Update: 2026-07-23 22:14:10

siro_rider/lib/controller/firebase/firbase_messge.dart

@@ -124,6 +124,11 @@ class FirebaseMessagesController extends GetxController {
 
     // ... داخل معالج الإشعارات في تطبيق الراكب ...
     else if (category == 'Accepted Ride') {
+      if (Platform.isAndroid) {
+        String notifTitle = 'Ride Accepted ✅'.tr;
+        String notifBody = 'The captain is on their way to you now.'.tr;
+        notificationController.showNotification(notifTitle, notifBody, 'ding');
+      }
       if (mapCtrl != null) {
         Map<String, dynamic>? driverInfoMap;
 
@@ -198,6 +203,11 @@ class FirebaseMessagesController extends GetxController {
       update();
     } else if (category == 'Trip is Begin') {
       // <-- كان 'Trip is Begin'
+      if (Platform.isAndroid) {
+        String notifTitle = 'Trip Begun 🚀'.tr;
+        String notifBody = 'Have a safe and comfortable trip.'.tr;
+        notificationController.showNotification(notifTitle, notifBody, 'ding');
+      }
       Log.print('[FCM] استقبل إشعار "TRIP_BEGUN".');
       // استدعاء الحارس
       mapCtrl!.processRideBegin(source: "FCM");
@@ -208,9 +218,19 @@ class FirebaseMessagesController extends GetxController {
       }
       update();
     } else if (category == "Arrive Ride") {
+      if (Platform.isAndroid) {
+        String notifTitle = 'Driver is outside 🚖'.tr;
+        String notifBody = 'The captain has arrived at your location.'.tr;
+        notificationController.showNotification(notifTitle, notifBody, 'ding');
+      }
       // استدعاء الحارس
       mapCtrl!.processDriverArrival("FCM");
     } else if (category == 'Driver Finish Trip') {
+      if (Platform.isAndroid) {
+        String notifTitle = 'Trip Finished 🏁'.tr;
+        String notifBody = 'Please pay and rate the driver.'.tr;
+        notificationController.showNotification(notifTitle, notifBody, 'ding');
+      }
       List<dynamic> driverList = [];
 
       // ✅ معالجة آمنة للبيانات

siro_rider/lib/controller/firebase/local_notification.dart

@@ -66,6 +66,27 @@ class NotificationController extends GetxController {
         id: 0, title: title, body: message, notificationDetails: details);
     Log.print('Notification shown: $title - $message');
   }
+
+  // 🆕 Static method for background isolates where GetX might not be initialized
+  static Future<void> showBackgroundNotification(String title, String message, String tone) async {
+    final FlutterLocalNotificationsPlugin plugin = FlutterLocalNotificationsPlugin();
+    const AndroidInitializationSettings android = AndroidInitializationSettings('@mipmap/launcher_icon');
+    const DarwinInitializationSettings ios = DarwinInitializationSettings();
+    await plugin.initialize(settings: const InitializationSettings(android: android, iOS: ios));
+
+    final AndroidNotificationDetails androidDetails = AndroidNotificationDetails(
+      'high_importance_channel',
+      'High Importance Notifications',
+      importance: Importance.max,
+      priority: Priority.high,
+      showWhen: false,
+      sound: RawResourceAndroidNotificationSound(tone),
+    );
+    const DarwinNotificationDetails iosDetails = DarwinNotificationDetails(sound: 'default');
+
+    await plugin.show(id: 0, title: title, body: message, notificationDetails: NotificationDetails(android: androidDetails, iOS: iosDetails));
+    Log.print('Background notification shown: $title - $message');
+  }
 // /Users/hamzaaleghwairyeen/development/App/ride 2/lib/controller/firebase/local_notification.dart
 
 // Assume _flutterLocalNotificationsPlugin is initialized somewhere in your code