4/11/2

lib/controller/home/captin/map_driver_controller.dart

@@ -76,7 +76,7 @@ class MapDriverController extends GetxController {
   bool isRideFinished = false;
   bool isRideStarted = false;
   bool isPriceWindow = false;
-  double passengerInfoWindow = Get.height * .39;
+  double passengerInfoWindowHeight = Get.height * .4;
   double driverEndPage = 100;
   double progress = 0;
   double progressToPassenger = 0;
@@ -161,7 +161,7 @@ class MapDriverController extends GetxController {
 
   void changeRideToBeginToPassenger() {
     isRideBegin = true;
-    passengerInfoWindow = Get.height * .22;
+    passengerInfoWindowHeight = Get.height * .22;
     update();
   }
 
@@ -807,7 +807,7 @@ class MapDriverController extends GetxController {
 
   void changePassengerInfoWindow() {
     isPassengerInfoWindow = !isPassengerInfoWindow;
-    passengerInfoWindow = isPassengerInfoWindow == true ? 200 : 0;
+    passengerInfoWindowHeight = isPassengerInfoWindow == true ? 200 : 0;
     update();
   }
 

lib/controller/home/map_passenger_controller.dart

@@ -142,8 +142,8 @@ class MapPassengerController extends GetxController {
   bool isWayPointStopsSheetUtilGetMap = false;
   double heightBottomSheetShown = 0;
   double cashConfirmPageShown = 250;
-  late String driverId;
-  late String gender;
+  late String driverId = '';
+  late String gender = '';
   double widthMapTypeAndTraffic = 50;
   double paymentPageShown = Get.height * .6;
   late LatLng southwest;
@@ -686,7 +686,7 @@ class MapPassengerController extends GetxController {
         remainingTimeToPassengerFromDriverAfterApplied = 0;
         remainingTimeDriverWaitPassenger5Minute = 0;
         rideTimerBegin = true;
-        statusRide == 'Begin';
+        statusRide = 'Begin';
         isDriverInPassengerWay = false;
         isDriverArrivePassenger = false;
         update();
@@ -834,14 +834,14 @@ class MapPassengerController extends GetxController {
   }
 
   int currentTimeSearchingCaptainWindow = 0;
-  late String driverPhone;
-  late String driverRate;
-  late String firstName;
-  late String carColor;
-  late String carYear;
-  late String model;
-  late String make;
-  late String licensePlate;
+  late String driverPhone = '';
+  late String driverRate = '';
+  late String firstName = '';
+  late String carColor = '';
+  late String carYear = '';
+  late String model = '';
+  late String make = '';
+  late String licensePlate = '';
   confirmRideForFirstDriver() async {
     await getCarsLocationByPassengerAndReloadMarker();
     await getNearestDriverByPassengerLocationAPIGOOGLE();

lib/controller/local/translations.dart

@@ -90,7 +90,7 @@ class MyTranslation extends Translations {
           "By selecting \"I Agree\" below, I have reviewed and agree to the Terms of Use and acknowledge the Privacy Notice. I am at least 18 years of age.":
               "بتحديد \"أوافق\" أدناه ، فإنني أوافق على مراجعة وقبول شروط الاستخدام وإقرار إشعار الخصوصية. أنا على الأقل 18 عامًا من العمر.",
           "Update": "تحديث",
-          "You Should choose rate figure": "يجب عليك اختيار رقم السعر",
+          "You Should choose rate figure": "يجب عليك اختيار تقييم",
           "Login Captin": "تسجيل دخول الكابتن",
           "Register Captin": "تسجيل كابتن جديد",
           "Send Verfication Code": "أرسل رمز التحقق",
@@ -442,7 +442,6 @@ class MyTranslation extends Translations {
           'Total points is ': "إجمالي النقاط هو",
           'Total Connection Duration:': "إجمالي مدة الإتصال:",
           ' H and': "ساعة و",
-          'm': "دقيقة",
           'Hello this is Driver': "مرحبا هذا السائق",
           'Is the Passenger in your Car ?': "هل الراكب في سيارتك؟",
           'don\'t start trip if not ': "لا تبدأ الرحلة إذا لم يكن",
@@ -633,7 +632,6 @@ class MyTranslation extends Translations {
           'Tariffs': "التعرفه",
           'Minimum fare': "الحد الأدنى للأجرة",
           'Maximum fare': "الحد الأقصى للأجرة",
-          'JOD': "د.أ",
           'Flag-down fee': "رسوم التشغيل",
           'Including Tax': "بما في ذلك الضرائب",
           'BookingFee': "رسوم الطلب",