4/11/2

lib/views/home/Captin/mapDriverWidgets/passenger_info_window.dart

@@ -31,7 +31,7 @@ class PassengerInfoWindow extends StatelessWidget {
                   // left: 8,
                   child: AnimatedContainer(
                     duration: const Duration(milliseconds: 300),
-                    height: controller.passengerInfoWindow,
+                    height: controller.passengerInfoWindowHeight,
                     width: Get.width * .99,
                     decoration: AppStyle.boxDecoration,
                     child: Padding(

lib/views/home/map_widget.dart/apply_order_widget.dart

@@ -26,7 +26,7 @@ class ApplyOrderWidget extends StatelessWidget {
           right: 0,
           child: Container(
             decoration: AppStyle.boxDecoration1,
-            height: Get.height * .3,
+            height: Get.height * .35,
             child: ListView(
               children: [
                 InkWell(
@@ -84,7 +84,7 @@ class ApplyOrderWidget extends StatelessWidget {
                       width: 10,
                     ),
                     Container(
-                      height: 200,
+                      height: Get.height * .3,
                       width: Get.width * .9,
                       decoration: AppStyle.boxDecoration1,
                       child: Column(
@@ -299,7 +299,7 @@ class DriverArrivePassengerAndWaitMinute extends StatelessWidget {
             color: controller.remainingTimeDriverWaitPassenger5Minute < 60
                 ? AppColor.redColor
                 : AppColor.greenColor,
-            minHeight: 30,
+            minHeight: 25,
             borderRadius: BorderRadius.circular(15),
             value:
                 controller.progressTimerDriverWaitPassenger5Minute.toDouble(),
@@ -309,7 +309,7 @@ class DriverArrivePassengerAndWaitMinute extends StatelessWidget {
             children: [
               Text(
                 'The driver waiting you in picked location .'.tr,
-                style: AppStyle.title,
+                style: AppStyle.subtitle,
                 textAlign: TextAlign.center,
               ),
               const SizedBox(

lib/views/home/map_widget.dart/ride_begin_passenger.dart

@@ -20,21 +20,21 @@ class RideBeginPassenger extends StatelessWidget {
   Widget build(BuildContext context) {
     ProfileController profileController = Get.put(ProfileController());
     AudioController audioController = Get.put(AudioController());
+    // Get.put(MapPassengerController());
     return GetBuilder<MapPassengerController>(builder: (controller) {
-      if ( //controller.rideTimerBegin ||
-          controller.statusRide == 'Begin' || !controller.statusRideFromStart) {
+      if (controller.statusRide == 'Begin' || !controller.statusRideFromStart) {
         return Positioned(
           left: 10,
           right: 10,
           bottom: 4,
           child: Container(
             decoration: AppStyle.boxDecoration,
-            height: controller.rideTimerBegin ? Get.height * .3 : 0,
+            height: controller.statusRide == 'Begin' ? Get.height * .33 : 0,
             // width: 100,
             child: Padding(
               padding: const EdgeInsets.all(8.0),
               child: Column(
-                mainAxisAlignment: MainAxisAlignment.center,
+                mainAxisAlignment: MainAxisAlignment.spaceAround,
                 children: [
                   Row(
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -58,6 +58,9 @@ class RideBeginPassenger extends StatelessWidget {
                       ),
                     ],
                   ),
+                  // SizedBox(
+                  //   height: 5,
+                  // ),
                   Row(
                     mainAxisAlignment: MainAxisAlignment.spaceAround,
                     children: [