8/17/1

lib/views/home/map_widget.dart/car_details_widget_to_go.dart

@@ -49,6 +49,11 @@ List<CarType> carTypes = [
     carDetail: 'Mashwari without end point'.tr,
     image: 'assets/images/freeRide.png',
   ),
+  // CarType(
+  //   carType: 'Family',
+  //   carDetail: 'Family for 7 passenger'.tr,
+  //   image: 'assets/images/Family.png',
+  // ),
 ];
 
 class CarDetailsTypeToChoose extends StatelessWidget {

lib/views/home/map_widget.dart/select_driver_mishwari.dart

@@ -1,3 +1,4 @@
+import 'package:SEFER/constant/colors.dart';
 import 'package:SEFER/constant/style.dart';
 import 'package:SEFER/controller/home/map_passenger_controller.dart';
 import 'package:SEFER/views/widgets/elevated_btn.dart';
@@ -84,8 +85,9 @@ class CupertinoDriverListWidget extends StatelessWidget {
                               width: 20,
                               height: 20,
                               decoration: BoxDecoration(
-                                color:
-                                    hexToColor(driver['color_hex'].toString()),
+                                color: hexToColor(
+                                        driver['color_hex'].toString()) ??
+                                    Colors.amber,
                                 borderRadius: BorderRadius.circular(4),
                                 border: Border.all(),
                               ),
@@ -119,7 +121,8 @@ class CupertinoDriverListWidget extends StatelessWidget {
                                   height: 20,
                                   decoration: BoxDecoration(
                                     color: hexToColor(
-                                        driver['color_hex'].toString()),
+                                            driver['color_hex'].toString()) ??
+                                        AppColor.bronze,
                                     borderRadius: BorderRadius.circular(4),
                                     border: Border.all(),
                                   ),

lib/views/home/profile/passenger_profile_page.dart

@@ -378,8 +378,12 @@ class CountryPicker extends StatelessWidget {
                 box.write(
                     BoxName.countryCode, //
                     controller.selectedCountry); // Already saved in English
-                Get.snackbar(controller.selectedCountry.toString().tr, '');
-                Get.off(LoginPage());
+                if (controller.selectedCountry == null) {
+                  Get.snackbar("You should select your country".tr, '');
+                } else {
+                  Get.snackbar(controller.selectedCountry.toString().tr, '');
+                  Get.off(LoginPage());
+                }
               },
             )
           ],