1/24/1

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

@@ -3,6 +3,7 @@ import 'package:get/get.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
 import 'package:flutter_font_icons/flutter_font_icons.dart';
 import 'package:ride/views/home/Captin/home_captain/drawer_captain.dart';
+import 'package:ride/views/widgets/mycircular.dart';
 
 import '../../../../constant/colors.dart';
 import '../../../../constant/info.dart';
@@ -19,14 +20,14 @@ import '../../../widgets/circle_container.dart';
 
 class HomeCaptain extends StatelessWidget {
   HomeCaptain({super.key});
-  final LocationController locationController = LocationController();
+  final LocationController locationController = Get.put(LocationController());
   // final HomeCaptainController homeCaptainController = HomeCaptainController();
 // final LocationController locationController=LocationController();
   @override
   Widget build(BuildContext context) {
     Get.put(OrderRequestController());
     Get.put(HomeCaptainController());
-    // Get.put(HomeCaptainController());
+    Get.put(LocationController());
     print('local is    ${Get.find<LocaleController>().language!.countryCode}');
     return Scaffold(
       appBar: AppBar(
@@ -64,28 +65,31 @@ class HomeCaptain extends StatelessWidget {
       body: Stack(
         children: [
           GetBuilder<HomeCaptainController>(
-            builder: (controller) => GoogleMap(
-              onMapCreated: controller.onMapCreated,
-              // cameraTargetBounds: CameraTargetBounds(controller.boundsdata),
-              minMaxZoomPreference: const MinMaxZoomPreference(6, 18),
+            builder: (controller) => controller.isLoading
+                ? const MyCircularProgressIndicator()
+                : GoogleMap(
+                    onMapCreated: controller.onMapCreated,
+                    // cameraTargetBounds: CameraTargetBounds(controller.boundsdata),
+                    minMaxZoomPreference: const MinMaxZoomPreference(6, 18),
 
-              initialCameraPosition: CameraPosition(
-                target: locationController.myLocation,
-                zoom: 15,
-              ),
+                    initialCameraPosition: CameraPosition(
+                      target: locationController.myLocation,
+                      zoom: 15,
+                    ),
 
-              mapType: controller.mapType ? MapType.satellite : MapType.normal,
-              myLocationButtonEnabled: true,
-              // liteModeEnabled: true, tiltGesturesEnabled: false,
+                    mapType:
+                        controller.mapType ? MapType.satellite : MapType.normal,
+                    myLocationButtonEnabled: true,
+                    // liteModeEnabled: true, tiltGesturesEnabled: false,
 
-              // indoorViewEnabled: true,
-              trafficEnabled: controller.mapTrafficON,
-              buildingsEnabled: true,
-              mapToolbarEnabled: true,
+                    // indoorViewEnabled: true,
+                    trafficEnabled: controller.mapTrafficON,
+                    buildingsEnabled: true,
+                    mapToolbarEnabled: true,
 
-              myLocationEnabled: true,
-              // liteModeEnabled: true,
-            ),
+                    myLocationEnabled: true,
+                    // liteModeEnabled: true,
+                  ),
           ),
           Positioned(
               bottom: 10,

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

@@ -25,10 +25,10 @@ class GoogleDriverMap extends StatelessWidget {
             target: locationController.myLocation,
             zoom: 15,
           ),
-          // onCameraMove: (position) {
-          //   locationController.myLocation = position.target;
-          //   print(position);
-          // },
+          onCameraMove: (position) {
+            locationController.myLocation = position.target;
+            print(position);
+          },
           minMaxZoomPreference: const MinMaxZoomPreference(6, 18),
           buildingsEnabled: true,
           mapToolbarEnabled: true,
@@ -40,7 +40,7 @@ class GoogleDriverMap extends StatelessWidget {
               endCap: Cap.buttCap,
               startCap: Cap.buttCap,
               visible: true,
-              polylineId: const PolylineId('route'),
+              polylineId: const PolylineId('route1'),
               points: controller.polylineCoordinates,
               color: AppColor.greenColor,
               width: 5,
@@ -64,11 +64,18 @@ class GoogleDriverMap extends StatelessWidget {
               position: locationController.myLocation,
               draggable: true,
               icon: controller.carIcon,
-              infoWindow: const InfoWindow(
-                title: 'Time',
-                // snippet: controller.durationFromDriverToPassenger
-                //     .toString(),
-              ),
+            ),
+            Marker(
+              markerId: MarkerId('start'.tr),
+              position: controller.latLngpassengerLocation,
+              draggable: true,
+              icon: controller.startIcon,
+            ),
+            Marker(
+              markerId: MarkerId('end'.tr),
+              position: controller.latLngPassengerDestination,
+              draggable: true,
+              icon: controller.endIcon,
             ),
           },
         ),