12/18/1

android/app/build.gradle

@@ -54,8 +54,8 @@ android {
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
         minSdk = 23
         targetSdk = flutter.targetSdkVersion
-        versionCode = 124
-        versionName = '1.5.24'
+        versionCode = 126
+        versionName = '1.5.26'
         multiDexEnabled =true
     }
 

ios/Runner/Info.plist

@@ -35,7 +35,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>81</string>
+	<string>84</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -50,7 +50,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>4.0.81</string>
+	<string>4.0.84</string>
 	<key>FirebaseAppDelegateProxyEnabled</key>
 	<string>NO</string>
 	<key>GMSApiKey</key>

lib/constant/box_name.dart

@@ -46,6 +46,8 @@ class BoxName {
   static const String phone = "phone";
   static const String phoneDriver = "phoneDriver";
   static const String is_claimed = "is_claimed";
+  static const String isInstall = "isInstall";
+  static const String isGiftToken = "isGiftToken";
   static const String lastOtpTime = "lastOtpTime";
   static const String bankCodeDriver = "bankCodeDriver";
   static const String accountBankNumberDriver = "accountBankNumberDriver";

lib/constant/links.dart

@@ -1,4 +1,4 @@
-import 'package:SEFER/env/env.dart';
+import 'package:sefer_driver/env/env.dart';
 
 import '../main.dart';
 import 'box_name.dart';
@@ -183,8 +183,8 @@ class AppLink {
 //-----------------RegisrationCar------------------
   static String addRegisrationCar = "$ride/RegisrationCar/add.php";
   static String getRegisrationCar = "$endPoint/ride/RegisrationCar/get.php";
-  static String updateRegisrationCar =
-      "$endPoint/ride/RegisrationCar/update.php";
+  static String updateRegisrationCar = "$ride/RegisrationCar/update.php";
+  static String makeDefaultCar = "$ride/RegisrationCar/makeDefaultCar.php";
 
 //-----------------DriverOrder------------------
 
@@ -220,6 +220,7 @@ class AppLink {
   static String uploadEgyptidFront =
       "$server/EgyptDocuments/uploadEgyptidFront.php";
   static String uploadEgypt = "$server/uploadEgypt.php";
+  static String uploadEgypt1 = "$server/uploadEgypt1.php";
 
   //==================certifcate==========
   static String location = '$endPoint/ride/location';
@@ -245,6 +246,7 @@ class AppLink {
   //==================cars new drivers=============
   static String addNewCarsDrivers = '$server/ride/carDrivers/add.php';
   static String getNewCarsDrivers = '$server/ride/carDrivers/get.php';
+  static String deleteNewCarsDrivers = '$server/ride/carDrivers/delete.php';
 
   //==================Blog=============
   static String profile = '$server/ride/profile';
@@ -267,6 +269,8 @@ class AppLink {
       "$server/ride/invitor/updatePassengerGift.php";
   static String updateInvitationCodeFromRegister =
       "$server/ride/invitor/updateInvitationCodeFromRegister.php";
+  static String updateDriverInvitationDirectly =
+      "$server/ride/invitor/updateDriverInvitationDirectly.php";
   static String updatePassengersInvitation =
       "$server/ride/invitor/updatePassengersInvitation.php";
 

lib/constant/style.dart

@@ -1,5 +1,5 @@
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/main.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/main.dart';
 import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'colors.dart';

lib/controller/auth/captin/history_captain.dart

@@ -1,6 +1,6 @@
 import 'dart:convert';
 
-import 'package:SEFER/views/widgets/elevated_btn.dart';
+import 'package:sefer_driver/views/widgets/elevated_btn.dart';
 import 'package:get/get.dart';
 
 import '../../../constant/box_name.dart';

lib/controller/auth/captin/invit_controller.dart

@@ -1,12 +1,12 @@
 import 'dart:convert';
 
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/constant/colors.dart';
-import 'package:SEFER/constant/links.dart';
-import 'package:SEFER/controller/firebase/local_notification.dart';
-import 'package:SEFER/controller/functions/crud.dart';
-import 'package:SEFER/controller/home/payment/captain_wallet_controller.dart';
-import 'package:SEFER/views/widgets/mydialoug.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/constant/colors.dart';
+import 'package:sefer_driver/constant/links.dart';
+import 'package:sefer_driver/controller/firebase/local_notification.dart';
+import 'package:sefer_driver/controller/functions/crud.dart';
+import 'package:sefer_driver/controller/home/payment/captain_wallet_controller.dart';
+import 'package:sefer_driver/views/widgets/mydialoug.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_contacts/contact.dart';
 import 'package:flutter_contacts/flutter_contacts.dart';

lib/controller/auth/captin/login_captin_controller.dart

@@ -1,18 +1,18 @@
 import 'dart:convert';
 import 'dart:math';
 
-import 'package:SEFER/controller/functions/location_background_controller.dart';
-import 'package:SEFER/views/auth/captin/cards/sms_signup.dart';
-import 'package:SEFER/views/widgets/elevated_btn.dart';
-import 'package:SEFER/views/widgets/error_snakbar.dart';
+import 'package:sefer_driver/controller/functions/location_background_controller.dart';
+import 'package:sefer_driver/views/auth/captin/cards/sms_signup.dart';
+import 'package:sefer_driver/views/widgets/elevated_btn.dart';
+import 'package:sefer_driver/views/widgets/error_snakbar.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:get/get.dart';
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/constant/links.dart';
-import 'package:SEFER/controller/functions/crud.dart';
-import 'package:SEFER/main.dart';
-import 'package:SEFER/views/home/Captin/home_captain/home_captin.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/constant/links.dart';
+import 'package:sefer_driver/controller/functions/crud.dart';
+import 'package:sefer_driver/main.dart';
+import 'package:sefer_driver/views/home/Captin/home_captain/home_captin.dart';
 import 'package:location/location.dart';
 
 import '../../../constant/info.dart';
@@ -113,7 +113,7 @@ class LoginDriverController extends GetxController {
         .join('');
   }
 
-  loginUsingCredentials(String driverID, email) async {
+  loginWithGoogleCredential(String driverID, email) async {
     isloading = true;
     update();
     var res = await CRUD().get(link: AppLink.loginFromGoogleCaptin, payload: {
@@ -146,6 +146,9 @@ class LoginDriverController extends GetxController {
               jsonDecoeded['data'][0]['is_verified'].toString());
           box.write(BoxName.phoneDriver, jsonDecoeded['data'][0]['phone']);
           box.write(BoxName.is_claimed, jsonDecoeded['data'][0]['is_claimed']);
+          box.write(BoxName.isInstall, jsonDecoeded['data'][0]['isInstall']);
+          // box.write(
+          // BoxName.isGiftToken, jsonDecoeded['data'][0]['isGiftToken']);
           box.write(BoxName.nameArabic, jsonDecoeded['data'][0]['name_arabic']);
           box.write(BoxName.carYear, jsonDecoeded['data'][0]['year']);
           box.write(

lib/controller/auth/captin/ml_google_doc.dart

@@ -4,8 +4,8 @@ import 'package:get/get.dart';
 import 'package:google_mlkit_text_recognition/google_mlkit_text_recognition.dart';
 import 'package:image_cropper/image_cropper.dart';
 import 'package:image_picker/image_picker.dart';
-import 'package:SEFER/constant/colors.dart';
-import 'package:SEFER/controller/functions/llama_ai.dart';
+import 'package:sefer_driver/constant/colors.dart';
+import 'package:sefer_driver/controller/functions/llama_ai.dart';
 
 class CarRegistrationRecognizerController extends GetxController {
   @override

lib/controller/auth/captin/register_captin_controller.dart

@@ -1,19 +1,19 @@
 import 'dart:convert';
 import 'dart:math';
 
-import 'package:SEFER/controller/auth/captin/login_captin_controller.dart';
-import 'package:SEFER/views/auth/captin/cards/egypt_card_a_i.dart';
-import 'package:SEFER/views/auth/captin/register_captin.dart';
-import 'package:SEFER/views/widgets/error_snakbar.dart';
+import 'package:sefer_driver/controller/auth/captin/login_captin_controller.dart';
+import 'package:sefer_driver/views/auth/captin/cards/egypt_card_a_i.dart';
+import 'package:sefer_driver/views/auth/captin/register_captin.dart';
+import 'package:sefer_driver/views/widgets/error_snakbar.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/constant/links.dart';
-import 'package:SEFER/controller/functions/crud.dart';
-import 'package:SEFER/controller/functions/ocr_controller.dart';
-import 'package:SEFER/main.dart';
-import 'package:SEFER/views/auth/captin/login_captin.dart';
-import 'package:SEFER/views/auth/captin/verify_email_captain.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/constant/links.dart';
+import 'package:sefer_driver/controller/functions/crud.dart';
+import 'package:sefer_driver/controller/functions/ocr_controller.dart';
+import 'package:sefer_driver/main.dart';
+import 'package:sefer_driver/views/auth/captin/login_captin.dart';
+import 'package:sefer_driver/views/auth/captin/verify_email_captain.dart';
 
 import '../../../constant/colors.dart';
 import '../../../views/auth/captin/ai_page.dart';
@@ -116,7 +116,7 @@ class RegisterCaptainController extends GetxController {
                   backgroundColor: AppColor.greenColor);
               box.write(BoxName.phoneVerified, '1');
               box.write(BoxName.phone, '+2${phoneController.text}');
-              await Get.put(LoginDriverController()).loginUsingCredentials(
+              await Get.put(LoginDriverController()).loginWithGoogleCredential(
                 box.read(BoxName.driverID).toString(),
                 box.read(BoxName.emailDriver).toString(),
               );
@@ -240,7 +240,7 @@ class RegisterCaptainController extends GetxController {
     mySnackbarSuccess('Phone number is already verified'.tr);
     box.write(BoxName.phoneVerified, '1');
     box.write(BoxName.phone, '+2${phoneController.text}');
-    Get.put(LoginDriverController()).loginUsingCredentials(
+    Get.put(LoginDriverController()).loginWithGoogleCredential(
       box.read(BoxName.driverID).toString(),
       box.read(BoxName.emailDriver).toString(),
     );

lib/controller/auth/google_sign.dart

@@ -1,12 +1,12 @@
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/constant/colors.dart';
-import 'package:SEFER/constant/links.dart';
-import 'package:SEFER/controller/auth/captin/login_captin_controller.dart';
-import 'package:SEFER/controller/functions/crud.dart';
-import 'package:SEFER/main.dart';
-import 'package:SEFER/views/auth/captin/cards/sms_signup.dart';
-import 'package:SEFER/views/home/on_boarding_page.dart';
-import 'package:SEFER/views/widgets/error_snakbar.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/constant/colors.dart';
+import 'package:sefer_driver/constant/links.dart';
+import 'package:sefer_driver/controller/auth/captin/login_captin_controller.dart';
+import 'package:sefer_driver/controller/functions/crud.dart';
+import 'package:sefer_driver/main.dart';
+import 'package:sefer_driver/views/auth/captin/cards/sms_signup.dart';
+import 'package:sefer_driver/views/home/on_boarding_page.dart';
+import 'package:sefer_driver/views/widgets/error_snakbar.dart';
 import 'package:get/get.dart';
 import 'package:google_sign_in/google_sign_in.dart';
 
@@ -106,7 +106,7 @@ class GoogleSignInHelper {
         // Check if driverID is a valid numeric string
         // if (driverID != 'Unknown ID' && int.tryParse(driverID) != null) {
         await Get.find<LoginDriverController>()
-            .loginUsingCredentials(driverID, emailDriver);
+            .loginWithGoogleCredential(driverID, emailDriver);
         // }
         //  else {
         //   print('Invalid driverID format: $driverID');

lib/controller/auth/login_controller.dart

@@ -1,16 +1,16 @@
 import 'dart:convert';
 import 'dart:math';
 
-import 'package:SEFER/views/widgets/error_snakbar.dart';
+import 'package:sefer_driver/views/widgets/error_snakbar.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:get/get.dart';
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/constant/links.dart';
-import 'package:SEFER/controller/functions/crud.dart';
-import 'package:SEFER/controller/functions/secure_storage.dart';
-import 'package:SEFER/main.dart';
-import 'package:SEFER/views/auth/verify_email_page.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/constant/links.dart';
+import 'package:sefer_driver/controller/functions/crud.dart';
+import 'package:sefer_driver/controller/functions/secure_storage.dart';
+import 'package:sefer_driver/main.dart';
+import 'package:sefer_driver/views/auth/verify_email_page.dart';
 
 class LoginController extends GetxController {
   final formKey = GlobalKey<FormState>();

lib/controller/auth/onboarding_controller.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/main.dart';
-import 'package:SEFER/views/auth/login_page.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/main.dart';
+import 'package:sefer_driver/views/auth/login_page.dart';
 
 import '../../models/model/onboarding_model.dart';
 import '../../views/auth/captin/login_captin.dart';

lib/controller/auth/register_controller.dart

@@ -3,11 +3,11 @@ import 'dart:math';
 
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:SEFER/constant/links.dart';
-import 'package:SEFER/constant/style.dart';
-import 'package:SEFER/controller/functions/crud.dart';
-import 'package:SEFER/views/auth/login_page.dart';
-import 'package:SEFER/views/widgets/elevated_btn.dart';
+import 'package:sefer_driver/constant/links.dart';
+import 'package:sefer_driver/constant/style.dart';
+import 'package:sefer_driver/controller/functions/crud.dart';
+import 'package:sefer_driver/views/auth/login_page.dart';
+import 'package:sefer_driver/views/widgets/elevated_btn.dart';
 
 import '../../views/auth/captin/login_captin.dart';
 import '../../views/auth/verify_email_page.dart';

lib/controller/auth/tokens_controller.dart

@@ -1,6 +1,6 @@
 import 'dart:convert';
 
-import 'package:SEFER/views/widgets/error_snakbar.dart';
+import 'package:sefer_driver/views/widgets/error_snakbar.dart';
 import 'package:get/get.dart';
 import 'package:http/http.dart' as http;
 

lib/controller/auth/verify_email_controller.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:SEFER/constant/links.dart';
-import 'package:SEFER/controller/functions/crud.dart';
+import 'package:sefer_driver/constant/links.dart';
+import 'package:sefer_driver/controller/functions/crud.dart';
 
 class VerifyEmailController extends GetxController {
   TextEditingController verfyCode = TextEditingController();

lib/controller/firebase/firbase_messge.dart

@@ -1,13 +1,13 @@
 import 'dart:convert';
 import 'dart:io';
-import 'package:SEFER/controller/home/captin/home_captain_controller.dart';
-import 'package:SEFER/views/widgets/error_snakbar.dart';
-import 'package:SEFER/views/widgets/mydialoug.dart';
+import 'package:sefer_driver/controller/home/captin/home_captain_controller.dart';
+import 'package:sefer_driver/views/widgets/error_snakbar.dart';
+import 'package:sefer_driver/views/widgets/mydialoug.dart';
 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:SEFER/views/widgets/elevated_btn.dart';
+import 'package:sefer_driver/views/widgets/elevated_btn.dart';
 
 import '../../constant/box_name.dart';
 import '../../constant/colors.dart';
@@ -100,7 +100,7 @@ class FirebaseMessagesController extends GetxController {
         notificationController.showNotification(
             message.notification!.title.toString(),
             message.notification!.body.toString(),
-            'order',
+            'tone1',
             '');
       }
       // await FirebaseMessagesController().showOverlayNotification(message);
@@ -114,6 +114,7 @@ class FirebaseMessagesController extends GetxController {
       Get.put(HomeCaptainController()).changeRideId();
       update();
       Get.to(() => OrderRequestPage(), arguments: {
+        // Get.to(() => OrderRequestPage(), arguments: {
         'myListString': myListString,
         'DriverList': myList,
         // 'PolylineJson': myPoints,

lib/controller/firebase/local_notification.dart

@@ -3,9 +3,9 @@ import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
 
-import 'package:SEFER/constant/colors.dart';
-import 'package:SEFER/views/home/Captin/orderCaptin/order_request_page.dart';
-import 'package:SEFER/views/home/Captin/orderCaptin/order_speed_request.dart';
+import 'package:sefer_driver/constant/colors.dart';
+import 'package:sefer_driver/views/home/Captin/orderCaptin/order_request_page.dart';
+import 'package:sefer_driver/views/home/Captin/orderCaptin/order_speed_request.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:get/get.dart';
 import 'package:permission_handler/permission_handler.dart';
@@ -66,38 +66,46 @@ class NotificationController extends GetxController {
       htmlFormatContent: true,
       htmlFormatContentTitle: true,
     );
-
     AndroidNotificationDetails android = AndroidNotificationDetails(
-      'high_importance_channel', // Use the same ID as before
+      'high_importance_channel',
       'High Importance Notifications',
-      importance: Importance.high,
+      importance: Importance.max,
       priority: Priority.high,
-      styleInformation: bigTextStyleInformation,
-      playSound: true,
       sound: RawResourceAndroidNotificationSound(tone),
-      // audioAttributesUsage: AudioAttributesUsage.alarm,
-      visibility: NotificationVisibility.public,
-      autoCancel: false,
-      color: AppColor.primaryColor,
-      showProgress: true,
-      showWhen: true,
-      ongoing: true,
-      enableVibration: true,
-      vibrationPattern: Int64List.fromList([0, 1000, 500, 1000]),
-      timeoutAfter: 14500,
-      setAsGroupSummary: true,
-      subText: message, fullScreenIntent: true,
-      actions: [
-        AndroidNotificationAction(
-          allowGeneratedReplies: true,
-          'id',
-          title.tr,
-          titleColor: AppColor.bronze,
-          showsUserInterface: true,
-        )
-      ],
-      category: AndroidNotificationCategory.progress,
     );
+
+    // AndroidNotificationDetails android = AndroidNotificationDetails(
+    //   'high_importance_channel', // Use the same ID as before
+    //   'High Importance Notifications',
+    //   importance: Importance.high,
+    //   priority: Priority.high,
+    //   styleInformation: bigTextStyleInformation,
+    //   playSound: true,
+    //   sound: RawResourceAndroidNotificationSound(tone),
+    //   // audioAttributesUsage: AudioAttributesUsage.alarm,
+    //   visibility: NotificationVisibility.public,
+    //   autoCancel: false,
+    //   color: AppColor.primaryColor,
+    //   showProgress: true,
+    //   showWhen: true,
+    //   ongoing: true,
+    //   enableVibration: true,
+    //   vibrationPattern: Int64List.fromList([0, 1000, 500, 1000]),
+    //   timeoutAfter: 14500,
+    //   setAsGroupSummary: true,
+    //   subText: message, fullScreenIntent: true,
+    //   actions: [
+    //     AndroidNotificationAction(
+    //       allowGeneratedReplies: true,
+    //       'id',
+    //       title.tr,
+    //       titleColor: AppColor.blueColor,
+    //       showsUserInterface: true,
+    //     )
+    //   ],
+    //   category: AndroidNotificationCategory.message,
+    // );
+
     DarwinNotificationDetails ios = const DarwinNotificationDetails(
       sound: 'default',
       presentAlert: true,
@@ -221,7 +229,6 @@ class NotificationController extends GetxController {
         message,
         scheduledTime,
         details,
-        androidAllowWhileIdle: true,
         uiLocalNotificationDateInterpretation:
             UILocalNotificationDateInterpretation.absoluteTime,
         matchDateTimeComponents: DateTimeComponents.time,
@@ -264,20 +271,37 @@ class NotificationController extends GetxController {
 
     // Schedule notifications for the next 7 days
     for (int day = 0; day < 7; day++) {
-      // Schedule for 8:00 AM
-      await _scheduleNotificationForTime(
-          day, 7, 0, title, message, details, day * 1000 + 1); // Unique ID
+      // List of notification times
+      final notificationTimes = [
+        {'hour': 8, 'minute': 0, 'id': day * 1000 + 1}, // 8:00 AM
+        {'hour': 15, 'minute': 0, 'id': day * 1000 + 2}, // 3:00 PM
+        {'hour': 20, 'minute': 0, 'id': day * 1000 + 3}, // 8:00 PM
+      ];
 
-      await _scheduleNotificationForTime(
-          day, 10, 14, title, message, details, day * 1000 + 2); // Unique ID
+      for (var time in notificationTimes) {
+        final notificationId = time['id'] as int;
 
-      // Schedule for 3:00 PM
-      await _scheduleNotificationForTime(
-          day, 13, 0, title, message, details, day * 1000 + 3); // Unique ID
+        // Check if this notification ID is already stored
+        bool isScheduled = box.read('notification_$notificationId') ?? false;
 
-      // Schedule for 8:00 PM
+        if (!isScheduled) {
+          // Schedule the notification if not already scheduled
           await _scheduleNotificationForTime(
-          day, 20, 0, title, message, details, day * 1000 + 4); // Unique ID
+            day,
+            time['hour'] as int,
+            time['minute'] as int,
+            title,
+            message,
+            details,
+            notificationId,
+          );
+
+          // Mark this notification ID as scheduled in GetStorage
+          box.write('notification_$notificationId', true);
+        } else {
+          print('Notification with ID $notificationId is already scheduled.');
+        }
+      }
     }
 
     print('Notifications scheduled successfully for the next 7 days');

lib/controller/firebase/order_lay.dart

@@ -1,7 +1,7 @@
-import 'package:SEFER/constant/links.dart';
-import 'package:SEFER/controller/functions/crud.dart';
-import 'package:SEFER/views/home/Captin/home_captain/home_captin.dart';
-import 'package:SEFER/views/widgets/elevated_btn.dart';
+import 'package:sefer_driver/constant/links.dart';
+import 'package:sefer_driver/controller/functions/crud.dart';
+import 'package:sefer_driver/views/home/Captin/home_captain/home_captin.dart';
+import 'package:sefer_driver/views/widgets/elevated_btn.dart';
 import 'package:flutter/material.dart';
 
 class OverlayContent1 extends StatelessWidget {

lib/controller/functions/camer_controller.dart

@@ -4,9 +4,9 @@ import 'dart:io';
 import 'package:camera/camera.dart';
 import 'package:get/get.dart';
 import 'package:google_mlkit_text_recognition/google_mlkit_text_recognition.dart';
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/constant/links.dart';
-import 'package:SEFER/views/widgets/elevated_btn.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/constant/links.dart';
+import 'package:sefer_driver/views/widgets/elevated_btn.dart';
 import 'package:path_provider/path_provider.dart' as path_provider;
 import 'package:path/path.dart' as path;
 import 'package:http/http.dart' as http;

lib/controller/functions/crud.dart

@@ -1,10 +1,10 @@
 import 'dart:convert';
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/constant/links.dart';
-import 'package:SEFER/main.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/constant/links.dart';
+import 'package:sefer_driver/main.dart';
 import 'package:get/get.dart';
 import 'package:http/http.dart' as http;
-import 'package:SEFER/env/env.dart';
+import 'package:sefer_driver/env/env.dart';
 
 import '../../constant/api_key.dart';
 import '../../print.dart';
@@ -28,10 +28,9 @@ class CRUD {
             'Basic ${base64Encode(utf8.encode(AK.basicAuthCredentials.toString()))}',
       },
     );
-    // if (response.statusCode == 200) {
-    Log.print('response: ${response.request}');
+    Log.print('request: ${response.request}');
     Log.print('response: ${response.body}');
-    Log.print('response: ${payload}');
+    // if (response.statusCode == 200) {
     var jsonData = jsonDecode(response.body);
     if (jsonData['status'] == 'success') {
       return response.body;
@@ -103,7 +102,6 @@ class CRUD {
     var json = jsonDecode(extractedString);
 
     var textValues = extractTextFromLines(json);
-    Log.print('textValues: ${textValues}');
     // await Get.put(AI()).geminiAiExtraction(prompt, textValues);
     await Get.put(AI()).anthropicAI(textValues, prompt, imagePath);
   }
@@ -147,7 +145,6 @@ class CRUD {
     http.StreamedResponse response = await request.send();
 
     if (response.statusCode == 200) {
-      // Log.print(
       //     'response.stream.bytesToString(): ${await response.stream.bytesToString()}');
       return await response.stream.bytesToString();
     } else {}
@@ -203,9 +200,6 @@ class CRUD {
         'Authorization': 'Bearer ${AK.secretKeyStripe}',
       },
     );
-    // Log.print('response: ${response.request}');
-    // Log.print('response: ${response.body}');
-    // Log.print('response: ${payload}');
     if (response.statusCode == 200) {
       return response.body;
     } else {}
@@ -229,11 +223,6 @@ class CRUD {
             'Basic ${base64Encode(utf8.encode(AK.basicAuthCredentials))}',
       },
     );
-    Log.print('response: ${response.request}');
-    Log.print('response: ${response.body}');
-    // Log.print('response: ${response.statusCode}');
-    // Log.print('response: ${response.reasonPhrase}');
-    Log.print('response: ${payload}');
     var jsonData = jsonDecode(response.body);
     if (response.statusCode == 200) {
       if (jsonData['status'] == 'success') {

lib/controller/functions/face_detect.dart

@@ -1,7 +1,7 @@
 import 'dart:convert';
-import 'package:SEFER/constant/api_key.dart';
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/main.dart';
+import 'package:sefer_driver/constant/api_key.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/main.dart';
 import 'package:http/http.dart' as http;
 
 import '../../constant/links.dart';

lib/controller/functions/gemeni.dart

@@ -1,17 +1,21 @@
+import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'dart:math';
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/constant/info.dart';
-import 'package:SEFER/constant/links.dart';
-import 'package:SEFER/constant/style.dart';
-import 'package:SEFER/controller/auth/captin/login_captin_controller.dart';
-import 'package:SEFER/controller/functions/crud.dart';
-import 'package:SEFER/controller/functions/device_info.dart';
-import 'package:SEFER/main.dart';
-import 'package:SEFER/views/home/Captin/home_captain/home_captin.dart';
-import 'package:SEFER/views/widgets/error_snakbar.dart';
-import 'package:SEFER/views/widgets/mydialoug.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/constant/info.dart';
+import 'package:sefer_driver/constant/links.dart';
+import 'package:sefer_driver/constant/style.dart';
+import 'package:sefer_driver/controller/auth/captin/login_captin_controller.dart';
+import 'package:sefer_driver/controller/firebase/firbase_messge.dart';
+import 'package:sefer_driver/controller/firebase/local_notification.dart';
+import 'package:sefer_driver/controller/functions/crud.dart';
+import 'package:sefer_driver/controller/functions/device_info.dart';
+import 'package:sefer_driver/controller/notification/notification_captain_controller.dart';
+import 'package:sefer_driver/main.dart';
+import 'package:sefer_driver/views/home/Captin/home_captain/home_captin.dart';
+import 'package:sefer_driver/views/widgets/error_snakbar.dart';
+import 'package:sefer_driver/views/widgets/mydialoug.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:image_cropper/image_cropper.dart';
@@ -50,6 +54,31 @@ class AI extends GetxController {
   bool isInviteDriverFound = false;
   final invitationCodeController = TextEditingController();
   final formKey = GlobalKey<FormState>();
+  bool isTimerComplete = false;
+  double progressValue = 1.0;
+  int remainingSeconds = 30;
+
+  void startTimer() {
+    Timer.periodic(const Duration(seconds: 1), (timer) {
+      if (remainingSeconds == 0) {
+        timer.cancel();
+        isTimerComplete = true;
+        update(); // Notify the UI
+      } else {
+        remainingSeconds--;
+        progressValue = remainingSeconds / 30.0; // Update progress
+        update(); // Notify the UI
+      }
+    });
+  }
+
+  void resetTimer() {
+    isTimerComplete = false;
+    progressValue = 1.0;
+    remainingSeconds = 40;
+    update(); // Notify the UI
+    startTimer(); // Restart the timer
+  }
 
   void setApproved() {
     approved = true;
@@ -57,17 +86,32 @@ class AI extends GetxController {
   }
 
   Future updateInvitationCodeFromRegister() async {
-    if (formKey.currentState!.validate()) {
     var res = await CRUD().post(
-          link: AppLink.updateInvitationCodeFromRegister,
-          payload: {"inviteCode": invitationCodeController.text});
+      link: AppLink.updateDriverInvitationDirectly,
+      payload: {
+        "inviterDriverPhone": '+2${box.read(BoxName.phoneDriver).toString()}',
+        "driverId": box.read(BoxName.driverID).toString(),
+      },
+    );
+
     if (res != 'failure') {
       isInviteDriverFound = true;
       update();
-        mySnackbarSuccess("Code approved".tr);
+      // mySnackbarSuccess("Code approved".tr); // Localized success message
+      box.write(BoxName.isInstall, '1');
+      NotificationController().showNotification(
+          "Code approved".tr, "Code approved".tr, 'tone2', '');
+      // Notification text with dynamic token
+      FirebaseMessagesController().sendNotificationToDriverMAP(
+        'You have received a gift token!'.tr,
+        'for '.tr + box.read(BoxName.phoneDriver).toString(),
+        jsonDecode(res)['message'][0]['token'].toString(),
+        [],
+        'tone2', // Type of notification
+      );
     } else {
-        mySnackeBarError("Code not approved".tr);
-      }
+      // mySnackeBarError(
+      //     "You dont have invitation code".tr); // Localized error message
     }
   }
 
@@ -397,7 +441,7 @@ class AI extends GetxController {
     }
   }
 
-  addCriminalDeocuments() async {
+  addCriminalDocuments() async {
     var res = await CRUD().post(link: AppLink.addCriminalDocuments, payload: {
       "driverId": box.read(BoxName.driverID),
       "IssueDate": responseCriminalRecordEgypt['IssueDate'],

lib/controller/functions/llama_ai.dart

@@ -1,8 +1,8 @@
 import 'dart:convert';
 
-import 'package:SEFER/constant/links.dart';
-import 'package:SEFER/controller/functions/crud.dart';
-import 'package:SEFER/controller/functions/gemeni.dart';
+import 'package:sefer_driver/constant/links.dart';
+import 'package:sefer_driver/controller/functions/crud.dart';
+import 'package:sefer_driver/controller/functions/gemeni.dart';
 
 class LlamaAi {
   Future<Map> getCarRegistrationData(String input, prompt) async {

lib/controller/functions/location_controller.dart

@@ -1,14 +1,14 @@
 import 'dart:async';
 
-import 'package:SEFER/controller/home/captin/home_captain_controller.dart';
+import 'package:sefer_driver/controller/home/captin/home_captain_controller.dart';
 import 'package:get/get.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
 import 'package:location/location.dart';
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/constant/links.dart';
-import 'package:SEFER/controller/functions/crud.dart';
-import 'package:SEFER/controller/home/payment/captain_wallet_controller.dart';
-import 'package:SEFER/main.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/constant/links.dart';
+import 'package:sefer_driver/controller/functions/crud.dart';
+import 'package:sefer_driver/controller/home/payment/captain_wallet_controller.dart';
+import 'package:sefer_driver/main.dart';
 
 import '../../print.dart';
 

lib/controller/functions/log_out.dart

@@ -1,17 +1,17 @@
 import 'dart:io';
 
-import 'package:SEFER/views/home/on_boarding_page.dart';
-import 'package:SEFER/views/widgets/error_snakbar.dart';
+import 'package:sefer_driver/views/home/on_boarding_page.dart';
+import 'package:sefer_driver/views/widgets/error_snakbar.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/constant/colors.dart';
-import 'package:SEFER/constant/links.dart';
-import 'package:SEFER/controller/functions/crud.dart';
-import 'package:SEFER/main.dart';
-import 'package:SEFER/onbording_page.dart';
-import 'package:SEFER/views/widgets/elevated_btn.dart';
-import 'package:SEFER/views/widgets/my_textField.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/constant/colors.dart';
+import 'package:sefer_driver/constant/links.dart';
+import 'package:sefer_driver/controller/functions/crud.dart';
+import 'package:sefer_driver/main.dart';
+import 'package:sefer_driver/onbording_page.dart';
+import 'package:sefer_driver/views/widgets/elevated_btn.dart';
+import 'package:sefer_driver/views/widgets/my_textField.dart';
 
 import '../../constant/style.dart';
 

lib/controller/functions/ocr_controller.dart

@@ -5,13 +5,13 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:http/http.dart' as http;
-import 'package:SEFER/constant/api_key.dart';
-import 'package:SEFER/constant/colors.dart';
-import 'package:SEFER/constant/info.dart';
-import 'package:SEFER/constant/style.dart';
-import 'package:SEFER/constant/table_names.dart';
-import 'package:SEFER/main.dart';
-import 'package:SEFER/views/widgets/elevated_btn.dart';
+import 'package:sefer_driver/constant/api_key.dart';
+import 'package:sefer_driver/constant/colors.dart';
+import 'package:sefer_driver/constant/info.dart';
+import 'package:sefer_driver/constant/style.dart';
+import 'package:sefer_driver/constant/table_names.dart';
+import 'package:sefer_driver/main.dart';
+import 'package:sefer_driver/views/widgets/elevated_btn.dart';
 
 import '../../constant/box_name.dart';
 import '../../constant/links.dart';

lib/controller/functions/overlay_permisssion.dart

@@ -1,8 +1,8 @@
 import 'dart:io';
 
-import 'package:SEFER/constant/links.dart';
-import 'package:SEFER/controller/functions/crud.dart';
-import 'package:SEFER/views/widgets/mydialoug.dart';
+import 'package:sefer_driver/constant/links.dart';
+import 'package:sefer_driver/controller/functions/crud.dart';
+import 'package:sefer_driver/views/widgets/mydialoug.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_confetti/flutter_confetti.dart';
 import 'package:flutter_overlay_window/flutter_overlay_window.dart';
@@ -34,7 +34,8 @@ Future<void> getPermissionOverlay() async {
 Future<void> showDriverGiftClaim(BuildContext context) async {
   if (box.read(BoxName.is_claimed).toString() == '0' ||
       box.read(BoxName.is_claimed) == null) {
-    MyDialog().getDialog('You have gift 300 L.E'.tr, 'text', () async {
+    MyDialog().getDialog(
+        'You have gift 300 L.E'.tr, 'This for new registration'.tr, () async {
       var res = await CRUD().post(link: AppLink.updateDriverClaim, payload: {
         'driverId': box.read(BoxName.driverID),
       });
@@ -46,6 +47,7 @@ Future<void> showDriverGiftClaim(BuildContext context) async {
           options:
               const ConfettiOptions(particleCount: 100, spread: 70, y: 0.6),
         );
+        box.write(BoxName.is_claimed, '1');
       }
       Get.back();
     });

lib/controller/functions/package_info.dart

@@ -1,8 +1,8 @@
 import 'dart:convert';
 import 'dart:io';
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/constant/links.dart';
-import 'package:SEFER/controller/functions/crud.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/constant/links.dart';
+import 'package:sefer_driver/controller/functions/crud.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';

lib/controller/functions/sms_egypt_controller.dart

@@ -1,13 +1,13 @@
 import 'dart:convert';
 
-import 'package:SEFER/constant/api_key.dart';
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/constant/info.dart';
-import 'package:SEFER/constant/links.dart';
-import 'package:SEFER/controller/auth/captin/register_captin_controller.dart';
-import 'package:SEFER/controller/functions/crud.dart';
-import 'package:SEFER/main.dart';
-import 'package:SEFER/views/widgets/elevated_btn.dart';
+import 'package:sefer_driver/constant/api_key.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/constant/info.dart';
+import 'package:sefer_driver/constant/links.dart';
+import 'package:sefer_driver/controller/auth/captin/register_captin_controller.dart';
+import 'package:sefer_driver/controller/functions/crud.dart';
+import 'package:sefer_driver/main.dart';
+import 'package:sefer_driver/views/widgets/elevated_btn.dart';
 import 'package:get/get.dart';
 import 'package:http/http.dart' as http;
 
@@ -53,7 +53,7 @@ class SmsEgyptController extends GetxController {
           '+2${Get.find<RegisterCaptainController>().phoneController.text}');
       box.write(BoxName.phoneVerified, '1');
 
-      await Get.put(LoginDriverController()).loginUsingCredentials(
+      await Get.put(LoginDriverController()).loginWithGoogleCredential(
         box.read(BoxName.driverID).toString(),
         box.read(BoxName.emailDriver).toString(),
       );

lib/controller/functions/toast.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:SEFER/constant/colors.dart';
-import 'package:SEFER/constant/style.dart';
+import 'package:sefer_driver/constant/colors.dart';
+import 'package:sefer_driver/constant/style.dart';
 
 class Toast {
   static void show(BuildContext context, String message, Color color) {

lib/controller/functions/tts.dart

@@ -1,6 +1,6 @@
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/main.dart';
-import 'package:SEFER/views/widgets/error_snakbar.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/main.dart';
+import 'package:sefer_driver/views/widgets/error_snakbar.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_tts/flutter_tts.dart';
 import 'package:get/get.dart';

lib/controller/functions/upload_image.dart

@@ -1,7 +1,7 @@
 import 'dart:convert';
 import 'dart:io';
-import 'package:SEFER/constant/api_key.dart';
-import 'package:SEFER/views/widgets/error_snakbar.dart';
+import 'package:sefer_driver/constant/api_key.dart';
+import 'package:sefer_driver/views/widgets/error_snakbar.dart';
 import 'package:get/get.dart';
 import 'package:http/http.dart' as http;
 import 'package:image_cropper/image_cropper.dart';
@@ -205,8 +205,9 @@ class ImageController extends GetxController {
       await uploadNewCar(
         compressedImage,
         {
-          'driverID':
-              box.read(BoxName.driverID) ?? box.read(BoxName.passengerID),
+          'driverID': box.read(BoxName.driverID) +
+              '_' +
+              DateTime.now().toIso8601String(),
           'imageType': imageType,
         },
         link,

lib/controller/home/captin/duration_controller .dart

@@ -1,13 +1,13 @@
 import 'dart:convert';
 
-import 'package:SEFER/views/widgets/elevated_btn.dart';
+import 'package:sefer_driver/views/widgets/elevated_btn.dart';
 import 'package:fl_chart/fl_chart.dart';
 import 'package:get/get.dart';
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/constant/links.dart';
-import 'package:SEFER/controller/functions/crud.dart';
-import 'package:SEFER/main.dart';
-import 'package:SEFER/models/model/driver/rides_summary_model.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/constant/links.dart';
+import 'package:sefer_driver/controller/functions/crud.dart';
+import 'package:sefer_driver/main.dart';
+import 'package:sefer_driver/models/model/driver/rides_summary_model.dart';
 
 class DurationController extends GetxController {
   final data = DurationData;

lib/controller/home/captin/help/assurance_controller.dart

@@ -1,10 +1,10 @@
 import 'dart:convert';
 
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/constant/links.dart';
-import 'package:SEFER/controller/functions/crud.dart';
-import 'package:SEFER/main.dart';
-import 'package:SEFER/views/widgets/error_snakbar.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/constant/links.dart';
+import 'package:sefer_driver/controller/functions/crud.dart';
+import 'package:sefer_driver/main.dart';
+import 'package:sefer_driver/views/widgets/error_snakbar.dart';
 import 'package:get/get.dart';
 
 import '../../../../constant/colors.dart';

lib/controller/home/captin/help/maintain_center_controller.dart

@@ -1,9 +1,9 @@
 import 'dart:convert';
 
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/constant/links.dart';
-import 'package:SEFER/controller/functions/crud.dart';
-import 'package:SEFER/main.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/constant/links.dart';
+import 'package:sefer_driver/controller/functions/crud.dart';
+import 'package:sefer_driver/main.dart';
 import 'package:get/get.dart';
 
 class MaintainCenterController extends GetxController {

lib/controller/home/captin/help/video_controller.dart

@@ -1,9 +1,9 @@
 import 'dart:convert';
 
-import 'package:SEFER/constant/links.dart';
-import 'package:SEFER/controller/functions/crud.dart';
-import 'package:SEFER/print.dart';
-import 'package:SEFER/views/widgets/error_snakbar.dart';
+import 'package:sefer_driver/constant/links.dart';
+import 'package:sefer_driver/controller/functions/crud.dart';
+import 'package:sefer_driver/print.dart';
+import 'package:sefer_driver/views/widgets/error_snakbar.dart';
 import 'package:get/get.dart';
 import 'package:video_player/video_player.dart';
 

lib/controller/home/captin/home_captain_controller.dart

@@ -3,8 +3,8 @@ import 'dart:convert';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/controller/home/captin/map_driver_controller.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/controller/home/captin/map_driver_controller.dart';
 import 'dart:async';
 
 import '../../../constant/links.dart';
@@ -237,6 +237,30 @@ class HomeCaptainController extends GetxController {
     update();
   }
 
+  Map walletDriverPointsDate = {};
+
+  Future getCaptainWalletFromBuyPoints() async {
+    // isLoading = true;
+    update();
+
+    var res = await CRUD().get(
+      link: AppLink.getDriverPaymentPoints,
+      payload: {'driverID': box.read(BoxName.driverID).toString()},
+    );
+    isLoading = false;
+    // update();
+
+    if (res != 'failure') {
+      walletDriverPointsDate = jsonDecode(res);
+      double totalPointsDouble = double.parse(
+          walletDriverPointsDate['message'][0]['total_amount'].toString());
+      totalPoints = totalPointsDouble.toStringAsFixed(0);
+      update();
+    } else {
+      totalPoints = '0';
+    }
+  }
+
   @override
   void onInit() async {
     // await locationBackController.requestLocationPermission();
@@ -251,8 +275,9 @@ class HomeCaptainController extends GetxController {
     getCountRideToday();
     getAllPayment();
     startPeriodicExecution();
+    await getCaptainWalletFromBuyPoints();
     onMapCreated(mapHomeCaptainController!);
-    totalPoints = Get.find<CaptainWalletController>().totalPoints.toString();
+    // totalPoints = Get.find<CaptainWalletController>().totalPoints.toString();
     getRefusedOrderByCaptain();
     // LocationController().getLocation();
     super.onInit();
@@ -324,7 +349,7 @@ class HomeCaptainController extends GetxController {
         payload: {'driverID': box.read(BoxName.driverID).toString()});
     if (res != 'failure') {
       data = jsonDecode(res);
-      totalMoneyToday = data['message'][0]['todayAmount'];
+      totalMoneyToday = data['message'][0]['todayAmount'].toString();
 
       update();
     } else {}

lib/controller/home/captin/map_driver_controller.dart

@@ -1,17 +1,14 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
-import 'package:SEFER/controller/home/captin/home_captain_controller.dart';
-import 'package:SEFER/controller/home/captin/order_request_controller.dart';
-import 'package:SEFER/views/widgets/mydialoug.dart';
+import 'package:sefer_driver/controller/home/captin/home_captain_controller.dart';
+import 'package:sefer_driver/views/widgets/mydialoug.dart';
 import 'package:bubble_head/bubble.dart';
 import 'package:flutter/material.dart';
 import 'package:geolocator/geolocator.dart';
 import 'package:get/get.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
 import 'package:google_polyline_algorithm/google_polyline_algorithm.dart';
-import 'package:SEFER/constant/style.dart';
-import 'package:SEFER/views/widgets/elevated_btn.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 import '../../../constant/api_key.dart';
@@ -20,6 +17,7 @@ import '../../../constant/colors.dart';
 import '../../../constant/links.dart';
 import '../../../constant/table_names.dart';
 import '../../../main.dart';
+import '../../../print.dart';
 import '../../../views/Rate/rate_passenger.dart';
 import '../../../views/home/Captin/home_captain/home_captin.dart';
 import '../../firebase/firbase_messge.dart';
@@ -187,6 +185,14 @@ class MapDriverController extends GetxController {
             "id": rideId.toString(), // Convert to String
             "status": 'CancelFromDriverAfterApply'
           });
+      CRUD().postFromDialogue(
+          link: '${AppLink.seferCairoServer}/driver_order/add.php',
+          payload: {
+            'driver_id': box.read(BoxName.driverID).toString(),
+            // box.read(BoxName.driverID).toString(),
+            'order_id': rideId.toString(),
+            'status': 'CancelFromDriverAfterApply'
+          });
       await CRUD().post(
           link:
               "${AppLink.seferCairoServer}/ride/cancelRide/addCancelTripFromDriverAfterApplied.php",
@@ -202,6 +208,14 @@ class MapDriverController extends GetxController {
           "id": rideId.toString(), // Convert to String
           "status": 'CancelFromDriverAfterApply'
         });
+        CRUD().postFromDialogue(
+            link: '${AppLink.endPoint}/driver_order/add.php',
+            payload: {
+              'driver_id': box.read(BoxName.driverID).toString(),
+              // box.read(BoxName.driverID).toString(),
+              'order_id': rideId.toString(),
+              'status': 'CancelFromDriverAfterApply'
+            });
         CRUD().post(
             link:
                 "${AppLink.endPoint}/ride/cancelRide/addCancelTripFromDriverAfterApplied.php",
@@ -382,12 +396,24 @@ class MapDriverController extends GetxController {
         'rideTimeStart': DateTime.now().toString(),
         'status': 'Begin',
       });
+      CRUD().post(link: AppLink.addDriverOrder, payload: {
+        'driver_id': box.read(BoxName.driverID).toString(),
+        'order_id': rideId.toString(),
+        'status': 'Begin'
+      });
       if (AppLink.endPoint != AppLink.seferCairoServer) {
         CRUD().post(link: "${AppLink.endPoint}/rides/update.php", payload: {
           'id': rideId,
           'rideTimeStart': DateTime.now().toString(),
           'status': 'Begin',
         });
+        CRUD().post(
+            link: '${AppLink.endPoint}/rides/driver_order/add.php',
+            payload: {
+              'driver_id': box.read(BoxName.driverID).toString(),
+              'order_id': rideId.toString(),
+              'status': 'Begin'
+            });
       }
       FirebaseMessagesController().sendNotificationToDriverMAP('RideIsBegin',
           box.read(BoxName.name).toString(), tokenPassenger, [], 'start.wav');
@@ -493,6 +519,11 @@ class MapDriverController extends GetxController {
         'rideTimeStart': DateTime.now().toString(),
         'status': 'CancelAfterWait',
       });
+      CRUD().post(link: AppLink.addDriverOrder, payload: {
+        'driver_id': box.read(BoxName.driverID).toString(),
+        'order_id': rideId.toString(),
+        'status': 'CancelAfterWait'
+      });
 
       if (AppLink.endPoint != AppLink.seferCairoServer) {
         CRUD().post(link: "${AppLink.endPoint}/rides/update.php", payload: {
@@ -500,6 +531,11 @@ class MapDriverController extends GetxController {
           'rideTimeStart': DateTime.now().toString(),
           'status': 'CancelAfterWait',
         });
+        CRUD().post(link: "${AppLink.endPoint}/rides/update.php", payload: {
+          'driver_id': box.read(BoxName.driverID).toString(),
+          'order_id': rideId.toString(),
+          'status': 'CancelAfterWait'
+        });
       }
       var paymentTokenWait =
           await generateTokenDriver(costOfWaiting5Minute.toString());
@@ -547,23 +583,25 @@ class MapDriverController extends GetxController {
       Get.find<LocationController>().myLocation.latitude,
       Get.find<LocationController>().myLocation.longitude,
     );
-    MyDialog().getDialog('Are you sure to exit ride ?'.tr, '', () {
-      // if (distanceToDestination > 900 ||
-      //     (double.parse(distance.toString()) < 1000 &&
-      //         distanceToDestination > 150)) {
+
+    if (distanceToDestination > double.parse(distance.toString()) / 3) {
+      Log.print('distanceToDestination: ${distanceToDestination}');
+
+      MyDialog().getDialog(
+        'Are you sure to exit ride?'.tr,
+        '',
+        () {
           Get.back();
           finishRideFromDriver1();
-      // } else {
-      //   Get.back();
-      //   if (distanceToDestination <= 150) {
-      //     //   todo add scam from start point and dont move
-      //     // finishRideFromDriver1();
-      //   }
-      //   MyDialog().getDialog('you are not moved yet !'.tr, '', () {
-      //     Get.back();
-      //   });
-      // }
-    });
+        },
+      );
+    } else {
+      MyDialog().getDialog(
+        "You haven't moved sufficiently!".tr,
+        '',
+        () => Get.back(),
+      );
+    }
   }
 
   String paymentToken = '';
@@ -618,6 +656,13 @@ class MapDriverController extends GetxController {
           'status': 'Finished',
           'price': totalCost,
         });
+    CRUD().post(
+        link: "${AppLink.seferCairoServer}/ride/driver_order/update.php",
+        payload: {
+          // 'driver_id': box.read(BoxName.driverID).toString(),
+          'order_id': rideId.toString(),
+          'status': 'Finished'
+        });
     if (AppLink.endPoint != AppLink.seferCairoServer) {
       CRUD().post(
         link: "${AppLink.endPoint}/ride/rides/update.php",
@@ -628,6 +673,13 @@ class MapDriverController extends GetxController {
           'price': totalCost,
         },
       );
+      CRUD().post(
+          link: "${AppLink.endPoint}/ride/driver_order/update.php",
+          payload: {
+            // 'driver_id': box.read(BoxName.driverID).toString(),
+            'order_id': rideId.toString(),
+            'status': 'Finished'
+          });
     }
     if (walletChecked == 'true') {
       paymentToken = await generateTokenPassenger(

lib/controller/home/captin/order_request_controller.dart

@@ -3,8 +3,8 @@ import 'dart:convert';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter_overlay_window/flutter_overlay_window.dart';
 import 'package:get/get.dart';
-import 'package:SEFER/constant/links.dart';
-import 'package:SEFER/main.dart';
+import 'package:sefer_driver/constant/links.dart';
+import 'package:sefer_driver/main.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
 import 'dart:math' as math;
 import '../../../constant/box_name.dart';

lib/controller/home/payment/captain_wallet_controller.dart

@@ -1,16 +1,16 @@
 import 'dart:convert';
 
-import 'package:SEFER/constant/style.dart';
-import 'package:SEFER/controller/firebase/firbase_messge.dart';
-import 'package:SEFER/controller/firebase/local_notification.dart';
-import 'package:SEFER/views/widgets/elevated_btn.dart';
-import 'package:SEFER/views/widgets/error_snakbar.dart';
+import 'package:sefer_driver/constant/style.dart';
+import 'package:sefer_driver/controller/firebase/firbase_messge.dart';
+import 'package:sefer_driver/controller/firebase/local_notification.dart';
+import 'package:sefer_driver/views/widgets/elevated_btn.dart';
+import 'package:sefer_driver/views/widgets/error_snakbar.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/constant/links.dart';
-import 'package:SEFER/controller/functions/crud.dart';
-import 'package:SEFER/main.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/constant/links.dart';
+import 'package:sefer_driver/controller/functions/crud.dart';
+import 'package:sefer_driver/main.dart';
 
 class CaptainWalletController extends GetxController {
   bool isLoading = false;
@@ -348,7 +348,7 @@ class CaptainWalletController extends GetxController {
 
   @override
   void onInit() async {
-    getKazanPercent();
+    // getKazanPercent();
 
     await refreshCaptainWallet();
     super.onInit();

lib/controller/home/payment/paymob_payout.dart

@@ -1,11 +1,11 @@
 import 'dart:convert';
 
-import 'package:SEFER/constant/api_key.dart';
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/constant/colors.dart';
-import 'package:SEFER/main.dart';
-import 'package:SEFER/print.dart';
-import 'package:SEFER/views/widgets/error_snakbar.dart';
+import 'package:sefer_driver/constant/api_key.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/constant/colors.dart';
+import 'package:sefer_driver/main.dart';
+import 'package:sefer_driver/print.dart';
+import 'package:sefer_driver/views/widgets/error_snakbar.dart';
 import 'package:get/get.dart';
 import 'package:http/http.dart' as http;
 import 'package:secure_string_operations/secure_string_operations.dart';

lib/controller/home/points_for_rider_controller.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
-import 'package:SEFER/constant/style.dart';
+import 'package:sefer_driver/constant/style.dart';
 
 import '../../constant/api_key.dart';
 import '../../constant/links.dart';

lib/controller/home/profile/feed_back_controller.dart

@@ -2,13 +2,13 @@ import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/constant/colors.dart';
-import 'package:SEFER/constant/links.dart';
-import 'package:SEFER/constant/style.dart';
-import 'package:SEFER/controller/functions/crud.dart';
-import 'package:SEFER/main.dart';
-import 'package:SEFER/views/widgets/elevated_btn.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/constant/colors.dart';
+import 'package:sefer_driver/constant/links.dart';
+import 'package:sefer_driver/constant/style.dart';
+import 'package:sefer_driver/controller/functions/crud.dart';
+import 'package:sefer_driver/main.dart';
+import 'package:sefer_driver/views/widgets/elevated_btn.dart';
 
 class FeedBackController extends GetxController {
   bool isLoading = false;

lib/controller/home/profile/order_history_controller.dart

@@ -1,10 +1,10 @@
 import 'dart:convert';
 
 import 'package:get/get.dart';
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/constant/links.dart';
-import 'package:SEFER/controller/functions/crud.dart';
-import 'package:SEFER/main.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/constant/links.dart';
+import 'package:sefer_driver/controller/functions/crud.dart';
+import 'package:sefer_driver/main.dart';
 
 class OrderHistoryController extends GetxController {
   List<dynamic> orderHistoryListPassenger = [];

lib/controller/home/profile/promos_controller.dart

@@ -1,10 +1,10 @@
 import 'dart:convert';
 
 import 'package:get/get.dart';
-import 'package:SEFER/constant/links.dart';
-import 'package:SEFER/constant/style.dart';
-import 'package:SEFER/controller/functions/crud.dart';
-import 'package:SEFER/views/widgets/elevated_btn.dart';
+import 'package:sefer_driver/constant/links.dart';
+import 'package:sefer_driver/constant/style.dart';
+import 'package:sefer_driver/controller/functions/crud.dart';
+import 'package:sefer_driver/views/widgets/elevated_btn.dart';
 
 class PromosController extends GetxController {
   List<dynamic> promoList = [];

lib/controller/home/splash_screen_controlle.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
 
-import 'package:SEFER/controller/auth/captin/login_captin_controller.dart';
-import 'package:SEFER/views/home/on_boarding_page.dart';
+import 'package:sefer_driver/controller/auth/captin/login_captin_controller.dart';
+import 'package:sefer_driver/views/home/on_boarding_page.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:package_info_plus/package_info_plus.dart';
@@ -66,7 +66,8 @@ class SplashScreenController extends GetxController
           : box.read(BoxName.emailDriver) != null &&
                   box.read(BoxName.phoneDriver) != null &&
                   box.read(BoxName.phoneVerified) == '1'
-              ? await Get.put(LoginDriverController()).loginUsingCredentials(
+              ? await Get.put(LoginDriverController())
+                  .loginWithGoogleCredential(
                       box.read(BoxName.driverID).toString(),
                       box.read(BoxName.emailDriver))
               : Get.off(() => LoginCaptin());

lib/controller/local/local_controller.dart

@@ -94,61 +94,14 @@ class LocaleController extends GetxController {
 
   @override
   void onInit() {
-    String storedLang = box.read(BoxName.lang) ?? "";
-    switch (storedLang) {
-      case "ar":
-        language = const Locale("ar");
-        appTheme = themeArabic;
-        break;
-      case "en":
-        language = const Locale("en");
-        appTheme = themeEnglish;
-        break;
-      case "tr":
-        language = const Locale("tr");
-        appTheme = themeEnglish;
-        break;
-      case "fr":
-        language = const Locale("fr");
-        appTheme = themeEnglish;
-        break;
-      case "it":
-        language = const Locale("it");
-        appTheme = themeEnglish;
-        break;
-      case "de":
-        language = const Locale("de");
-        appTheme = themeEnglish;
-        break;
-      case "el":
-        language = const Locale("el");
-        appTheme = themeEnglish;
-        break;
-      case "es":
-        language = const Locale("es");
-        appTheme = themeEnglish;
-        break;
-      case "fa":
-        language = const Locale("fa");
-        appTheme = themeArabic;
-        break;
-      case "zh":
-        language = const Locale("zh");
-        appTheme = themeEnglish;
-        break;
-      case "ru":
-        language = const Locale("ru");
-        appTheme = themeEnglish;
-        break;
-      case "hi":
-        language = const Locale("hi");
-        appTheme = themeEnglish;
-        break;
-      default:
-        language = Locale(Get.deviceLocale!.languageCode);
-        appTheme = themeEnglish;
-        break;
+    String? storedLang = box.read(BoxName.lang);
+    if (storedLang == null) {
+      // Use device language if no language is stored
+      storedLang = Get.deviceLocale!.languageCode;
+      box.write(BoxName.lang, storedLang);
     }
+
+    changeLang(storedLang);
     super.onInit();
   }
 }

lib/controller/local/translations.dart

@@ -153,14 +153,33 @@ class MyTranslation extends Translations {
           "National Bank of Greece": "البنك الوطني اليوناني",
           "Central Bank Of Egypt": "البنك المركزي المصري",
           "ATTIJARIWAFA BANK Egypt": "البنك التجاري وفا مصر",
-          "Morning Promo": "بونص الصباح",
+          "Morning Promo": "بونص الصباح", "Show my Cars": "عرض سياراتي",
+          "Add criminal page": "إضافة الفيش الجنائي",
+          "Add new car": "إضافة سيارة جديدة",
           'You have gift 300 L.E': "لديك هدية بقيمة 300 جنيه.",
           "VIP Order": "طلب VIP", "VIP Order Accepted": "تم قبول طلب  VIP.",
           "The driver accepted your trip": "السائق قبل رحلتك.",
           "this is count of your all trips in the morning promo today from 7:00am-10:00am":
               "هذا عدد جميع رحلاتك في بونص الصباح اليوم من الساعة 7:00 صباحًا حتى 10:00 صباحًا",
           "Morning Promo Rides": "رحلات عرض الصباح",
+          'Are you sure to make this car as default':
+              'هل أنت متأكد من تعيين هذه السيارة كافتراضية؟',
+          "Sign In by Google": "تسجيل الدخول باستخدام جوجل",
+          'Not updated': 'لم يتم التحديث',
+          'Updated': 'تم التحديث',
+          'Remaining time': 'الوقت المتبقي',
+          'Add bank Account': 'إضافة حساب بنكي',
+          'Are you sure to exit ride?': 'هل أنت متأكد من إنهاء الرحلة؟',
+
+          "seconds": "ثواني",
+          'You will cancel registration': 'ستقوم بإلغاء التسجيل',
+          "Create new Account": "إنشاء حساب جديد",
+          "You haven't moved sufficiently!": "أنت لم تتحرك بما فيه الكفاية!",
+          'This for new registration': ' للتسجيل الجديد',
+          'You have received a gift token!': 'لقد حصلت على رمز هدية!',
           "Afternoon Promo": "بونص الظهر",
+          'for ': 'ل ',
+          "You dont have invitation code": "ليس لديك رمز دعوة.",
           "this is count of your all trips in the Afternoon promo today from 3:00pm-6:00 pm":
               "هذا عدد جميع رحلاتك في بونص بعد الظهر اليوم من الساعة 3:00 مساءً حتى 6:00 مساءً",
           "Afternoon Promo Rides": "رحلات بونص بعد الظهر",

lib/controller/notification/notification_captain_controller.dart

@@ -1,8 +1,8 @@
 import 'dart:convert';
 
 import 'package:get/get.dart';
-import 'package:SEFER/constant/style.dart';
-import 'package:SEFER/views/widgets/elevated_btn.dart';
+import 'package:sefer_driver/constant/style.dart';
+import 'package:sefer_driver/views/widgets/elevated_btn.dart';
 
 import '../../constant/box_name.dart';
 import '../../constant/links.dart';

lib/controller/notification/passenger_notification_controller.dart

@@ -1,7 +1,7 @@
 import 'dart:convert';
 
 import 'package:get/get.dart';
-import 'package:SEFER/controller/firebase/firbase_messge.dart';
+import 'package:sefer_driver/controller/firebase/firbase_messge.dart';
 
 import '../../constant/box_name.dart';
 import '../../constant/links.dart';

lib/controller/notification/ride_available_controller.dart

@@ -1,13 +1,15 @@
 import 'dart:convert';
 import 'dart:math';
 
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/controller/functions/location_controller.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/controller/functions/location_controller.dart';
+import 'package:geolocator/geolocator.dart';
 import 'package:get/get.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
 
 import '../../constant/links.dart';
 import '../../main.dart';
+import '../../print.dart';
 import '../../views/widgets/mydialoug.dart';
 import '../functions/crud.dart';
 
@@ -16,22 +18,6 @@ class RideAvailableController extends GetxController {
   Map rideAvailableMap = {};
   late LatLng southwest;
   late LatLng northeast;
-  // LatLngBounds calculateBounds(
-  //     double centerLat, double centerLng, double radius) {
-  //   // double radius = 4000; // 10 km in meters
-
-  //   southwest = LatLng(
-  //     centerLat - (radius / 111000),
-  //     centerLng - (radius / (111000 * cos(centerLat))),
-  //   );
-
-  //   northeast = LatLng(
-  //     centerLat + (radius / 111000),
-  //     centerLng + (radius / (111000 * cos(centerLat))),
-  //   );
-
-  //   return LatLngBounds(southwest: southwest, northeast: northeast);
-  // }
 
   LatLngBounds calculateBounds(double lat, double lng, double radiusInMeters) {
     const double earthRadius = 6378137.0; // Earth's radius in meters
@@ -67,22 +53,48 @@ class RideAvailableController extends GetxController {
     );
   }
 
+  double calculateDistance(String startLocation) {
+    List<String> startLocationParts = startLocation.split(',');
+    double startLatitude = double.parse(startLocationParts[0]);
+    double startLongitude = double.parse(startLocationParts[1]);
+
+    // Assuming currentLocation is the driver's location
+    double currentLatitude = Get.find<LocationController>().latitude;
+    double currentLongitude = Get.find<LocationController>().longitude;
+
+    return Geolocator.distanceBetween(
+      currentLatitude,
+      currentLongitude,
+      startLatitude,
+      startLongitude,
+    );
+  }
+
+  // void sortRidesByDistance() {
+  //   rideAvailableMap['message'].sort((a, b) {
+  //     double distanceA = calculateDistance(a['start_location']);
+  //     double distanceB = calculateDistance(b['start_location']);
+  //     return distanceA.compareTo(distanceB);
+  //   });
+  // }
+
   getRideAvailable() async {
     isLoading = true;
     LatLngBounds bounds = calculateBounds(
         Get.find<LocationController>().myLocation.latitude,
         Get.find<LocationController>().myLocation.longitude,
         4000);
-    var res = await CRUD().get(
-      link: AppLink.getRideWaiting,
-      payload: {
-        "carType": box.read(BoxName.carTypeOfDriver).toString(),
+    var payload = {
+      // "carType": box.read(BoxName.carTypeOfDriver).toString(),
       'southwestLat': bounds.southwest.latitude.toString(),
       'southwestLon': bounds.southwest.longitude.toString(),
       'northeastLat': bounds.northeast.latitude.toString(),
       'northeastLon': bounds.northeast.longitude.toString(),
-      },
-    );
+    };
+    Log.print('payload: ${payload}');
+    var res = await CRUD().get(link: AppLink.getRideWaiting, payload: payload);
+    Log.print('res: ${res}');
+
     if (res != 'failure') {
       rideAvailableMap = jsonDecode(res);
       isLoading = false;
@@ -92,16 +104,6 @@ class RideAvailableController extends GetxController {
         Get.back();
         Get.back();
       });
-      // Get.defaultDialog(
-      //     title: "No Rides Available".tr,
-      //     middleText: '',
-      //     titleStyle: AppStyle.title,
-      //     confirm: MyElevatedButton(
-      //         title: 'Ok'.tr,
-      //         onPressed: () {
-      //           Get.back();
-      //           Get.back();
-      //         }));
     }
   }
 

lib/controller/payment/driver_payment_controller.dart

@@ -1,11 +1,11 @@
 import 'dart:convert';
 
-import 'package:SEFER/views/widgets/elevated_btn.dart';
+import 'package:sefer_driver/views/widgets/elevated_btn.dart';
 import 'package:get/get.dart';
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/constant/links.dart';
-import 'package:SEFER/controller/functions/crud.dart';
-import 'package:SEFER/main.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/constant/links.dart';
+import 'package:sefer_driver/controller/functions/crud.dart';
+import 'package:sefer_driver/main.dart';
 
 class DriverWalletHistoryController extends GetxController {
   bool isLoading = false;

lib/controller/payment/payment_controller.dart

@@ -1,10 +1,10 @@
 import 'dart:convert';
-import 'package:SEFER/constant/api_key.dart';
-import 'package:SEFER/constant/style.dart';
-import 'package:SEFER/controller/functions/tts.dart';
-import 'package:SEFER/controller/payment/paymob/paymob_response.dart';
-import 'package:SEFER/views/widgets/elevated_btn.dart';
-import 'package:SEFER/views/widgets/error_snakbar.dart';
+import 'package:sefer_driver/constant/api_key.dart';
+import 'package:sefer_driver/constant/style.dart';
+import 'package:sefer_driver/controller/functions/tts.dart';
+import 'package:sefer_driver/controller/payment/paymob/paymob_response.dart';
+import 'package:sefer_driver/views/widgets/elevated_btn.dart';
+import 'package:sefer_driver/views/widgets/error_snakbar.dart';
 import 'package:http/http.dart' as http;
 import 'package:flutter/material.dart';
 import 'package:flutter_paypal/flutter_paypal.dart';

lib/controller/payment/paymob.dart

@@ -1,4 +1,4 @@
-import 'package:SEFER/constant/box_name.dart';
+import 'package:sefer_driver/constant/box_name.dart';
 import 'package:dio/dio.dart' as dio;
 import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';

lib/controller/payment/paymob/paymob_response.dart

@@ -1,5 +1,5 @@
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/main.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/main.dart';
 import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:webview_flutter/webview_flutter.dart';

lib/controller/payment/paymob/paymob_wallet.dart

@@ -1,5 +1,5 @@
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/main.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/main.dart';
 import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:webview_flutter/webview_flutter.dart';

lib/controller/profile/captain_profile_controller.dart

@@ -2,10 +2,10 @@ import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/constant/links.dart';
-import 'package:SEFER/controller/functions/crud.dart';
-import 'package:SEFER/main.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/constant/links.dart';
+import 'package:sefer_driver/controller/functions/crud.dart';
+import 'package:sefer_driver/main.dart';
 
 class CaptainProfileController extends GetxController {
   bool isLoading = false;

lib/controller/profile/profile_controller.dart

@@ -2,11 +2,11 @@ import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/constant/links.dart';
-import 'package:SEFER/controller/functions/crud.dart';
-import 'package:SEFER/main.dart';
-import 'package:SEFER/views/widgets/my_textField.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/constant/links.dart';
+import 'package:sefer_driver/controller/functions/crud.dart';
+import 'package:sefer_driver/main.dart';
+import 'package:sefer_driver/views/widgets/my_textField.dart';
 
 import '../../views/widgets/elevated_btn.dart';
 

lib/controller/profile/setting_controller.dart

@@ -1,5 +1,5 @@
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/main.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/main.dart';
 import 'package:get/get.dart';
 
 class SettingController extends GetxController {

lib/controller/rate/rate_app_controller.dart

@@ -1,12 +1,12 @@
 import 'dart:convert';
 
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/constant/colors.dart';
-import 'package:SEFER/constant/links.dart';
-import 'package:SEFER/controller/functions/crud.dart';
-import 'package:SEFER/main.dart';
-import 'package:SEFER/views/widgets/error_snakbar.dart';
-import 'package:SEFER/views/widgets/mydialoug.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/constant/colors.dart';
+import 'package:sefer_driver/constant/links.dart';
+import 'package:sefer_driver/controller/functions/crud.dart';
+import 'package:sefer_driver/main.dart';
+import 'package:sefer_driver/views/widgets/error_snakbar.dart';
+import 'package:sefer_driver/views/widgets/mydialoug.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 // Import url_launcher to open the app store

lib/controller/rate/rate_conroller.dart

@@ -1,17 +1,17 @@
-import 'package:SEFER/constant/colors.dart';
-import 'package:SEFER/controller/firebase/firbase_messge.dart';
-import 'package:SEFER/controller/home/captin/map_driver_controller.dart';
-import 'package:SEFER/controller/payment/payment_controller.dart';
-import 'package:SEFER/views/widgets/error_snakbar.dart';
+import 'package:sefer_driver/constant/colors.dart';
+import 'package:sefer_driver/controller/firebase/firbase_messge.dart';
+import 'package:sefer_driver/controller/home/captin/map_driver_controller.dart';
+import 'package:sefer_driver/controller/payment/payment_controller.dart';
+import 'package:sefer_driver/views/widgets/error_snakbar.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:get/get.dart';
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/constant/links.dart';
-import 'package:SEFER/constant/style.dart';
-import 'package:SEFER/controller/functions/crud.dart';
-import 'package:SEFER/main.dart';
-import 'package:SEFER/views/home/Captin/home_captain/home_captin.dart';
-import 'package:SEFER/views/widgets/elevated_btn.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/constant/links.dart';
+import 'package:sefer_driver/constant/style.dart';
+import 'package:sefer_driver/controller/functions/crud.dart';
+import 'package:sefer_driver/main.dart';
+import 'package:sefer_driver/views/home/Captin/home_captain/home_captin.dart';
+import 'package:sefer_driver/views/widgets/elevated_btn.dart';
 
 import '../home/payment/captain_wallet_controller.dart';
 
@@ -70,23 +70,7 @@ class RateController extends GetxController {
               'token': paymentToken3,
               'driverID': box.read(BoxName.driverID).toString(),
             });
-            // }
-            // else {
-            // double pointsSubtraction = 0;
-            // pointsSubtraction = remainingFee *
-            //     (-1) /
-            //     double.parse(
-            //         Get.find<MapDriverController>().kazan); // for egypt /100
-            // var paymentToken4 = await Get.find<MapDriverController>()
-            //     .generateTokenDriver((pointsSubtraction).toStringAsFixed(0));
-            // var res = await CRUD()
-            //     .post(link: AppLink.addDriversWalletPoints, payload: {
-            //   'paymentID': 'rideId$rideId',
-            //   'amount': (pointsSubtraction).toStringAsFixed(0),
-            //   'paymentMethod': 'Remainder',
-            //   'token': paymentToken4,
-            //   'driverID': box.read(BoxName.driverID).toString(),
-            // });
+
             FirebaseMessagesController().sendNotificationToDriverMAP(
                 'Wallet Added'.tr,
                 'Wallet Added${(remainingFee).toStringAsFixed(0)}'.tr,
@@ -101,7 +85,7 @@ class RateController extends GetxController {
         });
       } else {
         Get.defaultDialog(
-            title: '${'The price must be over than '.tr}$priceOfTrip',
+            title: '${'The price must be over than '.tr} $priceOfTrip',
             middleText: '',
             confirm: MyElevatedButton(
                 title: 'Ok'.tr,

lib/controller/themes/themes.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:SEFER/constant/style.dart';
+import 'package:sefer_driver/constant/style.dart';
 
 import '../../constant/colors.dart';
 

lib/main.dart

@@ -2,9 +2,9 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'dart:math';
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/controller/payment/paymob/paymob_response.dart';
-import 'package:SEFER/views/home/Captin/orderCaptin/order_request_page.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/controller/payment/paymob/paymob_response.dart';
+import 'package:sefer_driver/views/home/Captin/orderCaptin/order_request_page.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/material.dart';

lib/models/db_sql.dart

@@ -1,4 +1,4 @@
-import 'package:SEFER/constant/table_names.dart';
+import 'package:sefer_driver/constant/table_names.dart';
 import 'package:sqflite/sqflite.dart';
 import 'package:path/path.dart';
 

lib/splash_screen_page.dart

@@ -1,10 +1,10 @@
-import 'package:SEFER/constant/box_name.dart';
+import 'package:sefer_driver/constant/box_name.dart';
 import 'package:animated_text_kit/animated_text_kit.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:SEFER/constant/colors.dart';
-import 'package:SEFER/constant/info.dart';
-import 'package:SEFER/constant/style.dart';
+import 'package:sefer_driver/constant/colors.dart';
+import 'package:sefer_driver/constant/info.dart';
+import 'package:sefer_driver/constant/style.dart';
 
 import 'controller/home/splash_screen_controlle.dart';
 import 'main.dart';

lib/views/Rate/rate_app_page.dart

@@ -1,5 +1,5 @@
-import 'package:SEFER/views/widgets/elevated_btn.dart';
-import 'package:SEFER/views/widgets/my_textField.dart';
+import 'package:sefer_driver/views/widgets/elevated_btn.dart';
+import 'package:sefer_driver/views/widgets/my_textField.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import '../../controller/rate/rate_app_controller.dart';

lib/views/Rate/rate_passenger.dart

@@ -1,12 +1,12 @@
-import 'package:SEFER/controller/home/captin/map_driver_controller.dart';
-import 'package:SEFER/views/widgets/my_textField.dart';
+import 'package:sefer_driver/controller/home/captin/map_driver_controller.dart';
+import 'package:sefer_driver/views/widgets/my_textField.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_rating_bar/flutter_rating_bar.dart';
 import 'package:get/get.dart';
-import 'package:SEFER/constant/colors.dart';
-import 'package:SEFER/views/widgets/elevated_btn.dart';
-import 'package:SEFER/views/widgets/my_scafold.dart';
+import 'package:sefer_driver/constant/colors.dart';
+import 'package:sefer_driver/views/widgets/elevated_btn.dart';
+import 'package:sefer_driver/views/widgets/my_scafold.dart';
 
 import '../../constant/style.dart';
 import '../../controller/rate/rate_conroller.dart';
@@ -51,10 +51,10 @@ class RatePassenger extends StatelessWidget {
                                 child: Padding(
                                   padding: const EdgeInsets.all(4),
                                   child: Text(
-                                    (double.parse(controller.price.toString()) *
-                                                .12 +
-                                            double.parse(
-                                                controller.price.toString()))
+                                    (double.parse(controller.price.toString()) -
+                                            double.parse(controller.price
+                                                    .toString()) *
+                                                .12)
                                         .toStringAsFixed(2),
                                     style: AppStyle.number.copyWith(
                                         color: AppColor.redColor,

lib/views/Rate/ride_calculate_driver.dart

@@ -1,11 +1,11 @@
 import 'package:fl_chart/fl_chart.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:SEFER/constant/colors.dart';
-import 'package:SEFER/constant/info.dart';
-import 'package:SEFER/constant/style.dart';
-import 'package:SEFER/views/widgets/my_scafold.dart';
-import 'package:SEFER/views/widgets/mycircular.dart';
+import 'package:sefer_driver/constant/colors.dart';
+import 'package:sefer_driver/constant/info.dart';
+import 'package:sefer_driver/constant/style.dart';
+import 'package:sefer_driver/views/widgets/my_scafold.dart';
+import 'package:sefer_driver/views/widgets/mycircular.dart';
 import 'package:intl/intl.dart';
 import '../../controller/home/captin/duration_controller .dart';
 

lib/views/auth/captin/ai_page.dart

@@ -1,15 +1,15 @@
-import 'package:SEFER/controller/functions/crud.dart';
+import 'package:sefer_driver/controller/functions/crud.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:SEFER/constant/colors.dart';
-import 'package:SEFER/constant/style.dart';
-import 'package:SEFER/constant/table_names.dart';
-import 'package:SEFER/controller/auth/captin/register_captin_controller.dart';
-import 'package:SEFER/controller/functions/ocr_controller.dart';
-import 'package:SEFER/main.dart';
-import 'package:SEFER/views/widgets/elevated_btn.dart';
-import 'package:SEFER/views/widgets/my_scafold.dart';
-import 'package:SEFER/views/widgets/mycircular.dart';
+import 'package:sefer_driver/constant/colors.dart';
+import 'package:sefer_driver/constant/style.dart';
+import 'package:sefer_driver/constant/table_names.dart';
+import 'package:sefer_driver/controller/auth/captin/register_captin_controller.dart';
+import 'package:sefer_driver/controller/functions/ocr_controller.dart';
+import 'package:sefer_driver/main.dart';
+import 'package:sefer_driver/views/widgets/elevated_btn.dart';
+import 'package:sefer_driver/views/widgets/my_scafold.dart';
+import 'package:sefer_driver/views/widgets/mycircular.dart';
 
 import '../../../constant/links.dart';
 import '../../../controller/functions/gemeni.dart';

lib/views/auth/captin/camera_widgets/camera_lisence_page.dart

@@ -1,7 +1,7 @@
 import 'package:camera/camera.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:SEFER/views/widgets/elevated_btn.dart';
+import 'package:sefer_driver/views/widgets/elevated_btn.dart';
 
 import '../../../../constant/colors.dart';
 import '../../../../constant/style.dart';

lib/views/auth/captin/car_license_page.dart

@@ -2,7 +2,7 @@ import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:SEFER/controller/functions/ocr_controller.dart';
+import 'package:sefer_driver/controller/functions/ocr_controller.dart';
 
 import '../../../constant/style.dart';
 import '../../../controller/auth/captin/ml_google_doc.dart';

lib/views/auth/captin/cards/egypt_card_a_i.dart

@@ -1,8 +1,10 @@
-import 'package:SEFER/controller/functions/gemeni.dart';
-import 'package:SEFER/controller/functions/tts.dart';
-import 'package:SEFER/views/widgets/elevated_btn.dart';
-import 'package:SEFER/views/widgets/my_circular_indicator_timer.dart';
-import 'package:SEFER/views/widgets/my_textField.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/controller/functions/gemeni.dart';
+import 'package:sefer_driver/controller/functions/tts.dart';
+import 'package:sefer_driver/views/widgets/elevated_btn.dart';
+import 'package:sefer_driver/views/widgets/my_circular_indicator_timer.dart';
+import 'package:sefer_driver/views/widgets/my_textField.dart';
+import 'package:sefer_driver/views/widgets/mydialoug.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:url_launcher/url_launcher.dart';
@@ -10,6 +12,7 @@ import '../../../../constant/colors.dart';
 import '../../../../constant/links.dart';
 import '../../../../constant/style.dart';
 import '../../../../controller/functions/package_info.dart';
+import '../../../../main.dart';
 import '../../../widgets/my_scafold.dart';
 
 class EgyptCardAI extends StatelessWidget {
@@ -36,6 +39,11 @@ class EgyptCardAI extends StatelessWidget {
         }),
         body: [
           GetBuilder<AI>(builder: (controller) {
+            if (box.read(BoxName.isInstall) != null ||
+                box.read(BoxName.isInstall).toString() != '') {
+              controller.updateInvitationCodeFromRegister();
+            }
+
             return controller.isLoading
                 ? MyCircularProgressIndicatorWithTimer(
                     isLoading: controller.isLoading,
@@ -117,57 +125,7 @@ class EgyptCardAI extends StatelessWidget {
             right: 30,
             left: 30,
             child: GetBuilder<AI>(builder: (controller) {
-              return controller.isInviteDriverFound == false
-                  ? Padding(
-                      padding: const EdgeInsets.symmetric(vertical: 60),
-                      child: Container(
-                        decoration: AppStyle.boxDecoration1,
-                        child: Padding(
-                          padding: const EdgeInsets.all(8.0),
-                          child: Column(
-                            mainAxisAlignment: MainAxisAlignment.spaceAround,
-                            children: [
-                              Text(
-                                "Do you have an invitation code from another driver?"
-                                    .tr,
-                                style: AppStyle.title,
-                                textAlign: TextAlign.center,
-                              ),
-                              const SizedBox(
-                                height: 30,
-                              ),
-                              Form(
-                                key: controller.formKey,
-                                child: MyTextForm(
-                                  controller:
-                                      controller.invitationCodeController,
-                                  label: "Paste the code here".tr,
-                                  hint: "Paste the code here".tr,
-                                  type: TextInputType.name,
-                                ),
-                              ),
-                              const SizedBox(
-                                height: 30,
-                              ),
-                              MyElevatedButton(
-                                  title: 'Ok'.tr,
-                                  onPressed: () async {
-                                    controller
-                                        .updateInvitationCodeFromRegister();
-                                  }),
-                              MyElevatedButton(
-                                  kolor: AppColor.yellowColor,
-                                  title: "No, I don't have a code".tr,
-                                  onPressed: () {
-                                    controller.isInviteDriverFound = true;
-                                    controller.update();
-                                  })
-                            ],
-                          ),
-                        ),
-                      ),
-                    )
-                  : controller.approved == false
+              return controller.approved == false
                   ? Container(
                       decoration: AppStyle.boxDecoration1,
                       child: Padding(
@@ -192,6 +150,7 @@ class EgyptCardAI extends StatelessWidget {
                               decoration: AppStyle.boxDecoration1,
                               child: TextButton.icon(
                                 onPressed: () async {
+                                  controller.startTimer();
                                   await textToSpeechController.speakText(
                                       'To become a ride-sharing driver on the Sefer app, you need to upload your driver\'s license, ID document, and car registration document. Our AI system will instantly review and verify their authenticity in just 2-3 minutes. If your documents are approved, you can start working as a driver on the Sefer app. Please note, submitting fraudulent documents is a serious offense and may result in immediate termination and legal consequences.'
                                           .tr);
@@ -207,58 +166,88 @@ class EgyptCardAI extends StatelessWidget {
                               ),
                             ),
                             const SizedBox(height: 8),
-                                GetBuilder<TextToSpeechController>(
-                                    builder: (textToSpeechController) {
-                                  return textToSpeechController.isComplete
+                            // textToSpeechController.isComplete
+                            //     ? Row(
+                            //         mainAxisAlignment:
+                            //             MainAxisAlignment.spaceAround,
+                            //         children: [
+                            //           MyElevatedButton(
+                            //               title: 'OK'.tr,
+                            //               kolor: AppColor.greenColor,
+                            //               onPressed: () {
+                            //                 controller.setApproved();
+                            //               }),
+                            //           MyElevatedButton(
+                            //               title: 'cancel'.tr,
+                            //               kolor: AppColor.redColor,
+                            //               onPressed: () {
+                            //                 Get.defaultDialog(
+                            //                     title:
+                            //                         'You will cancel registeration'
+                            //                             .tr,
+                            //                     middleText: '',
+                            //                     content: IconButton(
+                            //                       onPressed: () async {
+                            //                         await textToSpeechController
+                            //                             .speakText(
+                            //                                 'You will cancel registeration'
+                            //                                     .tr);
+                            //                       },
+                            //                       icon: const Icon(
+                            //                           Icons.headphones),
+                            //                     ),
+                            //                     confirm: MyElevatedButton(
+                            //                         title: 'OK'.tr,
+                            //                         kolor: AppColor.redColor,
+                            //                         onPressed: () {
+                            //                           Get.back();
+                            //                           Get.back();
+                            //                         }),
+                            //                     cancel: MyElevatedButton(
+                            //                         title: 'Cancel'.tr,
+                            //                         kolor: AppColor.greenColor,
+                            //                         onPressed: () {
+                            //                           Get.back();
+                            //                         }));
+                            //               }),
+                            //         ],
+                            //       )
+                            //     : const SizedBox()
+                            controller.isTimerComplete
                                 ? Row(
                                     mainAxisAlignment:
                                         MainAxisAlignment.spaceAround,
                                     children: [
                                       MyElevatedButton(
-                                                title: 'OK'.tr,
+                                          title: 'Ok'.tr,
                                           kolor: AppColor.greenColor,
                                           onPressed: () {
                                             controller.setApproved();
                                           }),
                                       MyElevatedButton(
-                                                title: 'cancel'.tr,
+                                          title: 'Cancel'.tr,
                                           kolor: AppColor.redColor,
                                           onPressed: () {
-                                                  Get.defaultDialog(
-                                                      title:
-                                                          'You will cancel registeration'
+                                            MyDialog().getDialog(
+                                                'You will cancel registration'
                                                     .tr,
-                                                      middleText: '',
-                                                      content: IconButton(
-                                                        onPressed: () async {
-                                                          await textToSpeechController
-                                                              .speakText(
-                                                                  'You will cancel registeration'
-                                                                      .tr);
-                                                        },
-                                                        icon: const Icon(
-                                                            Icons.headphones),
-                                                      ),
-                                                      confirm: MyElevatedButton(
-                                                          title: 'OK'.tr,
-                                                          kolor:
-                                                              AppColor.redColor,
-                                                          onPressed: () {
+                                                '', () async {
                                               Get.back();
                                               Get.back();
-                                                          }),
-                                                      cancel: MyElevatedButton(
-                                                          title: 'Cancel'.tr,
-                                                          kolor: AppColor
-                                                              .greenColor,
-                                                          onPressed: () {
-                                                            Get.back();
-                                                          }));
+                                            });
                                           }),
                                     ],
                                   )
-                                      : const SizedBox();
-                                })
+                                : Column(
+                                    children: [
+                                      CircularProgressIndicator(
+                                        value: controller.progressValue,
+                                      ),
+                                      Text(
+                                        '${'Remaining time'.tr}: ${controller.remainingSeconds} ${"seconds".tr}',
+                                      ),
+                                    ],
+                                  ),
                           ],
                         ),
                       ),

lib/views/auth/captin/cards/sms_signup.dart

@@ -1,10 +1,10 @@
-import 'package:SEFER/constant/colors.dart';
-import 'package:SEFER/constant/style.dart';
-import 'package:SEFER/controller/auth/captin/register_captin_controller.dart';
-import 'package:SEFER/views/widgets/elevated_btn.dart';
-import 'package:SEFER/views/widgets/my_scafold.dart';
-import 'package:SEFER/views/widgets/my_textField.dart';
-import 'package:SEFER/views/widgets/mycircular.dart';
+import 'package:sefer_driver/constant/colors.dart';
+import 'package:sefer_driver/constant/style.dart';
+import 'package:sefer_driver/controller/auth/captin/register_captin_controller.dart';
+import 'package:sefer_driver/views/widgets/elevated_btn.dart';
+import 'package:sefer_driver/views/widgets/my_scafold.dart';
+import 'package:sefer_driver/views/widgets/my_textField.dart';
+import 'package:sefer_driver/views/widgets/mycircular.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 

lib/views/auth/captin/contact_us_page.dart

@@ -1,6 +1,6 @@
-import 'package:SEFER/constant/colors.dart';
-import 'package:SEFER/constant/style.dart';
-import 'package:SEFER/views/widgets/my_scafold.dart';
+import 'package:sefer_driver/constant/colors.dart';
+import 'package:sefer_driver/constant/style.dart';
+import 'package:sefer_driver/views/widgets/my_scafold.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_font_icons/flutter_font_icons.dart';

lib/views/auth/captin/criminal_documents_page.dart

@@ -1,7 +1,7 @@
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/constant/style.dart';
-import 'package:SEFER/main.dart';
-import 'package:SEFER/views/widgets/my_scafold.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/constant/style.dart';
+import 'package:sefer_driver/main.dart';
+import 'package:sefer_driver/views/widgets/my_scafold.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 
@@ -77,7 +77,7 @@ class CriminalDocumemtPage extends StatelessWidget {
                             ],
                           );
                         } else {
-                          await controller.addCriminalDeocuments();
+                          await controller.addCriminalDocuments();
                         }
                       })
                   : const SizedBox(),

lib/views/auth/captin/driver_car_controller.dart

@@ -1,17 +1,17 @@
 import 'dart:convert';
 
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/constant/colors.dart';
-import 'package:SEFER/constant/links.dart';
-import 'package:SEFER/controller/functions/crud.dart';
-import 'package:SEFER/main.dart';
-import 'package:SEFER/views/widgets/error_snakbar.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/constant/colors.dart';
+import 'package:sefer_driver/constant/links.dart';
+import 'package:sefer_driver/controller/functions/crud.dart';
+import 'package:sefer_driver/main.dart';
+import 'package:sefer_driver/views/widgets/error_snakbar.dart';
 import 'package:get/get.dart';
 
 class DriverCarController extends GetxController {
   bool isLoading = false;
   List cars = [];
-  int? carId;
+  // int? carId;
   fetchCatrsForDrivers() async {
     isLoading = true;
     update();
@@ -21,7 +21,7 @@ class DriverCarController extends GetxController {
     if (res != 'failure') {
       var d = jsonDecode(res)['message'];
       cars = d;
-      carId = cars.isEmpty ? 1 : cars.length + 1;
+      // carId = cars.isEmpty ? 1 : cars.length + 1;
     }
     isLoading = false;
     update();
@@ -29,35 +29,35 @@ class DriverCarController extends GetxController {
 
   addCarsForDrivers(
       String vin,
-      String car_plate,
+      String carPlate,
       String make,
       String model,
       String year,
-      String expiration_date,
+      String expirationDate,
       String color,
-      String color_hex,
+      String colorHex,
       String address,
       String owner,
-      String registration_date,
+      String registrationDate,
       String displacement,
       String fuel) async {
     var res = await CRUD().post(
-      link: AppLink.addNewCarsDrivers,
+      link: AppLink.addRegisrationCar,
       payload: {
         "driverID": box.read(BoxName.driverID).toString(),
-        "vin": vin,
-        "car_plate": car_plate,
-        "make": make,
-        "model": model,
-        "year": year,
-        "expiration_date": expiration_date,
-        "color": color,
-        "owner": owner,
-        "color_hex": color_hex,
-        "address": address,
-        "displacement": displacement,
-        "fuel": fuel,
-        "registration_date": registration_date,
+        "vin": vin ?? 'unknown',
+        "car_plate": carPlate.toString(),
+        "make": make ?? 'unknown',
+        "model": model ?? 'unknown',
+        "year": year ?? 'unknown',
+        "expiration_date": expirationDate ?? 'unknown',
+        "color": color ?? 'unknown',
+        "owner": owner ?? 'unknown',
+        "color_hex": colorHex ?? '#000000',
+        "address": address ?? 'unknown',
+        "displacement": displacement ?? 'unknown',
+        "fuel": fuel ?? 'unknown',
+        "registration_date": registrationDate ?? 'unknown',
       },
     );
     if (res != 'failure') {
@@ -69,7 +69,39 @@ class DriverCarController extends GetxController {
     }
   }
 
-  removeCar(String car) async {}
+// update carRegistration only and insert on it without tow column
+  Future<void> updateCarRegistration(String id, String driverID) async {
+    final body = {
+      'id': id,
+      'driverID': driverID,
+    };
+// remove default before update
+    var response = await CRUD().post(
+      link: AppLink.makeDefaultCar,
+      payload: body,
+    );
+
+    if (response != 'failure') {
+      mySnackbarSuccess('Updated'.tr);
+    } else {
+      mySnackeBarError('Not updated'.tr);
+    }
+  }
+
+//todo need review
+  removeCar(String carId) async {
+    isLoading = true;
+    update();
+    var res = await CRUD().post(link: AppLink.deleteNewCarsDrivers, payload: {
+      "id": carId.toString(),
+    });
+    if (res != 'failure') {
+      mySnackbarSuccess('deleted'.tr);
+    }
+    isLoading = false;
+    update();
+  }
+
   @override
   void onInit() {
     fetchCatrsForDrivers();

lib/views/auth/captin/invite_driver_screen.dart

@@ -1,6 +1,6 @@
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/constant/colors.dart';
-import 'package:SEFER/main.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/constant/colors.dart';
+import 'package:sefer_driver/main.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:get/get.dart';

lib/views/auth/captin/login_captin.dart

@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:SEFER/views/auth/captin/contact_us_page.dart';
+import 'package:sefer_driver/views/auth/captin/contact_us_page.dart';
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
@@ -197,7 +197,7 @@ class LoginCaptin extends StatelessWidget {
                                                                           .currentState!
                                                                           .validate()) {
                                                                         await Get.find<LoginDriverController>()
-                                                                            .loginUsingCredentials(
+                                                                            .loginWithGoogleCredential(
                                                                           controller
                                                                               .passwordController
                                                                               .text,
@@ -329,7 +329,7 @@ class LoginCaptin extends StatelessWidget {
                                             box.write(BoxName.emailDriver,
                                                 user.email);
                                             Get.find<LoginDriverController>()
-                                                .loginUsingCredentials(
+                                                .loginWithGoogleCredential(
                                               box
                                                   .read(BoxName.driverID)
                                                   .toString(),

lib/views/auth/captin/logout_captain.dart

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:SEFER/constant/colors.dart';
-import 'package:SEFER/controller/functions/log_out.dart';
-import 'package:SEFER/views/widgets/elevated_btn.dart';
-import 'package:SEFER/views/widgets/my_scafold.dart';
+import 'package:sefer_driver/constant/colors.dart';
+import 'package:sefer_driver/controller/functions/log_out.dart';
+import 'package:sefer_driver/views/widgets/elevated_btn.dart';
+import 'package:sefer_driver/views/widgets/my_scafold.dart';
 
 class LogoutCaptain extends StatelessWidget {
   const LogoutCaptain({super.key});

lib/views/auth/captin/register_captin.dart

@@ -1,9 +1,9 @@
-import 'package:SEFER/constant/style.dart';
+import 'package:sefer_driver/constant/style.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:SEFER/controller/auth/captin/register_captin_controller.dart';
-import 'package:SEFER/views/widgets/elevated_btn.dart';
-import 'package:SEFER/views/widgets/my_scafold.dart';
+import 'package:sefer_driver/controller/auth/captin/register_captin_controller.dart';
+import 'package:sefer_driver/views/widgets/elevated_btn.dart';
+import 'package:sefer_driver/views/widgets/my_scafold.dart';
 
 import '../../../constant/colors.dart';
 import '../../../controller/auth/google_sign.dart';

lib/views/auth/captin/verify_email_captain.dart

@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:SEFER/constant/colors.dart';
-import 'package:SEFER/constant/style.dart';
-import 'package:SEFER/controller/auth/captin/register_captin_controller.dart';
-import 'package:SEFER/views/widgets/elevated_btn.dart';
-import 'package:SEFER/views/widgets/my_scafold.dart';
+import 'package:sefer_driver/constant/colors.dart';
+import 'package:sefer_driver/constant/style.dart';
+import 'package:sefer_driver/controller/auth/captin/register_captin_controller.dart';
+import 'package:sefer_driver/views/widgets/elevated_btn.dart';
+import 'package:sefer_driver/views/widgets/my_scafold.dart';
 
 class VerifyEmailCaptainPage extends StatelessWidget {
   VerifyEmailCaptainPage({super.key});

lib/views/auth/login_page.dart

@@ -3,13 +3,13 @@ import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_widget_from_html/flutter_widget_from_html.dart';
 import 'package:get/get.dart';
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/constant/colors.dart';
-import 'package:SEFER/constant/style.dart';
-import 'package:SEFER/main.dart';
-import 'package:SEFER/views/auth/captin/login_captin.dart';
-import 'package:SEFER/views/widgets/elevated_btn.dart';
-import 'package:SEFER/views/widgets/my_scafold.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/constant/colors.dart';
+import 'package:sefer_driver/constant/style.dart';
+import 'package:sefer_driver/main.dart';
+import 'package:sefer_driver/views/auth/captin/login_captin.dart';
+import 'package:sefer_driver/views/widgets/elevated_btn.dart';
+import 'package:sefer_driver/views/widgets/my_scafold.dart';
 
 import '../../constant/info.dart';
 import '../../controller/auth/login_controller.dart';

lib/views/auth/register_page.dart

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:SEFER/constant/style.dart';
-import 'package:SEFER/controller/auth/register_controller.dart';
-import 'package:SEFER/views/widgets/elevated_btn.dart';
-import 'package:SEFER/views/widgets/my_scafold.dart';
+import 'package:sefer_driver/constant/style.dart';
+import 'package:sefer_driver/controller/auth/register_controller.dart';
+import 'package:sefer_driver/views/widgets/elevated_btn.dart';
+import 'package:sefer_driver/views/widgets/my_scafold.dart';
 
 import '../../constant/colors.dart';
 

lib/views/auth/verify_email_page.dart

@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:SEFER/constant/colors.dart';
-import 'package:SEFER/constant/style.dart';
-import 'package:SEFER/controller/auth/register_controller.dart';
-import 'package:SEFER/views/widgets/elevated_btn.dart';
-import 'package:SEFER/views/widgets/my_scafold.dart';
+import 'package:sefer_driver/constant/colors.dart';
+import 'package:sefer_driver/constant/style.dart';
+import 'package:sefer_driver/controller/auth/register_controller.dart';
+import 'package:sefer_driver/views/widgets/elevated_btn.dart';
+import 'package:sefer_driver/views/widgets/my_scafold.dart';
 
 class VerifyEmailPage extends StatelessWidget {
   const VerifyEmailPage({super.key});

lib/views/home/Captin/About Us/about_us.dart

@@ -1,7 +1,7 @@
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/constant/style.dart';
-import 'package:SEFER/main.dart';
-import 'package:SEFER/views/widgets/my_scafold.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/constant/style.dart';
+import 'package:sefer_driver/main.dart';
+import 'package:sefer_driver/views/widgets/my_scafold.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 

lib/views/home/Captin/About Us/frequantly_question.dart

@@ -1,5 +1,5 @@
-import 'package:SEFER/views/widgets/my_scafold.dart';
-import 'package:SEFER/views/widgets/mydialoug.dart';
+import 'package:sefer_driver/views/widgets/my_scafold.dart';
+import 'package:sefer_driver/views/widgets/mydialoug.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';

lib/views/home/Captin/About Us/settings_captain.dart

@@ -1,12 +1,12 @@
-import 'package:SEFER/constant/colors.dart';
-import 'package:SEFER/controller/profile/setting_controller.dart';
+import 'package:sefer_driver/constant/colors.dart';
+import 'package:sefer_driver/controller/profile/setting_controller.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_font_icons/flutter_font_icons.dart';
 import 'package:get/get.dart';
-import 'package:SEFER/constant/style.dart';
-import 'package:SEFER/views/lang/languages.dart';
-import 'package:SEFER/views/widgets/my_scafold.dart';
+import 'package:sefer_driver/constant/style.dart';
+import 'package:sefer_driver/views/lang/languages.dart';
+import 'package:sefer_driver/views/widgets/my_scafold.dart';
 
 import '../../../../controller/functions/vibrate.dart';
 import '../../../auth/country_widget.dart';

lib/views/home/Captin/About Us/using_app_page.dart

@@ -1,6 +1,6 @@
-import 'package:SEFER/constant/style.dart';
-import 'package:SEFER/views/widgets/my_scafold.dart';
-import 'package:SEFER/views/widgets/mydialoug.dart';
+import 'package:sefer_driver/constant/style.dart';
+import 'package:sefer_driver/views/widgets/my_scafold.dart';
+import 'package:sefer_driver/views/widgets/mydialoug.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 

lib/views/home/Captin/About Us/video_page.dart

@@ -1,4 +1,4 @@
-import 'package:SEFER/constant/info.dart';
+import 'package:sefer_driver/constant/info.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:video_player/video_player.dart';

lib/views/home/Captin/assurance_health_page.dart

@@ -1,6 +1,6 @@
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/main.dart';
-import 'package:SEFER/views/widgets/error_snakbar.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/main.dart';
+import 'package:sefer_driver/views/widgets/error_snakbar.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 

lib/views/home/Captin/bottom_bar.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:SEFER/constant/colors.dart';
+import 'package:sefer_driver/constant/colors.dart';
 
 class BottomBarController extends GetxController {
   var currentIndex = 0.obs;

lib/views/home/Captin/camer_widget.dart

@@ -1,11 +1,11 @@
 import 'package:camera/camera.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:SEFER/constant/colors.dart';
-import 'package:SEFER/constant/style.dart';
-import 'package:SEFER/controller/functions/camer_controller.dart';
-import 'package:SEFER/views/widgets/elevated_btn.dart';
-import 'package:SEFER/views/widgets/my_scafold.dart';
+import 'package:sefer_driver/constant/colors.dart';
+import 'package:sefer_driver/constant/style.dart';
+import 'package:sefer_driver/controller/functions/camer_controller.dart';
+import 'package:sefer_driver/views/widgets/elevated_btn.dart';
+import 'package:sefer_driver/views/widgets/my_scafold.dart';
 
 class CameraWidgetCardId extends StatelessWidget {
   final CameraClassController cameraClassController =

lib/views/home/Captin/driver_map_page.dart

@@ -1,9 +1,9 @@
-import 'package:SEFER/constant/style.dart';
-import 'package:SEFER/views/widgets/elevated_btn.dart';
+import 'package:sefer_driver/constant/style.dart';
+import 'package:sefer_driver/views/widgets/elevated_btn.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:SEFER/controller/home/captin/map_driver_controller.dart';
-import 'package:SEFER/views/widgets/my_scafold.dart';
+import 'package:sefer_driver/controller/home/captin/map_driver_controller.dart';
+import 'package:sefer_driver/views/widgets/my_scafold.dart';
 
 import '../../../constant/colors.dart';
 import '../../../controller/functions/location_controller.dart';

lib/views/home/Captin/history/history_captain.dart

@@ -1,4 +1,4 @@
-import 'package:SEFER/views/widgets/mydialoug.dart';
+import 'package:sefer_driver/views/widgets/mydialoug.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 

lib/views/home/Captin/history/history_details_page.dart

@@ -1,8 +1,8 @@
-import 'package:SEFER/controller/functions/location_controller.dart';
+import 'package:sefer_driver/controller/functions/location_controller.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:SEFER/controller/auth/captin/history_captain.dart';
-import 'package:SEFER/controller/functions/launch.dart';
+import 'package:sefer_driver/controller/auth/captin/history_captain.dart';
+import 'package:sefer_driver/controller/functions/launch.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
 
 import 'package:flutter/cupertino.dart';

lib/views/home/Captin/home_captain/drawer_captain.dart

@@ -1,22 +1,22 @@
-import 'package:SEFER/constant/api_key.dart';
-import 'package:SEFER/constant/links.dart';
-import 'package:SEFER/controller/home/captin/home_captain_controller.dart';
-import 'package:SEFER/views/Rate/rate_app_page.dart';
-import 'package:SEFER/views/auth/captin/contact_us_page.dart';
-import 'package:SEFER/views/auth/captin/invite_driver_screen.dart';
-import 'package:SEFER/views/notification/available_rides_page.dart';
+import 'package:sefer_driver/constant/api_key.dart';
+import 'package:sefer_driver/constant/links.dart';
+import 'package:sefer_driver/controller/home/captin/home_captain_controller.dart';
+import 'package:sefer_driver/views/Rate/rate_app_page.dart';
+import 'package:sefer_driver/views/auth/captin/contact_us_page.dart';
+import 'package:sefer_driver/views/auth/captin/invite_driver_screen.dart';
+import 'package:sefer_driver/views/notification/available_rides_page.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_rating_bar/flutter_rating_bar.dart';
 import 'package:get/get.dart';
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/main.dart';
-import 'package:SEFER/views/auth/captin/logout_captain.dart';
-import 'package:SEFER/views/home/Captin/history/history_captain.dart';
-import 'package:SEFER/views/home/Captin/home_captain/help_captain.dart';
-import 'package:SEFER/views/home/Captin/About%20Us/settings_captain.dart';
-import 'package:SEFER/views/home/my_wallet/walet_captain.dart';
-import 'package:SEFER/views/home/profile/profile_captain.dart';
-import 'package:SEFER/views/notification/notification_captain.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/main.dart';
+import 'package:sefer_driver/views/auth/captin/logout_captain.dart';
+import 'package:sefer_driver/views/home/Captin/history/history_captain.dart';
+import 'package:sefer_driver/views/home/Captin/home_captain/help_captain.dart';
+import 'package:sefer_driver/views/home/Captin/About%20Us/settings_captain.dart';
+import 'package:sefer_driver/views/home/my_wallet/walet_captain.dart';
+import 'package:sefer_driver/views/home/profile/profile_captain.dart';
+import 'package:sefer_driver/views/notification/notification_captain.dart';
 
 import '../../../../constant/colors.dart';
 import '../../../../controller/functions/upload_image.dart';
@@ -218,7 +218,7 @@ class UserAccountHeader extends StatelessWidget {
           ),
           const SizedBox(height: 10),
           Text(
-            box.read(BoxName.nameDriver).toString(),
+            '${box.read(BoxName.nameDriver).toString().split(' ')[0]} ${box.read(BoxName.nameDriver).toString().split(' ')[1]}',
             style: const TextStyle(
                 color: CupertinoColors.white,
                 fontSize: 18,

lib/views/home/Captin/home_captain/help_captain.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:SEFER/controller/home/captin/help/help_controller.dart';
-import 'package:SEFER/views/home/Captin/home_captain/help_details_replay_page.dart';
+import 'package:sefer_driver/controller/home/captin/help/help_controller.dart';
+import 'package:sefer_driver/views/home/Captin/home_captain/help_details_replay_page.dart';
 
 import 'package:flutter/cupertino.dart';
 

lib/views/home/Captin/home_captain/help_details_replay_page.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:SEFER/constant/style.dart';
-import 'package:SEFER/views/widgets/mycircular.dart';
+import 'package:sefer_driver/constant/style.dart';
+import 'package:sefer_driver/views/widgets/mycircular.dart';
 
 import '../../../../controller/home/captin/help/help_controller.dart';
 import '../../../widgets/my_scafold.dart';

lib/views/home/Captin/home_captain/home_captin.dart

@@ -1,15 +1,15 @@
 import 'dart:io';
 
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/controller/home/captin/map_driver_controller.dart';
-import 'package:SEFER/views/notification/available_rides_page.dart';
+import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/controller/home/captin/map_driver_controller.dart';
+import 'package:sefer_driver/views/notification/available_rides_page.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:get/get.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
 import 'package:flutter_font_icons/flutter_font_icons.dart';
-import 'package:SEFER/views/home/Captin/home_captain/drawer_captain.dart';
-import 'package:SEFER/views/widgets/mycircular.dart';
+import 'package:sefer_driver/views/home/Captin/home_captain/drawer_captain.dart';
+import 'package:sefer_driver/views/widgets/mycircular.dart';
 import 'package:bubble_head/bubble.dart';
 
 import '../../../../constant/colors.dart';
@@ -100,6 +100,7 @@ class HomeCaptain extends StatelessWidget {
                     // liteModeEnabled: true,
                   );
           }),
+
           Positioned(
               bottom: 10,
               right: Get.width * .1,
@@ -109,7 +110,9 @@ class HomeCaptain extends StatelessWidget {
               top: 5,
               right: Get.width * .05,
               left: Get.width * .05,
-            child: Container(
+              child: GetBuilder<HomeCaptainController>(
+                  builder: (homeCaptainController) {
+                return Container(
                     decoration: AppStyle.boxDecoration,
                     width: Get.width * .8,
                     height: 104,
@@ -150,17 +153,19 @@ class HomeCaptain extends StatelessWidget {
                           children: [
                             Text(
                               'Total Budget is '.tr +
-                              Get.find<CaptainWalletController>().totalPoints,
+                                  homeCaptainController.totalPoints,
                               style: AppStyle.title,
                             ),
                             Container(
                               decoration: BoxDecoration(
                                 borderRadius: BorderRadius.circular(6),
-                            color: int.parse(Get.find<HomeCaptainController>()
+                                color: int.parse(
+                                            Get.find<HomeCaptainController>()
                                                 .countRideToday) <
                                         5
                                     ? AppColor.accentColor
-                                : int.parse(Get.find<HomeCaptainController>()
+                                    : int.parse(Get.find<
+                                                        HomeCaptainController>()
                                                     .countRideToday) >
                                                 5 &&
                                             int.parse(Get.find<
@@ -185,8 +190,8 @@ class HomeCaptain extends StatelessWidget {
                           ],
                         ),
                       ],
-                ))),
-          ),
+                    )));
+              })),
           Positioned(
             bottom: 65,
             right: Get.width * .1,