diff --git a/lib/controller/home/captin/map_driver_controller.dart b/lib/controller/home/captin/map_driver_controller.dart index bad4e1a..774b547 100644 --- a/lib/controller/home/captin/map_driver_controller.dart +++ b/lib/controller/home/captin/map_driver_controller.dart @@ -420,12 +420,14 @@ class MapDriverController extends GetxController { middleText: '', confirm: MyElevatedButton( title: 'Ok'.tr, + kolor: AppColor.greenColor, onPressed: () { Get.back(); finishRideFromDriver1(); }), cancel: MyElevatedButton( title: 'Cancel'.tr, + kolor: Colors.red, onPressed: () { Get.back(); })); diff --git a/lib/controller/home/map_passenger_controller.dart b/lib/controller/home/map_passenger_controller.dart index 0582db2..982bd71 100644 --- a/lib/controller/home/map_passenger_controller.dart +++ b/lib/controller/home/map_passenger_controller.dart @@ -658,9 +658,9 @@ class MapPassengerController extends GetxController { update(); } - rideTimerBegin = false; - isRideFinished = true; - update(); + // rideTimerBegin = false; + // isRideFinished = true; + // update(); } void tripFinishedFromDriver() async { diff --git a/lib/views/home/Captin/mapDriverWidgets/driver_end_ride_bar.dart b/lib/views/home/Captin/mapDriverWidgets/driver_end_ride_bar.dart index 1c93a82..2070e6e 100644 --- a/lib/views/home/Captin/mapDriverWidgets/driver_end_ride_bar.dart +++ b/lib/views/home/Captin/mapDriverWidgets/driver_end_ride_bar.dart @@ -22,10 +22,11 @@ GetBuilder driverEndRideBar() { height: mapDriverController.remainingTimeTimerRideBegin < 60 ? mapDriverController.driverEndPage = 190 : mapDriverController.carType == 'Mashwari' - ? 150 + ? 120 : 170, // width: 240, child: Column( + mainAxisAlignment: MainAxisAlignment.spaceAround, children: [ mapDriverController.carType != 'Mashwari' ? Row( diff --git a/lib/views/home/Captin/mapDriverWidgets/passenger_info_window.dart b/lib/views/home/Captin/mapDriverWidgets/passenger_info_window.dart index 25e3f40..bf8eb42 100644 --- a/lib/views/home/Captin/mapDriverWidgets/passenger_info_window.dart +++ b/lib/views/home/Captin/mapDriverWidgets/passenger_info_window.dart @@ -109,50 +109,25 @@ class PassengerInfoWindow extends StatelessWidget { ], ), ], - ) - // AnimatedTextKit( - // animatedTexts: [ - // ScaleAnimatedText( - // 'Go to passenger Location now'.tr, - // ), - // WavyAnimatedText( - // 'Go to passenger Location now'.tr), - // FlickerAnimatedText( - // 'Go to passenger Location now'.tr), - // WavyAnimatedText( - // 'Go to passenger Location now'.tr), - // ], - // isRepeatingAnimation: true, - // onTap: () { - // // print("Tap Event"); - // }, - // ), - ), + )), Row( children: [ Text( - controller.hours > 1 - ? '${'${'Your Ride Duration is '.tr}${controller.hours}${' H and'.tr}'} ${controller.minutes} m' - : '${'Your Ride Duration is '.tr} ${controller.minutes} ${'m'.tr}', - style: AppStyle.title), - ], - ), - Row( - children: [ - Text('Distance of the Ride is '.tr, - style: AppStyle.title), - Text( - '${controller.distance} ${'KM'.tr}', + controller.hours > 1 + ? '⌚️ ${controller.hours}h ${controller.minutes}m' // Ride Duration with emoji + : '⌚️ ${controller.minutes}m', // Short ride duration style: AppStyle.title, ), - ], - ), - Row( - children: [ - Text('Name of the Passenger is '.tr, - style: AppStyle.title), + const SizedBox( + width: 16.0), // Add spacing between sections Text( - controller.passengerName.toString(), + ' ${controller.distance}km', // Distance with emoji + style: AppStyle.title, + ), + const SizedBox( + width: 16.0), // Add spacing between sections + Text( + ' ${controller.passengerName}', // Passenger name with emoji style: AppStyle.title, ), ], @@ -214,11 +189,17 @@ class PassengerInfoWindow extends StatelessWidget { title: 'Is the Passenger in your Car ?' .tr, + titleStyle: + AppStyle.title, middleText: 'don\'t start trip if not ' .tr, + middleTextStyle: + AppStyle.title, confirm: MyElevatedButton( title: 'OK'.tr, + kolor: AppColor + .greenColor, onPressed: () async { await controller .startRideFromDriver(); @@ -228,6 +209,8 @@ class PassengerInfoWindow extends StatelessWidget { title: 'No ,still Waiting.' .tr, + kolor: + AppColor.redColor, onPressed: () { Get.back(); })); @@ -319,6 +302,8 @@ class PassengerInfoWindow extends StatelessWidget { title: 'Are you sure to cancel?' .tr, + titleStyle: + AppStyle.title, middleText: '', confirm: MyElevatedButton( diff --git a/lib/views/home/map_widget.dart/apply_order_widget.dart b/lib/views/home/map_widget.dart/apply_order_widget.dart index bcc285b..e1d1e0e 100644 --- a/lib/views/home/map_widget.dart/apply_order_widget.dart +++ b/lib/views/home/map_widget.dart/apply_order_widget.dart @@ -88,6 +88,7 @@ class ApplyOrderWidget extends StatelessWidget { width: Get.width * .9, decoration: AppStyle.boxDecoration1, child: Column( + mainAxisAlignment: MainAxisAlignment.spaceAround, children: [ Row( mainAxisAlignment: MainAxisAlignment.end, diff --git a/lib/views/home/map_widget.dart/ride_begin_passenger.dart b/lib/views/home/map_widget.dart/ride_begin_passenger.dart index 5501179..b670e63 100644 --- a/lib/views/home/map_widget.dart/ride_begin_passenger.dart +++ b/lib/views/home/map_widget.dart/ride_begin_passenger.dart @@ -50,6 +50,16 @@ class RideBeginPassenger extends StatelessWidget { ), Column( children: [ + Container( + decoration: AppStyle.boxDecoration1, + child: Padding( + padding: const EdgeInsets.all(3), + child: Text( + '${box.read(BoxName.carType)}', + style: AppStyle.title, + ), + ), + ), Text( '${controller.driverRate} 📈', style: AppStyle.title, 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 e92c80e..b260a43 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 @@ -16,8 +16,9 @@ class RideFromStartApp extends StatelessWidget { Widget build(BuildContext context) { ProfileController profileController = Get.put(ProfileController()); return GetBuilder(builder: (controller) { - return (controller.statusRideFromStart || - controller.statusRide == 'Begin') + return (controller.statusRideFromStart + // || controller.statusRide == 'Begin' + ) ? Positioned( left: 10, right: 10,