Update: 2026-06-26 17:29:23

siro_admin/lib/controller/firebase/firbase_messge.dart

@@ -1,27 +1,22 @@
 import 'dart:convert';
 import 'dart:io';
 import 'package:firebase_messaging/firebase_messaging.dart';
-import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:http/http.dart' as http;
 import 'package:secure_string_operations/secure_string_operations.dart';
 import 'package:siro_admin/constant/info.dart';
-import 'package:siro_admin/env/env.dart';
 
 import '../../constant/api_key.dart';
 import '../../constant/box_name.dart';
 import '../../constant/char_map.dart';
-import '../../constant/colors.dart';
 import '../../constant/links.dart';
 import '../../constant/style.dart';
 import '../../main.dart';
 import '../../print.dart';
 import '../../views/widgets/elevated_btn.dart';
-import '../functions/encrypt_decrypt.dart';
+import '../../views/widgets/snackbar.dart';
 import '../notification_controller.dart';
-import 'local_notification.dart';
 import 'notification_service.dart';
-import 'token_access.dart';
 
 class FirebaseMessagesController extends GetxController {
   final fcmToken = FirebaseMessaging.instance;
@@ -53,7 +48,7 @@ class FirebaseMessagesController extends GetxController {
       await messaging.requestPermission();
     } else if (Platform.isIOS) {
       // Request permission for iOS
-      NotificationSettings settings = await messaging.requestPermission(
+      await messaging.requestPermission(
         alert: true,
         announcement: true,
         badge: true,
@@ -107,7 +102,7 @@ class FirebaseMessagesController extends GetxController {
       );
 
       var jsonResponse = jsonDecode(res.body);
-      Log.print('jsonResponse: ${jsonResponse}');
+      Log.print('jsonResponse: $jsonResponse');
       if (jsonResponse['status'] == 'success') {
         // var newData = jsonResponse['data'] as List;
         // Log.print('newData: ${newData}');
@@ -185,7 +180,7 @@ class FirebaseMessagesController extends GetxController {
     // }
 
     isSendingNotifications = false;
-    Get.snackbar("Success", "All notifications sent!");
+    mySnackbarSuccess("All notifications sent!");
   }
 
   bool isSendingNotificationsPassenger = false;
@@ -204,7 +199,7 @@ class FirebaseMessagesController extends GetxController {
     // }
 
     isSendingNotificationsPassenger = false;
-    Get.snackbar("Success", "All notifications sent!");
+    mySnackbarSuccess("All notifications sent!");
   }
 
   Future getAllTokenPassengers() async {
@@ -241,9 +236,7 @@ class FirebaseMessagesController extends GetxController {
 
     FirebaseMessaging.onMessage.listen((RemoteMessage message) {
       // If the app is in the background or terminated, show a system tray message
-      RemoteNotification? notification = message.notification;
-      AndroidNotification? android = notification?.android;
-      // if (notification != null && android != null) {
+      // if (message.notification != null) {
       if (message.data.isNotEmpty && message.notification != null) {
         fireBaseTitles(message);
       }
@@ -267,26 +260,8 @@ class FirebaseMessagesController extends GetxController {
     }
   }
 
-  SnackbarController driverAppliedTripSnakBar() {
-    return Get.snackbar(
-      'Driver Applied the Ride for You'.tr,
-      '',
-      colorText: AppColor.greenColor,
-      duration: const Duration(seconds: 3),
-      snackPosition: SnackPosition.TOP,
-      titleText: Text(
-        'Applied'.tr,
-        style: const TextStyle(color: AppColor.redColor),
-      ),
-      messageText: Text(
-        'Driver Applied the Ride for You'.tr,
-        style: AppStyle.title,
-      ),
-      icon: const Icon(Icons.approval),
-      shouldIconPulse: true,
-      margin: const EdgeInsets.all(16),
-      padding: const EdgeInsets.all(16),
-    );
+  void driverAppliedTripSnakBar() {
+    mySnackbarSuccess('Driver Applied the Ride for You'.tr);
   }
 
   Future<dynamic> passengerDialog(String message) {