diff --git a/lib/controller/home/captin/map_driver_controller.dart b/lib/controller/home/captin/map_driver_controller.dart index 0248e93..4c6e0fd 100644 --- a/lib/controller/home/captin/map_driver_controller.dart +++ b/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 passengerInfoWindowHeight = Get.height * .4; + double passengerInfoWindowHeight = Get.height * .35; double driverEndPage = 100; double progress = 0; double progressToPassenger = 0; @@ -880,8 +880,8 @@ class MapDriverController extends GetxController { ? ( await getMapDestination(step0, step1), await getMapDestination(step1, step2), - await getMapDestination(step2, step3), - await getMapDestination(step3, step4), + step3 == '' ? await getMapDestination(step2, step3) : () {}, + step4 == '' ? await getMapDestination(step3, step4) : () {}, ) : await getMapDestination(passengerLocation, passengerDestination); addCustomCarIcon(); diff --git a/lib/controller/home/map_passenger_controller.dart b/lib/controller/home/map_passenger_controller.dart index 13d221a..de97d72 100644 --- a/lib/controller/home/map_passenger_controller.dart +++ b/lib/controller/home/map_passenger_controller.dart @@ -252,7 +252,7 @@ class MapPassengerController extends GetxController { isWayPointStopsSheetUtilGetMap = false; isWayPointSheet = false; durationToRide = 0; - distanceOfDestnation = 0; + distanceOfDestination = 0; wayPointSheetHeight = 0; remainingTime = 25; haveSteps = true; @@ -960,7 +960,7 @@ class MapPassengerController extends GetxController { placesCoordinate[2], placesCoordinate[3], placesCoordinate[4], - costDistance.toStringAsFixed(2), + costForDriver.toStringAsFixed(2), double.parse(box.read(BoxName.passengerWalletTotal)) < 0 ? double.parse(box.read(BoxName.passengerWalletTotal)) .toStringAsFixed(2) @@ -1038,7 +1038,7 @@ class MapPassengerController extends GetxController { placesCoordinate[2], placesCoordinate[3], placesCoordinate[4], - costDistance.toStringAsFixed(2), + costForDriver.toStringAsFixed(2), double.parse(box.read(BoxName.passengerWalletTotal)) < 0 ? double.parse(box.read(BoxName.passengerWalletTotal)) .toStringAsFixed(2) @@ -2002,8 +2002,8 @@ class MapPassengerController extends GetxController { } late LatLngBounds boundsData; - late String startNameAddress; - late String endNameAddress; + late String startNameAddress = ''; + late String endNameAddress = ''; getMap(String origin, destination) async { remainingTime = 25; //to make cancel every call await getCarsLocationByPassengerAndReloadMarker(); @@ -2094,7 +2094,7 @@ class MapPassengerController extends GetxController { } } - double distanceOfDestnation = 0; + double distanceOfDestination = 0; bool haveSteps = false; late LatLng latestPosition; // getMapPoints(String originSteps, String destinationSteps, int index) async { @@ -2172,7 +2172,7 @@ class MapPassengerController extends GetxController { durationToRide = durationToRide + durationToRide0; print(durationToRide0); print('durationToRide = $durationToRide'); - distance = distanceOfDestnation + (data[0]['distance']['value']) / 1000; + distance = distanceOfDestination + (data[0]['distance']['value']) / 1000; update(); final points = @@ -2308,6 +2308,7 @@ class MapPassengerController extends GetxController { return distance; } + double costForDriver = 0; Future bottomSheet() async { if (data.isNotEmpty) { durationToAdd = Duration(seconds: durationToRide); @@ -2361,6 +2362,7 @@ class MapPassengerController extends GetxController { totalDriver = totalDriver1 + (totalDriver1 * kazan / 100); tax = totalCostPassenger * kazan / 100; totalME = totalCostPassenger - tax; + costForDriver = fuelPrice * 12; if (totalCostPassenger < 1) { totalCostPassenger = 1; diff --git a/lib/controller/local/translations.dart b/lib/controller/local/translations.dart index cb71e0c..1309792 100644 --- a/lib/controller/local/translations.dart +++ b/lib/controller/local/translations.dart @@ -442,6 +442,8 @@ class MyTranslation extends Translations { 'Total points is ': "إجمالي النقاط هو", 'Total Connection Duration:': "إجمالي مدة الإتصال:", ' H and': "ساعة و", + 'Passenger name : ': 'إسم الراكب', + 'Cost Of Trip IS ': 'تكلفة الرحلة', 'Arrival time': 'وقت الوصول ', 'arrival time to reach your point': 'الوقت المتوقع للوصول إلى وجهتك ', 'For Speed and Delivery trips, the price is calculated dynamically. For Comfort trips, the price is based on time and distance': diff --git a/lib/views/home/Captin/mapDriverWidgets/passenger_info_window.dart b/lib/views/home/Captin/mapDriverWidgets/passenger_info_window.dart index bf8eb42..9fb18fc 100644 --- a/lib/views/home/Captin/mapDriverWidgets/passenger_info_window.dart +++ b/lib/views/home/Captin/mapDriverWidgets/passenger_info_window.dart @@ -32,8 +32,8 @@ class PassengerInfoWindow extends StatelessWidget { child: AnimatedContainer( duration: const Duration(milliseconds: 300), height: controller.passengerInfoWindowHeight, - width: Get.width * .99, - decoration: AppStyle.boxDecoration, + width: Get.width * .9, + decoration: AppStyle.boxDecoration1, child: Padding( padding: const EdgeInsets.all(8.0), child: Column( @@ -112,42 +112,86 @@ class PassengerInfoWindow extends StatelessWidget { )), Row( children: [ - Text( - controller.hours > 1 - ? '⌚️ ${controller.hours}h ${controller.minutes}m' // Ride Duration with emoji - : '⌚️ ${controller.minutes}m', // Short ride duration - style: AppStyle.title, + Container( + decoration: AppStyle.boxDecoration1, + width: Get.width * .2, + child: Padding( + padding: const EdgeInsets.all(4.0), + child: Text( + controller.hours > 1 + ? '⌚️ ${controller.hours}h ${controller.minutes}m' // Ride Duration with emoji + : '⌚️ ${controller.minutes}m', // Short ride duration + style: AppStyle.number, + ), + ), ), const SizedBox( width: 16.0), // Add spacing between sections - Text( - ' ${controller.distance}km', // Distance with emoji - style: AppStyle.title, + Container( + decoration: AppStyle.boxDecoration1, + width: Get.width * .2, + child: Padding( + padding: const EdgeInsets.all(4), + child: Text( + ' ${controller.distance} km', // Distance with emoji + style: AppStyle.number, + ), + ), ), const SizedBox( width: 16.0), // Add spacing between sections - Text( - ' ${controller.passengerName}', // Passenger name with emoji - style: AppStyle.title, + Container( + decoration: AppStyle.boxDecoration1, + width: Get.width * .2, + child: Padding( + padding: const EdgeInsets.all(4.0), + child: Text( + controller + .passengerName, // Passenger name with emoji + style: AppStyle.title, + ), + ), ), ], ), - Card( - elevation: 5, - color: AppColor.greenColor, - child: Padding( - padding: const EdgeInsets.all(4), - child: Row( - children: [ - Text('Total Cost is '.tr, - style: AppStyle.title), - Text( - controller.totalPassenger.toString(), - style: AppStyle.title, + Row( + mainAxisAlignment: MainAxisAlignment.spaceAround, + children: [ + Container( + decoration: AppStyle.boxDecoration1, + width: Get.width * .5, + child: Padding( + padding: const EdgeInsets.all(4), + child: Row( + children: [ + Text('Total Cost is '.tr, + style: AppStyle.title), + Text( + controller.totalPassenger.toString(), + style: AppStyle.title, + ), + ], ), - ], + ), ), - ), + Container( + decoration: AppStyle.boxDecoration1, + width: Get.width * .2, + child: Padding( + padding: const EdgeInsets.all(4), + child: Row( + children: [ + Text(controller.carType, + style: AppStyle.title), + Text( + controller.totalPassenger.toString(), + style: AppStyle.title, + ), + ], + ), + ), + ), + ], ), controller.remainingTimeToPassenger != 0 ? Stack( diff --git a/lib/views/home/Captin/orderCaptin/order_request_page.dart b/lib/views/home/Captin/orderCaptin/order_request_page.dart index f6dedc9..12455b1 100644 --- a/lib/views/home/Captin/orderCaptin/order_request_page.dart +++ b/lib/views/home/Captin/orderCaptin/order_request_page.dart @@ -251,7 +251,8 @@ class OrderRequestPage extends StatelessWidget { padding: const EdgeInsets.all(8.0), child: RichText( text: TextSpan( - text: 'Passenger: '.tr, // Changed text to be more generic + text: 'Passenger name : ' + .tr, // Changed text to be more generic style: AppStyle.subtitle, children: [ TextSpan( @@ -279,9 +280,7 @@ class OrderRequestPage extends StatelessWidget { style: AppStyle.title, children: [ TextSpan( - text: - orderRequestController.mpg.toStringAsFixed(0), - style: AppStyle.headTitle2), + text: myList[27], style: AppStyle.headTitle2), ], ), ), diff --git a/lib/views/home/Captin/orderCaptin/order_speed_request.dart b/lib/views/home/Captin/orderCaptin/order_speed_request.dart index a3bced5..e41338c 100644 --- a/lib/views/home/Captin/orderCaptin/order_speed_request.dart +++ b/lib/views/home/Captin/orderCaptin/order_speed_request.dart @@ -266,7 +266,8 @@ class OrderSpeedRequest extends StatelessWidget { padding: const EdgeInsets.all(8.0), child: RichText( text: TextSpan( - text: 'Passenger: '.tr, // Changed text to be more generic + text: 'Passenger name : ' + .tr, // Changed text to be more generic style: AppStyle.subtitle, children: [ TextSpan( @@ -292,9 +293,7 @@ class OrderSpeedRequest extends StatelessWidget { text: 'Cost Of Trip IS '.tr, style: AppStyle.title, children: [ - TextSpan( - text: orderRequestController.mpg.toStringAsFixed(0), - style: AppStyle.headTitle2), + TextSpan(text: myList[27], style: AppStyle.headTitle2), ], ), ), diff --git a/lib/views/home/map_widget.dart/ride_from_start_app.dart b/lib/views/home/map_widget.dart/ride_from_start_app.dart index b260a43..9085d82 100644 --- a/lib/views/home/map_widget.dart/ride_from_start_app.dart +++ b/lib/views/home/map_widget.dart/ride_from_start_app.dart @@ -155,7 +155,7 @@ class RideFromStartApp extends StatelessWidget { print(phoneNumber); // Output: 798583061 var phone = // '+${box.read(BoxName.countryCode)}${box.read(BoxName.sosPhonePassenger)}'; - '+20${box.read(BoxName.sosPhonePassenger)}'; + '${box.read(BoxName.sosPhonePassenger)}'; controller.sendWhatsapp(phone); } },