diff --git a/lib/constant/style.dart b/lib/constant/style.dart index 3b721b7..7bf577d 100644 --- a/lib/constant/style.dart +++ b/lib/constant/style.dart @@ -43,7 +43,7 @@ class AppStyle { : GoogleFonts.josefinSans().fontFamily); static TextStyle number = TextStyle( fontWeight: FontWeight.bold, - fontSize: 20, + fontSize: 14, color: AppColor.primaryColor, fontFamily: GoogleFonts.averiaSansLibre().fontFamily); diff --git a/lib/controller/home/map_passenger_controller.dart b/lib/controller/home/map_passenger_controller.dart index de97d72..a01dc65 100644 --- a/lib/controller/home/map_passenger_controller.dart +++ b/lib/controller/home/map_passenger_controller.dart @@ -2364,8 +2364,9 @@ class MapPassengerController extends GetxController { totalME = totalCostPassenger - tax; costForDriver = fuelPrice * 12; - if (totalCostPassenger < 1) { - totalCostPassenger = 1; + if (totalCostPassenger < 20) { + // for eygpt 20 le open ride + totalCostPassenger = 20; if (double.parse(box.read(BoxName.passengerWalletTotal)) < 0) { totalPassenger = totalCostPassenger + (-1) * (double.parse(box.read(BoxName.passengerWalletTotal))); 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 ea50378..779601c 100644 --- a/lib/views/home/Captin/mapDriverWidgets/driver_end_ride_bar.dart +++ b/lib/views/home/Captin/mapDriverWidgets/driver_end_ride_bar.dart @@ -62,8 +62,8 @@ GetBuilder driverEndRideBar() { ], ) : const SizedBox(), - mapDriverController.carType != 'Mashwari' || - mapDriverController.carType != 'Comfort' + mapDriverController.carType == 'Speed' || + mapDriverController.carType == 'Delivery' ? Row( mainAxisAlignment: MainAxisAlignment.spaceAround, children: [ diff --git a/lib/views/home/Captin/mapDriverWidgets/passenger_info_window.dart b/lib/views/home/Captin/mapDriverWidgets/passenger_info_window.dart index 0bf3108..9ac0759 100644 --- a/lib/views/home/Captin/mapDriverWidgets/passenger_info_window.dart +++ b/lib/views/home/Captin/mapDriverWidgets/passenger_info_window.dart @@ -112,6 +112,7 @@ class PassengerInfoWindow extends StatelessWidget { ], )), Row( + mainAxisAlignment: MainAxisAlignment.center, children: [ Container( decoration: AppStyle.boxDecoration1,