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 driverId = '';
-  late String gender;
+  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 driverPhone = '';
-  late String driverRate;
+  late String driverRate = '';
-  late String firstName;
+  late String firstName = '';
-  late String carColor;
+  late String carColor = '';
-  late String carYear;
+  late String carYear = '';
-  late String model;
+  late String model = '';
-  late String make;
+  late String make = '';
-  late String licensePlate;
+  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': "رسوم الطلب",

lib/views/home/Captin/mapDriverWidgets/passenger_info_window.dart

@@ -31,7 +31,7 @@ class PassengerInfoWindow extends StatelessWidget {
                   // left: 8,
                   child: AnimatedContainer(
                     duration: const Duration(milliseconds: 300),
-                    height: controller.passengerInfoWindow,
+                    height: controller.passengerInfoWindowHeight,
                     width: Get.width * .99,
                     decoration: AppStyle.boxDecoration,
                     child: Padding(

lib/views/home/map_widget.dart/apply_order_widget.dart

@@ -26,7 +26,7 @@ class ApplyOrderWidget extends StatelessWidget {
           right: 0,
           child: Container(
             decoration: AppStyle.boxDecoration1,
-            height: Get.height * .3,
+            height: Get.height * .35,
             child: ListView(
               children: [
                 InkWell(
@@ -84,7 +84,7 @@ class ApplyOrderWidget extends StatelessWidget {
                       width: 10,
                     ),
                     Container(
-                      height: 200,
+                      height: Get.height * .3,
                       width: Get.width * .9,
                       decoration: AppStyle.boxDecoration1,
                       child: Column(
@@ -299,7 +299,7 @@ class DriverArrivePassengerAndWaitMinute extends StatelessWidget {
             color: controller.remainingTimeDriverWaitPassenger5Minute < 60
                 ? AppColor.redColor
                 : AppColor.greenColor,
-            minHeight: 30,
+            minHeight: 25,
             borderRadius: BorderRadius.circular(15),
             value:
                 controller.progressTimerDriverWaitPassenger5Minute.toDouble(),
@@ -309,7 +309,7 @@ class DriverArrivePassengerAndWaitMinute extends StatelessWidget {
             children: [
               Text(
                 'The driver waiting you in picked location .'.tr,
-                style: AppStyle.title,
+                style: AppStyle.subtitle,
                 textAlign: TextAlign.center,
               ),
               const SizedBox(

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

@@ -20,21 +20,21 @@ class RideBeginPassenger extends StatelessWidget {
   Widget build(BuildContext context) {
     ProfileController profileController = Get.put(ProfileController());
     AudioController audioController = Get.put(AudioController());
+    // Get.put(MapPassengerController());
     return GetBuilder<MapPassengerController>(builder: (controller) {
-      if ( //controller.rideTimerBegin ||
+      if (controller.statusRide == 'Begin' || !controller.statusRideFromStart) {
-          controller.statusRide == 'Begin' || !controller.statusRideFromStart) {
         return Positioned(
           left: 10,
           right: 10,
           bottom: 4,
           child: Container(
             decoration: AppStyle.boxDecoration,
-            height: controller.rideTimerBegin ? Get.height * .3 : 0,
+            height: controller.statusRide == 'Begin' ? Get.height * .33 : 0,
             // width: 100,
             child: Padding(
               padding: const EdgeInsets.all(8.0),
               child: Column(
-                mainAxisAlignment: MainAxisAlignment.center,
+                mainAxisAlignment: MainAxisAlignment.spaceAround,
                 children: [
                   Row(
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -58,6 +58,9 @@ class RideBeginPassenger extends StatelessWidget {
                       ),
                     ],
                   ),
+                  // SizedBox(
+                  //   height: 5,
+                  // ),
                   Row(
                     mainAxisAlignment: MainAxisAlignment.spaceAround,
                     children: [