Update: 2026-06-14 05:48:58

siro_rider/lib/controller/auth/otp_controller.dart

@@ -117,10 +117,11 @@ class PhoneAuthHelper {
     String? email,
   }) async {
     try {
+      final fixedPhone = CountryLogic.formatCurrentCountryPhone(phoneNumber);
       final response = await CRUD().post(
         link: _registerUrl,
         payload: {
-          'phone_number': phoneNumber,
+          'phone_number': fixedPhone,
           'first_name': firstName,
           'last_name': lastName,
           'email': email ?? '', // Send empty string if null

siro_rider/lib/controller/firebase/firbase_messge.dart

@@ -19,6 +19,7 @@ import 'package:siro_rider/controller/voice_call_controller.dart';
 import '../home/map/ride_lifecycle_controller.dart';
 import '../home/map/ride_state.dart';
 import 'local_notification.dart';
+import '../../views/widgets/mydialoug.dart';
 
 class FirebaseMessagesController extends GetxController {
   final fcmToken = FirebaseMessaging.instance;
@@ -171,14 +172,22 @@ class FirebaseMessagesController extends GetxController {
       if (Platform.isAndroid) {
         notificationController.showNotification(title, body, 'ding');
       }
-      passengerDialog(body);
+      MyDialog().getChatDialog(
+        title.isNotEmpty ? title : 'message From passenger'.tr,
+        body,
+        () {},
+      );
       update();
     } else if (category == 'message From Driver') {
       // <-- كان 'message From Driver'
       if (Platform.isAndroid) {
         notificationController.showNotification(title, body, 'ding');
       }
-      passengerDialog(body);
+      MyDialog().getChatDialog(
+        title.isNotEmpty ? title : 'message From Driver'.tr,
+        body,
+        () {},
+      );
       update();
     } else if (category == 'Trip is Begin') {
       // <-- كان 'Trip is Begin'

siro_rider/lib/controller/functions/country_logic.dart

@@ -81,17 +81,55 @@ class CountryLogic {
 
   /// Helper to format phone using the current country in box.
   static String formatCurrentCountryPhone(String phone) {
-    String cleanPhone = phone.replaceAll(RegExp(r'[ \-\(\)]'), '').trim();
-    if (cleanPhone.startsWith('+963') || cleanPhone.startsWith('00963')) {
+    String cleanPhone = phone.replaceAll(RegExp(r'[ \-\(\)\+]'), '').trim();
+    
+    // 1. Explicit International Code Detection
+    if (cleanPhone.startsWith('00963')) {
+      cleanPhone = cleanPhone.replaceFirst('00963', '963');
+    }
+    if (cleanPhone.startsWith('00962')) {
+      cleanPhone = cleanPhone.replaceFirst('00962', '962');
+    }
+    if (cleanPhone.startsWith('0020')) {
+      cleanPhone = cleanPhone.replaceFirst('0020', '20');
+    }
+
+    if (cleanPhone.startsWith('963')) {
       return formatPhone(cleanPhone, 'Syria');
     }
-    if (cleanPhone.startsWith('+20') || cleanPhone.startsWith('0020')) {
+    if (cleanPhone.startsWith('962')) {
+      return formatPhone(cleanPhone, 'Jordan');
+    }
+    if (cleanPhone.startsWith('20')) {
       return formatPhone(cleanPhone, 'Egypt');
     }
-    if (cleanPhone.startsWith('+962') || cleanPhone.startsWith('00962')) {
+
+    // 2. Local/National Format Detection by Country-Specific Mobile Prefixes
+    // Jordan: 07x / 7x (9 national digits)
+    if (cleanPhone.startsWith('07') && cleanPhone.length == 10) {
+      return formatPhone(cleanPhone, 'Jordan');
+    }
+    if (cleanPhone.startsWith('7') && cleanPhone.length == 9) {
       return formatPhone(cleanPhone, 'Jordan');
     }
 
+    // Syria: 09x / 9x (9 national digits)
+    if (cleanPhone.startsWith('09') && cleanPhone.length == 10) {
+      return formatPhone(cleanPhone, 'Syria');
+    }
+    if (cleanPhone.startsWith('9') && cleanPhone.length == 9) {
+      return formatPhone(cleanPhone, 'Syria');
+    }
+
+    // Egypt: 01x (10 national digits) / 1x (9 national digits)
+    if (cleanPhone.startsWith('01') && cleanPhone.length == 11) {
+      return formatPhone(cleanPhone, 'Egypt');
+    }
+    if (cleanPhone.startsWith('1') && cleanPhone.length == 10) {
+      return formatPhone(cleanPhone, 'Egypt');
+    }
+
+    // 3. Fallback: Default to current user's country code saved in box
     final country = box.read(BoxName.countryCode) ?? 'Jordan';
     return formatPhone(cleanPhone, country);
   }

siro_rider/lib/controller/functions/launch.dart

@@ -9,7 +9,7 @@ void showInBrowser(String url) async {
   } else {}
 }
 
-Future<void> makePhoneCall(String phoneNumber) async {
+String cleanAndFormatPhoneNumber(String phoneNumber) {
   String formattedNumber = phoneNumber.replaceAll(RegExp(r'\s+'), '');
 
   if (formattedNumber.length > 6) {
@@ -18,6 +18,11 @@ Future<void> makePhoneCall(String phoneNumber) async {
       formattedNumber = '+$formattedNumber';
     }
   }
+  return formattedNumber;
+}
+
+Future<void> makePhoneCall(String phoneNumber) async {
+  String formattedNumber = cleanAndFormatPhoneNumber(phoneNumber);
   // ملاحظة: الأرقام القصيرة (مثل 112) ستتجاوز الشرط أعلاه وتبقى "112" وهو الصحيح
 
   // 3. التنفيذ (Launch)
@@ -44,23 +49,26 @@ Future<void> makePhoneCall(String phoneNumber) async {
 
 void launchCommunication(
     String method, String contactInfo, String message) async {
+  String formattedContact = cleanAndFormatPhoneNumber(contactInfo);
+  // WhatsApp prefers the phone number without the '+' prefix
+  String whatsappContact = formattedContact.replaceAll('+', '');
   String url;
 
   if (Platform.isIOS) {
     switch (method) {
       case 'phone':
-        url = 'tel:$contactInfo';
+        url = 'tel:$formattedContact';
         break;
       case 'sms':
-        url = 'sms:$contactInfo?body=${Uri.encodeComponent(message)}';
+        url = 'sms:$formattedContact?body=${Uri.encodeComponent(message)}';
         break;
       case 'whatsapp':
         url =
-            'https://api.whatsapp.com/send?phone=$contactInfo&text=${Uri.encodeComponent(message)}';
+            'https://api.whatsapp.com/send?phone=$whatsappContact&text=${Uri.encodeComponent(message)}';
         break;
       case 'email':
         url =
-            'mailto:$contactInfo?subject=Subject&body=${Uri.encodeComponent(message)}';
+            'mailto:$formattedContact?subject=Subject&body=${Uri.encodeComponent(message)}';
         break;
       default:
         return;
@@ -68,11 +76,11 @@ void launchCommunication(
   } else if (Platform.isAndroid) {
     switch (method) {
       case 'phone':
-        url = 'tel:$contactInfo';
+        url = 'tel:$formattedContact';
         break;
 
       case 'sms':
-        url = 'sms:$contactInfo?body=${Uri.encodeComponent(message)}';
+        url = 'sms:$formattedContact?body=${Uri.encodeComponent(message)}';
         break;
       case 'whatsapp':
         // Check if WhatsApp is installed
@@ -80,16 +88,16 @@ void launchCommunication(
             await canLaunchUrl(Uri.parse('whatsapp://'));
         if (whatsappInstalled) {
           url =
-              'whatsapp://send?phone=$contactInfo&text=${Uri.encodeComponent(message)}';
+              'whatsapp://send?phone=$whatsappContact&text=${Uri.encodeComponent(message)}';
         } else {
           // Provide an alternative action, such as opening the WhatsApp Web API
           url =
-              'https://api.whatsapp.com/send?phone=$contactInfo&text=${Uri.encodeComponent(message)}';
+              'https://api.whatsapp.com/send?phone=$whatsappContact&text=${Uri.encodeComponent(message)}';
         }
         break;
       case 'email':
         url =
-            'mailto:$contactInfo?subject=Subject&body=${Uri.encodeComponent(message)}';
+            'mailto:$formattedContact?subject=Subject&body=${Uri.encodeComponent(message)}';
         break;
       default:
         return;

siro_rider/lib/controller/functions/translate_helper.dart

@@ -0,0 +1,30 @@
+import 'dart:convert';
+import 'package:http/http.dart' as http;
+
+class TranslateHelper {
+  static Future<String> translateText(String text, String targetLang) async {
+    if (text.isEmpty) return text;
+    try {
+      final url = Uri.parse(
+        'https://translate.googleapis.com/translate_a/single?client=gtx&sl=auto&tl=$targetLang&dt=t&q=${Uri.encodeComponent(text)}'
+      );
+      final response = await http.get(url);
+      if (response.statusCode == 200) {
+        final decoded = jsonDecode(response.body);
+        if (decoded != null && decoded is List && decoded.isNotEmpty && decoded[0] is List) {
+          final List parts = decoded[0];
+          String translated = '';
+          for (var part in parts) {
+            if (part is List && part.isNotEmpty) {
+              translated += part[0].toString();
+            }
+          }
+          return translated;
+        }
+      }
+    } catch (e) {
+      // Fallback to original text on any exception
+    }
+    return text;
+  }
+}