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

2026-06-26 17:29:23 +03:00
parent a323da29aa
commit 9ded734e38
139 changed files with 1815 additions and 2676 deletions
--- a/siro_admin/lib/views/admin/drivers/driver_documents_review_page.dart
+++ b/siro_admin/lib/views/admin/drivers/driver_documents_review_page.dart
@@ -5,6 +5,7 @@ import '../../../constant/style.dart';
 import '../../../controller/admin/driver_docs_controller.dart';
 import '../../widgets/my_scafold.dart';
 import '../../widgets/elevated_btn.dart';
+import '../../widgets/snackbar.dart';
 import '../../../constant/links.dart';

 class DriverDocsReviewPage extends StatelessWidget {
@@ -100,7 +101,7 @@ class DriverDocsReviewPage extends StatelessWidget {
                  const SizedBox(height: 24),
                  Text('الوثائق المرفوعة', style: AppStyle.title),
                  const SizedBox(height: 12),
-                  ...docs.map((doc) => _buildDocCard(doc)).toList(),
+                  ...docs.map((doc) => _buildDocCard(doc)),
                  const SizedBox(height: 32),
                  MyElevatedButton(
                    title: 'اعتماد وتفعيل الحساب',
@@ -110,7 +111,7 @@ class DriverDocsReviewPage extends StatelessWidget {
                      bool success = await controller.approveDriver(id);
                      if (success) {
                        Get.back();
-                        Get.snackbar('نجاح', 'تم تفعيل حساب السائق بنجاح');
+                        mySnackbarSuccess('تم تفعيل حساب السائق بنجاح');
                      }
                    },
                  ),
--- a/siro_admin/lib/views/admin/drivers/driver_gift_check_page.dart
+++ b/siro_admin/lib/views/admin/drivers/driver_gift_check_page.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:siro_admin/controller/functions/crud.dart';
 import 'package:siro_admin/controller/functions/wallet.dart';
+import 'package:siro_admin/views/widgets/snackbar.dart';

 import '../../../constant/links.dart'; // تأكد من المسار

@@ -17,11 +18,6 @@ class DriverGiftCheckerController extends GetxController {
  // قائمة السائقين (سنقوم بتحميلها للبحث عن الـ ID)
  List<dynamic> driversCache = [];

-  @override
-  void onInit() {
-    super.onInit();
-    // fetchDriverCache(); // تحميل البيانات عند فتح الصفحة
-  }

  // 1. تحميل قائمة السائقين لاستخراج الـ ID منها
  Future<void> fetchDriverCache() async {
@@ -45,8 +41,7 @@ class DriverGiftCheckerController extends GetxController {
    String phoneInput = phoneController.text.trim();

    if (phoneInput.isEmpty) {
-      Get.snackbar("تنبيه", "يرجى إدخال رقم الهاتف",
-          backgroundColor: Colors.orange);
+      mySnackbarWarning("يرجى إدخال رقم الهاتف");
      return;
    }
    await fetchDriverCache();
--- a/siro_admin/lib/views/admin/drivers/driver_the_best.dart
+++ b/siro_admin/lib/views/admin/drivers/driver_the_best.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:get_storage/get_storage.dart'; // Ensure get_storage is in pubspec.yaml
 import 'package:siro_admin/controller/functions/wallet.dart';
+import 'package:siro_admin/views/widgets/snackbar.dart';

 // --- New Controller to handle the specific JSON URL ---
 class DriverCacheController extends GetxController {
@@ -73,13 +74,7 @@ class DriverCacheController extends GetxController {
    paidDrivers.clear();
    box.remove('paid_drivers');
    update();
-    Get.snackbar(
-      "Storage Cleared",
-      "Paid status history has been reset",
-      backgroundColor: Colors.redAccent,
-      colorText: Colors.white,
-      snackPosition: SnackPosition.BOTTOM,
-    );
+    mySnackbarInfo("Paid status history has been reset");
  }

  // Check if driver is already paid
@@ -93,9 +88,6 @@ class DriverTheBestRedesigned extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    // Put the new controller
-    final controller = Get.put(DriverCacheController());
-
    return Scaffold(
      backgroundColor: const Color(0xFFF8FAFC), // slate-50 background
      body: SafeArea(
@@ -580,8 +572,7 @@ class DriverTheBestRedesigned extends StatelessWidget {
    String driverId = driver['driver_id']?.toString() ?? '';
    String phone = driver['phone']?.toString() ?? '';
    if (driverId.isEmpty || driverId == 'null') {
-      Get.snackbar("Error", "Cannot pay driver with missing ID",
-          backgroundColor: Colors.red, colorText: Colors.white);
+      mySnackbarError("Cannot pay driver with missing ID");
      return;
    }

@@ -642,10 +633,7 @@ class DriverTheBestRedesigned extends StatelessWidget {

        Get.back(); // Close Dialog

-        Get.snackbar("Success", "Payment of $amount EGP sent to driver",
-            backgroundColor: Colors.green,
-            colorText: Colors.white,
-            snackPosition: SnackPosition.BOTTOM);
+        mySnackbarSuccess("Payment of $amount EGP sent to driver");
      },
      textCancel: 'Cancel',
      onCancel: () => Get.back(),
--- a/siro_admin/lib/views/admin/drivers/monitor_ride.dart
+++ b/siro_admin/lib/views/admin/drivers/monitor_ride.dart
@@ -6,6 +6,7 @@ import 'package:latlong2/latlong.dart';
 import 'package:siro_admin/constant/links.dart';
 // Keep your specific imports
 import 'package:siro_admin/controller/functions/crud.dart';
+import 'package:siro_admin/views/widgets/snackbar.dart';

 /// --------------------------------------------------------------------------
 /// 1. DATA MODELS
@@ -49,20 +50,23 @@ String normalizePhone(String input) {
  final clean = input.replaceAll(RegExp(r'\D+'), '');

  // Syria: 099XXXXXXX or 9639XXXXXXX
-  if (clean.length == 10 && clean.startsWith('09'))
+  if (clean.length == 10 && clean.startsWith('09')) {
    return '963${clean.substring(1)}';
+  }
  if (clean.length == 12 && clean.startsWith('963')) return clean;
  if (clean.length == 9 && clean.startsWith('9')) return '963$clean';

  // Jordan: 079XXXXXXX or 9627XXXXXXX
-  if (clean.length == 10 && clean.startsWith('07'))
+  if (clean.length == 10 && clean.startsWith('07')) {
    return '962${clean.substring(1)}';
+  }
  if (clean.length == 12 && clean.startsWith('962')) return clean;
  if (clean.length == 9 && clean.startsWith('7')) return '962$clean';

  // Egypt: 010XXXXXXXX or 2010XXXXXXXX
-  if (clean.length == 11 && clean.startsWith('01'))
+  if (clean.length == 11 && clean.startsWith('01')) {
    return '20${clean.substring(1)}';
+  }
  if (clean.length == 13 && clean.startsWith('20')) return clean;

  return clean;
@@ -107,15 +111,7 @@ class RideMonitorController extends GetxController {

  void startSearch() {
    if (phoneInputController.text.trim().isEmpty) {
-      Get.snackbar(
-        "تنبيه",
-        "يرجى إدخال رقم الهاتف أولاً",
-        backgroundColor: Colors.redAccent.withOpacity(0.9),
-        colorText: Colors.white,
-        snackPosition: SnackPosition.TOP,
-        margin: const EdgeInsets.all(15),
-        borderRadius: 15,
-      );
+      mySnackbarWarning("يرجى إدخال رقم الهاتف أولاً");
      return;
    }

@@ -297,9 +293,10 @@ class RideMonitorScreen extends StatelessWidget {
      appBar: PreferredSize(
        preferredSize: const Size.fromHeight(kToolbarHeight),
        child: Obx(() {
-          if (controller.isTracking.value)
+          if (controller.isTracking.value) {
            return const SizedBox
                .shrink(); // إخفاء الـ AppBar في وضع التتبع للخريطة الكاملة
+          }
          return AppBar(
            backgroundColor: Colors.transparent,
            elevation: 0,
@@ -460,7 +457,7 @@ class RideMonitorScreen extends StatelessWidget {
              PolylineLayer(
                polylines: [
                  Polyline(
-                    points: controller.routePolyline.value,
+                    points: controller.routePolyline,
                    strokeWidth: 6.0,
                    color: primaryColor.withOpacity(0.9),
                    borderStrokeWidth: 2.0,