10/18/2

lib/views/home/Captin/driver_map_page.dart

@@ -3,10 +3,11 @@ import 'package:get/get.dart';
 import 'package:ride/controller/home/captin/map_driver_controller.dart';
 import 'package:ride/views/widgets/my_scafold.dart';
 
-import '../../../../controller/functions/location_controller.dart';
+import '../../../controller/functions/location_controller.dart';
-import 'driver_end_ride_bar.dart';
+import 'mapDriverWidgets/driver_end_ride_bar.dart';
-import 'google_driver_map_page.dart';
+import 'mapDriverWidgets/google_driver_map_page.dart';
-import 'passenger_info_window.dart';
+import 'mapDriverWidgets/passenger_info_window.dart';
+import 'mapDriverWidgets/sos_connect.dart';
 
 class PassengerLocationMapPage extends StatelessWidget {
   PassengerLocationMapPage({super.key});
@@ -20,7 +21,8 @@ class PassengerLocationMapPage extends StatelessWidget {
         body: [
           GoogleDriverMap(locationController: locationController),
           const PassengerInfoWindow(),
-          driverEndRideBar()
+          driverEndRideBar(),
+          const SosConnect(),
         ],
         isleading: true);
   }

lib/views/home/Captin/home_captin.dart

@@ -10,6 +10,7 @@ import 'package:ride/controller/home/captin/order_request_controller.dart';
 import 'package:ride/main.dart';
 import 'package:ride/views/widgets/circle_container.dart';
 import 'package:ride/views/widgets/elevated_btn.dart';
+import 'package:flutter_font_icons/flutter_font_icons.dart';
 
 import '../../../controller/functions/location_controller.dart';
 import '../../../controller/home/captin/widget/connect.dart';
@@ -104,11 +105,20 @@ class HomeCaptain extends StatelessWidget {
                 width: Get.width * .8,
                 height: 80,
                 child: Center(
-                    child: Text(
+                    child: Row(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    const Icon(
+                      Entypo.wallet,
+                      color: AppColor.greenColor,
+                    ),
+                    Text(
                       ' You Earn today is '.tr +
                           homeCaptainController
                               .totalToday, //Todo add here number for income
                       style: AppStyle.title,
+                    ),
+                  ],
                 ))),
           ),
           GetBuilder<HomeCaptainController>(
@@ -128,6 +138,35 @@ class HomeCaptain extends StatelessWidget {
                       //     'hi from Sefer', ['+962798583052']);
                     },
                     child: const Text('send msg')),
+                const Wrap(
+                  children: <Widget>[
+                    Icon(AntDesign.facebook_square),
+                    Icon(AntDesign.wallet),
+                    Icon(Entypo.wallet),
+                    Icon(
+                      Entypo.google__with_circle,
+                      color: AppColor.redColor,
+                    ),
+                    Icon(EvilIcons.camera),
+                    Icon(Feather.activity),
+                    Icon(
+                      FontAwesome.whatsapp,
+                      color: AppColor.greenColor,
+                    ),
+                    Icon(FontAwesome5.square),
+                    Icon(FontAwesome5Solid.address_book),
+                    Icon(FontAwesome5Brands.$500px),
+                    Icon(Fontisto.google_play),
+                    Icon(Foundation.hearing_aid),
+                    Icon(Ionicons.logo_whatsapp),
+                    Icon(MaterialCommunityIcons.home_city),
+                    Icon(MaterialIcons.ac_unit),
+                    Icon(Octicons.watch),
+                    Icon(SimpleLineIcons.wrench),
+                    Icon(WeatherIcons.wi_day_sleet),
+                    Icon(Zocial.github),
+                  ],
+                ),
               ],
             ),
           ),

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

@@ -0,0 +1,58 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_font_icons/flutter_font_icons.dart';
+import 'package:get/get.dart';
+
+import '../../../../constant/box_name.dart';
+import '../../../../constant/colors.dart';
+import '../../../../constant/style.dart';
+import '../../../../controller/functions/launch.dart';
+import '../../../../controller/home/captin/map_driver_controller.dart';
+import '../../../../main.dart';
+
+class SosConnect extends StatelessWidget {
+  const SosConnect({
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return GetBuilder<MapDriverController>(
+        builder: (mapDriverController) => mapDriverController.isRideStarted
+            ? Positioned(
+                left: 5,
+                top: Get.height * .3,
+                child: Container(
+                  decoration: AppStyle.boxDecoration,
+                  height: 100,
+                  width: 70,
+                  child: Column(
+                    mainAxisAlignment: MainAxisAlignment.spaceAround,
+                    children: [
+                      InkWell(
+                        onTap: () {
+                          launchCommunication('phone', '911', '');
+                        },
+                        child: const Icon(
+                          Icons.sos_sharp,
+                          color: AppColor.redColor,
+                        ),
+                      ),
+                      InkWell(
+                        onTap: () {
+                          launchCommunication(
+                              'whatsapp',
+                              '0798583052', //todo  add number from driver
+                              'Hello this is Captain'.tr +
+                                  ' ${box.read(BoxName.nameDriver)}');
+                        },
+                        child: const Icon(
+                          FontAwesome.whatsapp,
+                          color: AppColor.greenColor,
+                        ),
+                      ),
+                    ],
+                  ),
+                ))
+            : const SizedBox());
+  }
+}

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

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_font_icons/flutter_font_icons.dart';
 import 'package:get/get.dart';
 import 'package:ride/constant/box_name.dart';
 import 'package:ride/controller/profile/profile_controller.dart';
@@ -152,8 +153,8 @@ class RideBeginPassenger extends StatelessWidget {
                           }
                         },
                         icon: const Icon(
-                          Icons.ring_volume,
+                          FontAwesome.whatsapp,
-                          color: AppColor.blueColor,
+                          color: AppColor.greenColor,
                         ),
                       ),
                     ],

lib/views/orderCaptin/order_request_page.dart

@@ -4,7 +4,7 @@ import 'package:ride/constant/box_name.dart';
 import 'package:ride/controller/firebase/firbase_messge.dart';
 import 'package:ride/controller/home/captin/map_driver_controller.dart';
 import 'package:ride/main.dart';
-import 'package:ride/views/home/Captin/mapDriver/driver_map_page.dart';
+import 'package:ride/views/home/Captin/driver_map_page.dart';
 import 'package:ride/views/widgets/my_scafold.dart';
 
 import '../../constant/colors.dart';

pubspec.lock

@@ -214,6 +214,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_font_icons:
+    dependency: "direct main"
+    description:
+      name: flutter_font_icons
+      sha256: "2ae31df19f9d98a559146b2a592a10d42bbeedffeadcc3488b74b9f3e8a50241"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.5"
   flutter_launcher_icons:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -37,6 +37,7 @@ dependencies:
   flutter_launcher_icons: ^0.13.1
   crypto: ^3.0.3
   flutter_rating_bar: ^4.0.1
+  flutter_font_icons: ^2.2.5
 
 
 dev_dependencies: