From a80bc50c0d42a46765783231fa9897a00ef9ab70 Mon Sep 17 00:00:00 2001 From: Hamza Aleghwairyeen Date: Wed, 3 Apr 2024 23:39:36 +0300 Subject: [PATCH] 4/3/12 --- .../home/map_passenger_controller.dart | 4 ++- .../orderCaptin/order_request_page.dart | 14 ++++++-- .../orderCaptin/order_speed_request.dart | 13 +++++-- .../map_widget.dart/ride_begin_passenger.dart | 35 +++++++------------ 4 files changed, 38 insertions(+), 28 deletions(-) diff --git a/lib/controller/home/map_passenger_controller.dart b/lib/controller/home/map_passenger_controller.dart index 606cdbd..a791d34 100644 --- a/lib/controller/home/map_passenger_controller.dart +++ b/lib/controller/home/map_passenger_controller.dart @@ -2340,7 +2340,9 @@ class MapPassengerController extends GetxController { } getPassengerRate() async { - var res = await CRUD().get(link: AppLink.getPassengerRate); + var res = await CRUD().get( + link: AppLink.getPassengerRate, + payload: {'passenger_id': box.read(BoxName.passengerID)}); if (res != 'failure') { passengerRate = double.parse(jsonDecode(res)['message'][0]['rating']); } diff --git a/lib/views/home/Captin/orderCaptin/order_request_page.dart b/lib/views/home/Captin/orderCaptin/order_request_page.dart index 204f179..274b679 100644 --- a/lib/views/home/Captin/orderCaptin/order_request_page.dart +++ b/lib/views/home/Captin/orderCaptin/order_request_page.dart @@ -252,14 +252,24 @@ class OrderRequestPage extends StatelessWidget { padding: const EdgeInsets.all(8.0), child: RichText( text: TextSpan( - text: 'Passenger Name is '.tr, + text: 'Passenger: '.tr, // Changed text to be more generic style: AppStyle.subtitle, children: [ - TextSpan(text: myList[8], style: AppStyle.title), + TextSpan( + text: myList[8], + style: AppStyle + .title), // Assuming myList[8] holds passenger name + TextSpan(text: ' (', style: AppStyle.subtitle), + TextSpan( + text: myList[33].toString(), + style: AppStyle + .title), // Assuming 'rate' holds the passenger rate + TextSpan(text: ' ⭐)', style: AppStyle.subtitle), ], ), ), ), + Padding( padding: const EdgeInsets.all(4), child: Container( diff --git a/lib/views/home/Captin/orderCaptin/order_speed_request.dart b/lib/views/home/Captin/orderCaptin/order_speed_request.dart index 5f058e4..c5bacf0 100644 --- a/lib/views/home/Captin/orderCaptin/order_speed_request.dart +++ b/lib/views/home/Captin/orderCaptin/order_speed_request.dart @@ -262,10 +262,19 @@ class OrderSpeedRequest extends StatelessWidget { padding: const EdgeInsets.all(8.0), child: RichText( text: TextSpan( - text: 'Passenger Name is '.tr, + text: 'Passenger: '.tr, // Changed text to be more generic style: AppStyle.subtitle, children: [ - TextSpan(text: myList[8], style: AppStyle.title), + TextSpan( + text: myList[8], + style: AppStyle + .title), // Assuming myList[8] holds passenger name + TextSpan(text: ' (', style: AppStyle.subtitle), + TextSpan( + text: myList[33].toString(), + style: AppStyle + .title), // Assuming 'rate' holds the passenger rate + TextSpan(text: ' ⭐)', style: AppStyle.subtitle), ], ), ), 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 642a6ad..53379f9 100644 --- a/lib/views/home/map_widget.dart/ride_begin_passenger.dart +++ b/lib/views/home/map_widget.dart/ride_begin_passenger.dart @@ -39,8 +39,7 @@ class RideBeginPassenger extends StatelessWidget { Column( children: [ Text( - // 'You will arrive to your destination after timer end.'.tr, - 'Time to arrive'.tr, + '⏱️ Arrive', style: AppStyle.title, ), Text( @@ -52,7 +51,7 @@ class RideBeginPassenger extends StatelessWidget { Column( children: [ Text( - 'Total Cost'.tr, + ' Total', style: AppStyle.title, ), Text( @@ -61,26 +60,16 @@ class RideBeginPassenger extends StatelessWidget { ), ], ), - Row( - children: [ - Column( - children: [ - Text('Write note'.tr), - IconButton( - onPressed: () { - Get.to( - () => FeedBackPage(), - transition: Transition.downToUp, - ); - }, - icon: const Icon( - Icons.note_add, - color: AppColor.redColor, - ), - ), - ], - ), - ], + IconButton( + onPressed: () => Get.to( + () => FeedBackPage(), + transition: Transition.downToUp, + ), + icon: const Icon( + Icons.note_add, + color: AppColor.redColor, + ), + tooltip: ' Add Note', // Optional tooltip for clarity ), ], ),