From a7288e620457adc957c44f3c83e8e5468c8b8146 Mon Sep 17 00:00:00 2001 From: Hamza Aleghwairyeen Date: Thu, 11 Apr 2024 09:55:17 +0300 Subject: [PATCH] 4/11/1 --- .../home/captin/map_driver_controller.dart | 20 ++++++++- .../home/map_passenger_controller.dart | 6 +++ .../mapDriverWidgets/driver_end_ride_bar.dart | 27 +++++++----- .../map_widget.dart/apply_order_widget.dart | 36 +++++++-------- .../map_widget.dart/ride_begin_passenger.dart | 44 +++++++++---------- 5 files changed, 82 insertions(+), 51 deletions(-) diff --git a/lib/controller/home/captin/map_driver_controller.dart b/lib/controller/home/captin/map_driver_controller.dart index f190e19..d968040 100644 --- a/lib/controller/home/captin/map_driver_controller.dart +++ b/lib/controller/home/captin/map_driver_controller.dart @@ -413,7 +413,25 @@ class MapDriverController extends GetxController { } } - void finishRideFromDriver() async { + void finishRideFromDriver() { + Get.defaultDialog( + title: 'Are you sure to exit ride ?'.tr, + titleStyle: AppStyle.title, + middleText: '', + confirm: MyElevatedButton( + title: 'Ok'.tr, + onPressed: () { + Get.back(); + finishRideFromDriver1(); + }), + cancel: MyElevatedButton( + title: 'Cancel'.tr, + onPressed: () { + Get.back(); + })); + } + + void finishRideFromDriver1() async { double distanceToDestination = Geolocator.distanceBetween( latLngPassengerDestination.latitude, latLngPassengerDestination.longitude, diff --git a/lib/controller/home/map_passenger_controller.dart b/lib/controller/home/map_passenger_controller.dart index 32f63d6..941ed93 100644 --- a/lib/controller/home/map_passenger_controller.dart +++ b/lib/controller/home/map_passenger_controller.dart @@ -271,6 +271,12 @@ class MapPassengerController extends GetxController { coordinatesWithoutEmpty[i + 1].toString(), i, ); + if (i == 0) { + startNameAddress = data[0]['start_address']; + } + if (i == coordinatesWithoutEmpty.length) { + endNameAddress = data[0]['end_address']; + } } } 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 51b2e29..1c93a82 100644 --- a/lib/views/home/Captin/mapDriverWidgets/driver_end_ride_bar.dart +++ b/lib/views/home/Captin/mapDriverWidgets/driver_end_ride_bar.dart @@ -77,7 +77,7 @@ GetBuilder driverEndRideBar() { mapDriverController.carType == 'Comfort') && mapDriverController.remainingTimeTimerRideBegin > 60 ? Row( - mainAxisAlignment: MainAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.spaceAround, children: [ MyElevatedButton( title: 'End Ride'.tr, @@ -86,12 +86,19 @@ GetBuilder driverEndRideBar() { }, kolor: AppColor.redColor, ), + Container( + decoration: AppStyle.boxDecoration1, + child: Text( + mapDriverController.carType, + style: AppStyle.title, + ), + ) ], ) : const SizedBox(), mapDriverController.remainingTimeTimerRideBegin < 60 ? Row( - mainAxisAlignment: MainAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.spaceAround, children: [ MyElevatedButton( title: 'End Ride'.tr, @@ -100,10 +107,17 @@ GetBuilder driverEndRideBar() { }, kolor: AppColor.redColor, ), + Container( + decoration: AppStyle.boxDecoration1, + child: Text( + mapDriverController.carType, + style: AppStyle.title, + ), + ) ], ) : const SizedBox(), - mapDriverController.carType != 'Comfort' || + mapDriverController.carType != 'Comfort' && mapDriverController.carType != 'Mashwari' ? Stack( children: [ @@ -130,13 +144,6 @@ GetBuilder driverEndRideBar() { ], ) : const SizedBox(), - Container( - decoration: AppStyle.boxDecoration1, - child: Text( - mapDriverController.carType, - style: AppStyle.title, - ), - ) ], ), )) 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 7c432de..f93f64c 100644 --- a/lib/views/home/map_widget.dart/apply_order_widget.dart +++ b/lib/views/home/map_widget.dart/apply_order_widget.dart @@ -177,12 +177,12 @@ class ApplyOrderWidget extends StatelessWidget { controller.driverToken); Get.back(); }, - child: Padding( - padding: - const EdgeInsets.all(10), - child: Container( - decoration: - AppStyle.boxDecoration1, + child: Container( + decoration: + AppStyle.boxDecoration1, + child: Padding( + padding: + const EdgeInsets.all(10), child: Text( 'Hello, I\'m at the agreed-upon location' .tr, @@ -201,12 +201,12 @@ class ApplyOrderWidget extends StatelessWidget { controller.driverToken); Get.back(); }, - child: Padding( - padding: - const EdgeInsets.all(10), - child: Container( - decoration: - AppStyle.boxDecoration1, + child: Container( + decoration: + AppStyle.boxDecoration1, + child: Padding( + padding: + const EdgeInsets.all(10), child: Text( 'My location is correct. You can search for me using the navigation app' .tr, @@ -225,12 +225,12 @@ class ApplyOrderWidget extends StatelessWidget { controller.driverToken); Get.back(); }, - child: Padding( - padding: - const EdgeInsets.all(10), - child: Container( - decoration: - AppStyle.boxDecoration1, + child: Container( + decoration: + AppStyle.boxDecoration1, + child: Padding( + padding: + const EdgeInsets.all(10), child: Text( 'I\'m waiting for you'.tr, style: AppStyle.title, 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 8a44106..b52f618 100644 --- a/lib/views/home/map_widget.dart/ride_begin_passenger.dart +++ b/lib/views/home/map_widget.dart/ride_begin_passenger.dart @@ -36,6 +36,28 @@ class RideBeginPassenger extends StatelessWidget { child: Column( mainAxisAlignment: MainAxisAlignment.center, children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + CircleAvatar( + radius: 30, + backgroundImage: NetworkImage( + 'https://ride.mobile-app.store/portrate_captain_image/${controller.driverId}.jpg'), + ), + Text( + controller.firstName, + style: AppStyle.title, + ), + Column( + children: [ + Text( + '${controller.driverRate} 📈', + style: AppStyle.title, + ), + ], + ), + ], + ), Row( mainAxisAlignment: MainAxisAlignment.spaceAround, children: [ @@ -107,28 +129,6 @@ class RideBeginPassenger extends StatelessWidget { ), ], ), - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - CircleAvatar( - radius: 30, - backgroundImage: NetworkImage( - 'https://ride.mobile-app.store/portrate_captain_image/${controller.driverId}.jpg'), - ), - Text( - controller.firstName, - style: AppStyle.title, - ), - Column( - children: [ - Text( - '${controller.driverRate} 📈', - style: AppStyle.title, - ), - ], - ), - ], - ), Stack( children: [ // StreamCounter(),