4/3/1

lib/controller/functions/location_controller.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
 
-import 'package:SEFER/constant/table_names.dart';
 import 'package:SEFER/controller/home/captin/home_captain_controller.dart';
 import 'package:get/get.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
@@ -64,14 +63,13 @@ class LocationController extends GetxController {
                     Get.find<LocationController>().myLocation.latitude,
                     Get.find<LocationController>().myLocation.longitude,
                   )));
-            } else {
-              Get.find<HomeCaptainController>()
-                  .mapHomeCaptainController
-                  .animateCamera(CameraUpdate.newLatLng(LatLng(
-                    Get.find<LocationController>().myLocation.latitude,
-                    Get.find<LocationController>().myLocation.longitude,
-                  )));
             }
+            Get.find<HomeCaptainController>()
+                .mapHomeCaptainController
+                .animateCamera(CameraUpdate.newLatLng(LatLng(
+                  Get.find<LocationController>().myLocation.latitude,
+                  Get.find<LocationController>().myLocation.longitude,
+                )));
 
             // if (box.read(BoxName.driverID) != null) {
             await CRUD()

lib/controller/home/captin/map_driver_controller.dart

@@ -828,7 +828,7 @@ class MapDriverController extends GetxController {
   late Duration durationToAdd;
   int hours = 0;
   int minutes = 0;
-  late String carType;
+  late String carType = '';
   late String kazan;
   @override
   void onInit() async {

lib/views/home/Captin/home_captain/home_captin.dart

@@ -119,6 +119,7 @@ class HomeCaptain extends StatelessWidget {
                   child: Center(
                       child: Column(
                     crossAxisAlignment: CrossAxisAlignment.center,
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: [
                       Row(
                         mainAxisAlignment: MainAxisAlignment.center,
@@ -142,7 +143,7 @@ class HomeCaptain extends StatelessWidget {
                             color: AppColor.yellowColor,
                           ),
                           Text(
-                            '${' You Have in'.tr} ${homeCaptainController.totalMoneyInSEFER} ${AppInformation.appName} ',
+                            '${' You Have in'.tr} ${AppInformation.appName} is ${homeCaptainController.totalMoneyInSEFER}  ',
                             style: AppStyle.title,
                           ),
                         ],
@@ -158,7 +159,19 @@ class HomeCaptain extends StatelessWidget {
                           Container(
                             decoration: BoxDecoration(
                               borderRadius: BorderRadius.circular(6),
-                              color: AppColor.greenColor,
+                              color: int.parse(Get.find<HomeCaptainController>()
+                                          .countRideToday) <
+                                      5
+                                  ? AppColor.accentColor
+                                  : int.parse(Get.find<HomeCaptainController>()
+                                                  .countRideToday) >
+                                              5 &&
+                                          int.parse(Get.find<
+                                                      HomeCaptainController>()
+                                                  .countRideToday) <
+                                              10
+                                      ? AppColor.yellowColor
+                                      : AppColor.greenColor,
                             ),
                             child: Padding(
                               padding: const EdgeInsets.symmetric(