4/10/5

lib/controller/firebase/firbase_messge.dart

@@ -348,6 +348,8 @@ class FirebaseMessagesController extends GetxController {
     return Get.defaultDialog(
         barrierDismissible: false,
         title: 'message From passenger'.tr,
+        titleStyle: AppStyle.title,
+        middleTextStyle: AppStyle.title,
         middleText: message.tr,
         confirm: MyElevatedButton(
             title: 'Ok'.tr,

lib/controller/home/captin/home_captain_controller.dart

@@ -264,6 +264,11 @@ class HomeCaptainController extends GetxController {
     }
   }
 
+  double mpg = 0;
+  calculateConsumptionFuel() {
+    mpg = fuelPrice / 12; //todo in register car add mpg in box
+  }
+
   getCountRideToday() async {
     var res = await CRUD().get(
         link: AppLink.getCountRide,

lib/controller/home/captin/map_driver_controller.dart

@@ -535,6 +535,11 @@ class MapDriverController extends GetxController {
     // print(durationOfRideValue);
     int durationOfRide = int.parse(durationOfRideValue);
     update();
+    int infinity = 40000;
+    if (carType == 'Comfort' || carType == 'Mashwari') {
+      durationOfRide = infinity;
+      update();
+    }
     for (int i = 0; i <= durationOfRide; i++) {
       await Future.delayed(const Duration(seconds: 1));
       recentDistanceToDash = Get.find<LocationController>().totalDistance;
@@ -547,7 +552,7 @@ class MapDriverController extends GetxController {
               ? (i ~/ 60) +
                   (recentDistanceToDash *
                       Get.find<HomeCaptainController>().speedPrice)
-              : carType == 'Delivery'
+              : carType == 'Mashwari'
                   ? (i ~/ 60) +
                       (recentDistanceToDash *
                           Get.find<HomeCaptainController>().deliveryPrice)
@@ -569,8 +574,8 @@ class MapDriverController extends GetxController {
       int seconds = remainingTimeTimerRideBegin % 60;
       stringRemainingTimeRideBegin =
           '$minutes:${seconds.toString().padLeft(2, '0')}';
-      int minutes1 = (rideTimerFromBegin / 60).floor();
-      int seconds1 = rideTimerFromBegin % 60;
+      int minutes1 = (i / 60).floor();
+      int seconds1 = i % 60;
       stringRemainingTimeRideBegin1 =
           '$minutes1:${seconds1.toString().padLeft(2, '0')}';
       update();

lib/controller/home/captin/order_request_controller.dart

@@ -9,6 +9,7 @@ import '../../../constant/box_name.dart';
 import '../../../constant/table_names.dart';
 import '../../functions/crud.dart';
 import '../../functions/location_controller.dart';
+import 'home_captain_controller.dart';
 
 class OrderRequestController extends GetxController {
   double progress = 0;
@@ -24,7 +25,7 @@ class OrderRequestController extends GetxController {
   @override
   void onInit() {
     getRefusedOrderByCaptain();
-
+    // calculateConsumptionFuel();
     update();
     super.onInit();
   }
@@ -34,6 +35,12 @@ class OrderRequestController extends GetxController {
     update();
   }
 
+  double mpg = 0;
+  calculateConsumptionFuel() {
+    mpg = Get.find<HomeCaptainController>().fuelPrice /
+        12; //todo in register car add mpg in box
+  }
+
   void getRefusedOrderByCaptain() async {
     DateTime today = DateTime.now();
     int todayDay = today.day;

lib/controller/local/translations.dart

@@ -478,11 +478,15 @@ class MyTranslation extends Translations {
           'Distance from Passenger to destination is ':
               "المسافة من الراكب إلى الوجهة هي ",
           'price is': '‏التكلفة',
+          'This ride type does not allow changes to the destination or additional stops':
+              'ده نوع الرحلات مش بيسمح بتغيير نقطة الوصول أو الوقوف الإضافي',
+          'This price may be changed': 'خلي بالك السعر ممكن يتغي',
           'No SIM card, no problem! Call your driver directly through our app. We use advanced technology to ensure your privacy.':
               'حتا لو مفيش كارت SIM, متخفش! تقدر تكلم سواقك بمنتهى البساطة عن طريق التطبيق بتاعنا. احنا بنستخدم تكنولوجيا حديثة عشان نحافظ على خصوصيتك.',
-          'Driver Finish Trip'
-              'distance is'
-              'Cost Of Trip IS ': "تكلفة الرحلة هي ",
+          'This ride type allows changes, but the price may increase':
+              'ده نوع الرحلات بيسمح بالتغيير بس السعر ممكن يزيد ',
+          'Cost Of Trip IS ': "تكلفة الرحلة هي ",
+          'message From passenger': '‏رسالة من الراكب',
           'Select one message': "‏اختر رسالة",
           'My location is correct. You can search for me using the navigation app':
               'المكان اللي أنا فيه صح، ممكن تدور عليّا من خلال تطبيق الملاحة',