diff --git a/lib/controller/local/translations.dart b/lib/controller/local/translations.dart index f6a48a5..fad1291 100644 --- a/lib/controller/local/translations.dart +++ b/lib/controller/local/translations.dart @@ -444,7 +444,8 @@ class MyTranslation extends Translations { ' H and': "ساعة و", 'Hello this is Driver': "مرحبا هذا السائق", 'Is the Passenger in your Car ?': "هل الراكب في سيارتك؟", - 'don\'t start trip if not ': "لا تبدأ الرحلة إذا لم يكن", + 'Please wait for the passenger to enter the car before starting the trip.': + "لا تبدأ الرحلة إذا لم يكن الراكب في سيارتك", 'No ,still Waiting.': "لا، مازالت في الإنتظار.", 'I arrive you': "وصلت إليك", 'I Arrive your site': "وصلت إلى موقعك", 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 2070e6e..66ff8df 100644 --- a/lib/views/home/Captin/mapDriverWidgets/driver_end_ride_bar.dart +++ b/lib/views/home/Captin/mapDriverWidgets/driver_end_ride_bar.dart @@ -65,13 +65,35 @@ GetBuilder driverEndRideBar() { Row( mainAxisAlignment: MainAxisAlignment.spaceAround, children: [ - const Icon(Icons.timer), - Text(mapDriverController.stringRemainingTimeRideBegin1), - const Icon(Icons.location_on), - Text( - '${mapDriverController.recentDistanceToDash.toStringAsFixed(0)} ${'KM'.tr}'), - const Icon(Icons.attach_money), - Text(mapDriverController.price.toStringAsFixed(2)), + Container( + decoration: AppStyle.boxDecoration1, + child: Row( + children: [ + const Icon(Icons.timer), + Text(mapDriverController + .stringRemainingTimeRideBegin1), + ], + )), + Container( + decoration: AppStyle.boxDecoration1, + child: Row( + children: [ + const Icon(Icons.location_on), + Text( + '${mapDriverController.recentDistanceToDash.toStringAsFixed(0)} ${'KM'.tr}'), + ], + ), + ), + Container( + decoration: AppStyle.boxDecoration1, + child: Row( + children: [ + const Icon(Icons.attach_money), + Text( + mapDriverController.price.toStringAsFixed(2)), + ], + ), + ), ], ), (mapDriverController.carType == 'Mashwari' || 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 b670e63..cb6f598 100644 --- a/lib/views/home/map_widget.dart/ride_begin_passenger.dart +++ b/lib/views/home/map_widget.dart/ride_begin_passenger.dart @@ -44,9 +44,16 @@ class RideBeginPassenger extends StatelessWidget { backgroundImage: NetworkImage( 'https://ride.mobile-app.store/portrate_captain_image/${controller.driverId}.jpg'), ), - Text( - controller.firstName, - style: AppStyle.title, + Container( + decoration: AppStyle.boxDecoration1, + child: Column( + children: [ + Text( + controller.firstName, + style: AppStyle.title, + ), + ], + ), ), Column( children: [