2/6/1

2024-02-06 01:19:56 +03:00
parent 63ac6235c9
commit f9ed0893bc
3 changed files with 130 additions and 25 deletions
--- a/lib/views/home/Captin/mapDriverWidgets/driver_end_ride_bar.dart
+++ b/lib/views/home/Captin/mapDriverWidgets/driver_end_ride_bar.dart
@@ -15,13 +15,9 @@ GetBuilder<MapDriverController> driverEndRideBar() {
              right: 5,
              child: Container(
                decoration: AppStyle.boxDecoration,
-<<<<<<< HEAD
                height: mapDriverController.remainingTimeTimerRideBegin < 60
                    ? mapDriverController.driverEndPage = 160
                    : 100,
-=======
-                height: mapDriverController.remainingTimeTimerRideBegin >60?100:160,,
->>>>>>> d948723751895f2cb5ff51597ece9bc2fe6c456f
                width: 200,
                child: Column(
                  children: [