9/19/1

.env

@@ -20,7 +20,7 @@ seferPaymentServer=https://seferpw.shop/sefer
 seferCairoServer=https://sefer.click/sefer
 seferGizaServer=https://gizasefer.online/sefer
 whatappID=369939736211879
-whatsapp=EAAOtbZBSUK74BO6yE1QwIBsRCjPDANdum66xap0ZA7OZA8LqEu8MZAts1kwr12eRiNXtvpJ2ZAFSY5dw3KVSyrUuH8boLjynxdFI4Gh1Q7BCHx275X2uZBwKWZCSrsVN17i6mZAFNYYd25sQv0ZBomeTk02ZCIJot4UqWxK9ZBvxsq1k2yS7lD2NsjZB5EHbpaYGLzxFJ2FCCSX6iHyKXab6ckfK7m19wo77in7Dl3YZD
+whatsapp=EAAOtbZBSUK74BO3mbLwnnn5GsZBc5uAMHgbDGpyi3C0vDI8ZBWZBzN8HUwXePwisopEgyIGcNfZCNQ8RZAJEdmw58D1qgX5hsbfh9XDsIfFG2yKrVXYbPm5zClUbJMHSHAmtTNkfPkzK7AEvOp2KzZADkkqq5QDzk1iDcauULdEDkmxcCz4HDiYeGOEmPVXFr55zK24sHSGZBFDdqtkunHCZCyCShcj1Gg9GomWRi2NEZD
 cohere=Aulwd8y5SPWos0hJhG0toUf8gOhUUrpf5Q2TPmVGXrXlBl
 claudeAiAPI=zg-qbc-qvo39-xWOxIGwWTOzCFBnIYSKKhfyz_KVAvrH-6_4ZEJL68G_QBH26oeTOMMoQug9KuOjjKSP_A4S3SUDlbxR9duVzoQ-MkX_UQQQXrXlBl
 payPalClientId=QALymfNI5Tzt4s-ysoz6vD4_nqX0SUtkC_qYV-Ugk5gaM_8Z-kg4L53k8Uux_4jEWXDkNpXGSWPpIzDFXrXlBl

android/app/build.gradle

@@ -148,8 +148,8 @@ android {
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
         minSdk = 23
         targetSdk = flutter.targetSdkVersion
-        versionCode = 70
+        versionCode = 71
-        versionName = '1.5.70'
+        versionName = '1.5.71'
         multiDexEnabled =true
 
         // manifestPlaceholders can be specified here if needed

ios/Runner/Info.plist

@@ -37,11 +37,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-		<string>48</string>
+	<string>52</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-		<string>4.3.48</string>
+	<string>4.3.52</string>
 	<key>FirebaseAppDelegateProxyEnabled</key>
 	<string>NO</string>
 	<key>GMSApiKey</key>

lib/constant/links.dart

@@ -189,6 +189,8 @@ class AppLink {
   static String getCarsLocationByPassengerSpeed = "$location/getSpeed.php";
   static String getCarsLocationByPassengerComfort = "$location/getComfort.php";
   static String getCarsLocationByPassengerBalash = "$location/getBalash.php";
+  static String getCarsLocationByPassengerPinkBike =
+      "$location/getPinkBike.php";
   static String getCarsLocationByPassengerDelivery =
       "$location/getDelivery.php";
   static String getLocationParents = "$location/getLocationParents.php";

lib/controller/firebase/firbase_messge.dart

@@ -429,7 +429,7 @@ class FirebaseMessagesController extends GetxController {
         ));
   }
 
-  void sendNotificationAll(String title, body) async {
+  void sendNotificationAll(String title, body, tone) async {
     // Get the token you want to subtract.
     String token = box.read(BoxName.tokenFCM);
     tokens = box.read(BoxName.tokens);
@@ -441,25 +441,41 @@ class FirebaseMessagesController extends GetxController {
     tokens = box.read(BoxName.tokens);
     for (var i = 0; i < tokens.length; i++) {
       http
-          .post(Uri.parse('https://fcm.googleapis.com/fcm/send'),
+          .post(
+            Uri.parse('https://fcm.googleapis.com/fcm/send'),
             headers: <String, String>{
               'Content-Type': 'application/json',
               'Authorization': 'key=${AK.serverAPI}'
             },
             body: jsonEncode({
-                'notification': <String, dynamic>{
+              'message': {
+                'token': token,
+                'notification': {
                   'title': title,
                   'body': body,
-                  'sound': 'ding.wav'
                 },
-                'priority': 'high',
+                // 'data': {
-                'data': <String, dynamic>{
+                //   'DriverList': jsonEncode(data),
-                  'click_action': 'FLUTTER_NOTIFICATION_CLICK',
+                // },
-                  'id': '1',
+                'android': {
-                  'status': 'done'
+                  'priority': 'high', // Set priority to high
+                  'notification': {
+                    'sound': tone,
                   },
-                'to': tokens[i],
+                },
-              }))
+                'apns': {
+                  'headers': {
+                    'apns-priority': '10', // Set APNs priority to 10
+                  },
+                  'payload': {
+                    'aps': {
+                      'sound': tone,
+                    },
+                  },
+                },
+              },
+            }),
+          )
           .whenComplete(() {})
           .catchError((e) {});
     }
@@ -533,11 +549,15 @@ class FirebaseMessagesController extends GetxController {
               'body': body,
             },
             'android': {
+              'priority': 'high', // Set priority to high
               'notification': {
                 'sound': tone,
               },
             },
             'apns': {
+              'headers': {
+                'apns-priority': '10', // Set APNs priority to 10
+              },
               'payload': {
                 'aps': {
                   'sound': tone,
@@ -603,11 +623,15 @@ class FirebaseMessagesController extends GetxController {
               'body': body,
             },
             'android': {
+              'priority': 'high', // Set priority to high
               'notification': {
                 'sound': tone,
               },
             },
             'apns': {
+              'headers': {
+                'apns-priority': '10', // Set APNs priority to 10
+              },
               'payload': {
                 'aps': {
                   'sound': tone,
@@ -716,11 +740,15 @@ class FirebaseMessagesController extends GetxController {
               'DriverList': jsonEncode(data),
             },
             'android': {
+              'priority': 'high', // Set priority to high
               'notification': {
                 'sound': tone,
               },
             },
             'apns': {
+              'headers': {
+                'apns-priority': '10', // Set APNs priority to 10
+              },
               'payload': {
                 'aps': {
                   'sound': tone,
@@ -746,7 +774,7 @@ class FirebaseMessagesController extends GetxController {
   }
 
   void sendNotificationToDriverMapPolyline(String title, String body,
-      String token, List<String> data, String polylineJson) async {
+      String token, List<String> data, String polylineJson, String tone) async {
     try {
       String serviceAccountKeyJson = '''{
   "type": "service_account",
@@ -778,18 +806,32 @@ class FirebaseMessagesController extends GetxController {
           'Authorization': 'Bearer $accessToken',
         },
         body: jsonEncode({
-          'notification': <String, dynamic>{
+          'message': {
+            'token': token,
+            'notification': {
               'title': title,
               'body': body,
-            // 'sound': 'tone2.wav',
-            'sound': 'order.wav'
             },
             'data': {
-            'DriverList': data,
+              'DriverList': jsonEncode(data),
-            'PolylineJson': polylineJson,
+            },
+            'android': {
+              'priority': 'high', // Set priority to high
+              'notification': {
+                'sound': tone,
+              },
+            },
+            'apns': {
+              'headers': {
+                'apns-priority': '10', // Set APNs priority to 10
+              },
+              'payload': {
+                'aps': {
+                  'sound': tone,
+                },
+              },
+            },
           },
-          'priority': 'high',
-          'to': token,
         }),
       );
 

lib/controller/home/map_passenger_controller.dart

@@ -1017,10 +1017,10 @@ class MapPassengerController extends GetxController {
   late String make = '';
   late String licensePlate = '';
   confirmRideForFirstDriver() async {
-    startCarLocationSearch(box.read(BoxName.carType));
+    // startCarLocationSearch(box.read(BoxName.carType));
     // await getCarsLocationByPassengerAndReloadMarker(
     // box.read(BoxName.carType), 7000);
-    await getNearestDriverByPassengerLocationAPIGOOGLE();
+    // await getNearestDriverByPassengerLocationAPIGOOGLE();
     Log.print('dataCarsLocationByPassenger: ${dataCarsLocationByPassenger}');
     if (dataCarsLocationByPassenger != 'failure' ||
         dataCarsLocationByPassenger != null) {
@@ -1258,12 +1258,8 @@ class MapPassengerController extends GetxController {
       ];
       Log.print('body: ${body}');
       for (var i = 1; i < driversToken.length; i++) {
-        FirebaseMessagesController().sendNotificationToDriverMapPolyline(
+        FirebaseMessagesController().sendNotificationToDriverMAP('OrderSpeed',
-            'OrderSpeed',
+            rideId.toString(), driversToken[i], body, 'order.wav');
-            rideId.toString(),
-            driversToken[i],
-            body,
-            polylineCoordinates.toString());
       }
 
       (rideId);
@@ -1291,6 +1287,8 @@ class MapPassengerController extends GetxController {
           if (res.toString() == 'waiting' && tick >= 15) {
             timer.cancel(); // Stop the current timer
             showAndResearchForCaptain();
+            //TODO  add to wait
+            confirmRideForAllDriverAvailable();
             // delayAndFetchRideStatusForAllDriverAvailable(rideId);
           } else if (res.toString() == 'Apply') {
             // todo play sound
@@ -1314,7 +1312,9 @@ class MapPassengerController extends GetxController {
           // No need to recall delayAndFetchRideStatus as Timer.periodic is already running
           update();
           // }
+          if (tick < 19) {
             tick++;
+          }
         } else {
           timer.cancel();
           // Stop the timer if remainingTimeToPassengerFromDriverAfterApplied <= 0
@@ -1343,7 +1343,7 @@ class MapPassengerController extends GetxController {
     Log.print('tick delayAndFetchRideStatusForAllDriverAvailable: ${tick}');
 
     void fetchRideStatus() async {
-      if (attemptCounter < maxAttempts && !isApplied && tick < 20) {
+      if (attemptCounter < maxAttempts && !isApplied || tick < 20) {
         attemptCounter++;
         tick++;
         var res = await getRideStatus(rideId);
@@ -1760,7 +1760,7 @@ class MapPassengerController extends GetxController {
             'northeastLon': bounds.northeast.longitude.toString(),
           });
           break;
-        case 'Delivery':
+        case 'Scooter':
           res = await CRUD()
               .get(link: AppLink.getCarsLocationByPassengerDelivery, payload: {
             'southwestLat': bounds.southwest.latitude.toString(),
@@ -1778,6 +1778,15 @@ class MapPassengerController extends GetxController {
             'northeastLon': bounds.northeast.longitude.toString(),
           });
           break;
+        case 'Pink Bike':
+          res = await CRUD()
+              .get(link: AppLink.getCarsLocationByPassengerPinkBike, payload: {
+            'southwestLat': bounds.southwest.latitude.toString(),
+            'southwestLon': bounds.southwest.longitude.toString(),
+            'northeastLat': bounds.northeast.latitude.toString(),
+            'northeastLon': bounds.northeast.longitude.toString(),
+          });
+          break;
         default:
           res = await CRUD()
               .get(link: AppLink.getCarsLocationByPassenger, payload: {
@@ -1796,11 +1805,29 @@ class MapPassengerController extends GetxController {
       } else {
         noCarString = false;
         dataCarsLocationByPassenger = jsonDecode(res);
+
+        // Check if 'message' is present and not null
+        if (dataCarsLocationByPassenger['message'] != null &&
+            dataCarsLocationByPassenger['message'].isNotEmpty) {
+          // Check if carsOrder is within bounds
+          if (carsOrder < dataCarsLocationByPassenger['message'].length) {
             driverId = dataCarsLocationByPassenger['message'][carsOrder]
                     ['driver_id']
                 .toString();
             gender = dataCarsLocationByPassenger['message'][carsOrder]['gender']
                 .toString();
+            driverToken = dataCarsLocationByPassenger['message'][carsOrder]
+                    ['token']
+                .toString();
+          } else {
+            print('carsOrder is out of bounds for message array');
+            return false;
+          }
+        } else {
+          // Get.defaultDialog(title: 'No cars available ');
+          print('No cars available or message is null');
+          return false;
+        }
 
         carsLocationByPassenger.clear(); // Clear existing markers
 

lib/controller/local/translations.dart

@@ -4,6 +4,10 @@ class MyTranslation extends Translations {
   @override
   Map<String, Map<String, String>> get keys => {
         "ar": {
+          "Price of trip": "سعر الرحلة",
+          "For Speed and Delivery trips, the price is calculated dynamically. For Comfort trips, the price is based on time and distance":
+              "بالنسبة لرحلات السرعة والتوصيل، يتم حساب السعر ديناميكياً. بالنسبة لرحلات الراحة، يتم حساب السعر بناءً على الوقت والمسافة",
+          "Phone Wallet Saved Successfully": "تم حفظ المحفظة الهاتفية بنجاح",
           "Add wallet phone you use": "أضف محفظة الهاتف التي تستخدمها",
           "Update Available": "تحديث متوفر",
           'Phone number must be exactly 11 digits long':

lib/views/home/map_widget.dart/left_main_menu_icons.dart

@@ -121,7 +121,50 @@ GetBuilder<MapPassengerController> leftMainMenuIcons() {
               //       borderRadius: BorderRadius.circular(15)),
               //   child: IconButton(
               //     onPressed: () async {
-              //       Get.to(SmsSignupEgypt());
+              //       // Get.to(SmsSignupEgypt());
+              //       List<String> d = [
+              //         "30.003028,31.2419628",
+              //         "30.0955661,31.2665336",
+              //         "160.00",
+              //         "25.92",
+              //         "1488",
+              //         "16.93",
+              //         "114243034311436865474",
+              //         "113172279072358305645",
+              //         "hamza ayed",
+              //         "rlMbi4Hc8L1STMPE99iPKqK4Gddwv8r9qZOCadsz9qTEJZ6KLEE9ruTJI6N8dKfK4CXez5pme5WIs14-1QGo29s07fQOniZgIlJV5XFL3yqzPRSUmn3",
+              //         "+201023248456",
+              //         "1 min",
+              //         "1 m",
+              //         "false",
+              //         "QwUMoyUtZ0J3oR6yXKUavrB_gBl9npUZe-qZtax-Raq4QBbdKv0AmtLKm0BfBd6N_592HBv4CVa41ii4122W3hr-BCUKKzJhzZcK8m0YjbWbtpvgJRD8uD_nuMk9",
+              //         "0",
+              //         "238",
+              //         "false",
+              //         "114243034311436865474",
+              //         "1488",
+              //         "startEnd",
+              //         "30.049307749732176,31.274291574954987",
+              //         "",
+              //         "",
+              //         "",
+              //         "",
+              //         "17.73",
+              //         "0",
+              //         "hamzaayedflutter@gmail.com",
+              //         "الفسطاط، حي مصر القديمة، مصر",
+              //         " الزاوية الحمراء، محافظة القاهرة، مصر",
+              //         "Speed",
+              //         "8",
+              //         "5.00"
+              //       ];
+              //       FirebaseMessagesController().sendNotificationToDriverMAP(
+              //           'Order'.tr,
+              //           'from: ',
+              //           // jsonDecode(value)['message'].toString(),
+              //           'd3JaCCFAQeu8QTxRnlC1sB:APA91bFuRjbVK32obIFYXFTI4iwsZEPrrgwvPouob2bXivID-W4aXz51J_OIJ2nHpNU2ocOvGLD1Ip65rLViAFx5qHVE-c8FabBwBi5fSQ-lDTQfe36xxKsc9DU-sTyj_FoYrrMnLNVi',
+              //           d,
+              //           'order.wav');
               //     },
               //     icon: const Icon(
               //       Icons.chat,
@@ -129,7 +172,7 @@ GetBuilder<MapPassengerController> leftMainMenuIcons() {
               //     ),
               //   ),
               // ),
-              // AnimatedContainer(
+              // // AnimatedContainer(
               //   duration: const Duration(microseconds: 200),
               //   width: controller.widthMapTypeAndTraffic,
               //   decoration: BoxDecoration(

lib/views/home/map_widget.dart/ride_begin_passenger.dart

@@ -10,6 +10,7 @@ import 'package:SEFER/main.dart';
 import '../../../constant/colors.dart';
 import '../../../constant/style.dart';
 import '../../../controller/functions/audio_record1.dart';
+import '../../../controller/functions/launch.dart';
 import '../../../controller/functions/toast.dart';
 import '../../../controller/home/map_passenger_controller.dart';
 
@@ -248,8 +249,8 @@ class RideBeginPassenger extends StatelessWidget {
                                     profileController.prfoileData['sosPhone']);
                               }
                             } else {
-                              controller
+                              makePhoneCall('122');
-                                  .sendSMS(box.read(BoxName.sosPhonePassenger));
+                              // box.read(BoxName.sosPhonePassenger));
                             }
                           },
                           icon: const Icon(

lib/views/home/my_wallet/passenger_wallet.dart

@@ -6,6 +6,7 @@ import '../../../constant/box_name.dart';
 import '../../../constant/colors.dart';
 import '../../../constant/info.dart';
 import '../../../constant/style.dart';
+import '../../../controller/functions/toast.dart';
 import '../../../controller/home/payment/credit_card_controller.dart';
 import '../../../controller/payment/payment_controller.dart';
 import '../../../main.dart';
@@ -96,6 +97,10 @@ class PassengerWallet extends StatelessWidget {
                                     Get.back();
                                     box.write(BoxName.phoneWallet,
                                         controller.walletphoneController.text);
+                                    Toast.show(
+                                        context,
+                                        'Phone Wallet Saved Successfully'.tr,
+                                        AppColor.greenColor);
                                   },
                                 ),
                                 cancel: MyElevatedButton(

lib/views/home/my_wallet/passenger_wallet_dialoge.dart

@@ -8,6 +8,7 @@ import 'package:SEFER/controller/payment/payment_controller.dart';
 import 'package:SEFER/views/widgets/elevated_btn.dart';
 
 import '../../../main.dart';
+import '../../widgets/my_textField.dart';
 
 class PassengerWalletDialog extends StatelessWidget {
   const PassengerWalletDialog({
@@ -163,6 +164,7 @@ class PassengerWalletDialog extends StatelessWidget {
                                 },
                               ),
                         box.read(BoxName.countryCode) == 'Egypt'
+                            ? box.read(BoxName.phoneWallet) != null
                                 ? Column(
                                     children: [
                                       MyElevatedButton(
@@ -189,7 +191,8 @@ class PassengerWalletDialog extends StatelessWidget {
                                           } else {
                                             Toast.show(
                                               context,
-                                          '⚠️ You need to choose an amount!'.tr,
+                                              '⚠️ You need to choose an amount!'
+                                                  .tr,
                                               AppColor.redColor,
                                             );
                                           }
@@ -221,7 +224,8 @@ class PassengerWalletDialog extends StatelessWidget {
                                           } else {
                                             Toast.show(
                                               context,
-                                          '⚠️ You need to choose an amount!'.tr,
+                                              '⚠️ You need to choose an amount!'
+                                                  .tr,
                                               AppColor.redColor,
                                             );
                                           }
@@ -236,7 +240,8 @@ class PassengerWalletDialog extends StatelessWidget {
                                         controller.makePaymentStripe(
                                             controller.selectedAmount!
                                                 .toDouble(), // Convert int to double
-                                        box.read(BoxName.countryCode) != 'Egypt'
+                                            box.read(BoxName.countryCode) !=
+                                                    'Egypt'
                                                 ? 'usd'
                                                 : 'jod', () {
                                           controller.addPassengerWallet();
@@ -249,6 +254,47 @@ class PassengerWalletDialog extends StatelessWidget {
                                             'You will choose one of above !'.tr,
                                             AppColor.redColor);
                                       }
+                                    })
+                            : MyElevatedButton(
+                                kolor: AppColor.deepPurpleAccent,
+                                title: "Add wallet phone you use".tr,
+                                onPressed: () {
+                                  Get.defaultDialog(
+                                      barrierDismissible: false,
+                                      title: 'Insert Wallet phone number'.tr,
+                                      content: Form(
+                                          key: controller.formKey,
+                                          child: MyTextForm(
+                                              controller: controller
+                                                  .walletphoneController,
+                                              label:
+                                                  'Insert Wallet phone number'
+                                                      .tr,
+                                              hint: 'Insert Wallet phone number'
+                                                  .tr,
+                                              type: TextInputType.phone)),
+                                      confirm: MyElevatedButton(
+                                        kolor: AppColor.greenColor,
+                                        title: 'OK'.tr,
+                                        onPressed: () async {
+                                          Get.back();
+                                          box.write(
+                                              BoxName.phoneWallet,
+                                              controller
+                                                  .walletphoneController.text);
+                                          Toast.show(
+                                              context,
+                                              'Phone Wallet Saved Successfully'
+                                                  .tr,
+                                              AppColor.greenColor);
+                                        },
+                                      ),
+                                      cancel: MyElevatedButton(
+                                          title: 'Cancel'.tr,
+                                          kolor: AppColor.redColor,
+                                          onPressed: () {
+                                            Get.back();
+                                          }));
                                 }),
                         MyElevatedButton(
                           title: 'Cancel'.tr,