Hamza/driver_tripz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1/24/1

Browse Source
This commit is contained in:
Hamza-Ayed
2024-01-24 01:58:52 +03:00
parent 8aaca3630d
commit 1eab187076
13 changed files with 299 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/views/home/map_widget.dart/form_search_places.dart
View File

@@ -82,7 +82,7 @@ GetBuilder<MapPassengerController> formSearchPlaces() {
controller.changeHeightPlaces();
controller.myLocation = controller.newMyLocation;
controller.passengerLocation = controller.newMyLocation;
controller.convertHintTextDestinationNewPlaces(index);
controller.placesDestination = [];

4
lib/views/home/map_widget.dart/form_serch_multiy_point.dart
View File

@@ -87,9 +87,9 @@ GetBuilder<MapPassengerController> formSearchPlaces(int index) {
if (controller.currentLocationToFormPlacesAll[index] ==
true) {
controller.newStartPointLocation =
controller.myLocation;
controller.passengerLocation;
} else {
controller.myLocation =
controller.passengerLocation =
controller.newStartPointLocation;
}

67
lib/views/home/map_widget.dart/google_map_passenger_widget.dart
View File

@@ -37,7 +37,7 @@ class GoogleMapPassengerWidget extends StatelessWidget {
controller.clearPolyline();
if (controller.dataCarsLocationByPassenger != null) {
await controller.getMap(
'${controller.myLocation.latitude},${controller.myLocation.longitude}',
'${controller.passengerLocation.latitude},${controller.passengerLocation.longitude}',
'${argument.latitude.toString()},${argument.longitude.toString()}');
Get.back();
@@ -131,7 +131,7 @@ class GoogleMapPassengerWidget extends StatelessWidget {
// controller.bottomSheet();
},
initialCameraPosition: CameraPosition(
target: controller.myLocation,
target: controller.passengerLocation,
zoom: 15,
),
markers: {
@@ -154,43 +154,44 @@ class GoogleMapPassengerWidget extends StatelessWidget {
position: controller.newStartPointLocation,
draggable: true,
icon: controller.startIcon,
infoWindow: const InfoWindow(
title: 'Time',
anchor: Offset(0.5, 0.5), // Adjust the anchor as needed
// snippet: controller.durationFromDriverToPassenger
// .toString(),
),
onDragEnd: (value) {
print(value);
},
// infoWindow: InfoWindow(title: 'my location'.tr),
),
if (controller.isMarkersShown)
Marker(
markerId: MarkerId('Destination'.tr),
position: controller.newMyLocation,
position: controller.myDestination,
draggable: true,
icon: controller.endIcon,
),
if (controller.haveSteps)
Marker(
markerId: MarkerId('StartSteps'.tr),
position: LatLng(
double.parse(
controller.placesCoordinate[0].split(',')[0]),
double.parse(
controller.placesCoordinate[0].split(',')[1])),
draggable: true,
icon: controller.startIcon,
),
if (controller.haveSteps)
Marker(
markerId: MarkerId('EndSteps'.tr),
position: controller.newPointLocation4 == ''
? LatLng(
double.parse(
controller.placesCoordinate[3].split(',')[0]),
double.parse(
controller.placesCoordinate[3].split(',')[1]))
: controller.newPointLocation3 == ''
? LatLng(
double.parse(controller.placesCoordinate[2]
.split(',')[0]),
double.parse(controller.placesCoordinate[2]
.split(',')[1]))
: controller.newPointLocation2,
draggable: true,
icon: controller.endIcon,
infoWindow: InfoWindow(
anchor: const Offset(0.5, 0),
title: 'Time',
snippet: controller.durationByPassenger.toString()
// snippet: controller.durationFromDriverToPassenger
// .toString(),
),
onDragEnd: (value) {
print(value);
},
// infoWindow: InfoWindow(title: 'my location'.tr),
),
// Marker(
// markerId: MarkerId('Target'.tr),
// position: controller.myDestination,
// draggable: true,
// onDragEnd: (v) {
// print(v);
// },
// ),
},
polylines: {
Polyline(
@@ -283,7 +284,7 @@ class GoogleMapPassengerWidget extends StatelessWidget {
circles: <Circle>{
Circle(
circleId: const CircleId('circle_id'),
center: controller.myLocation,
center: controller.passengerLocation,
radius: 100,
fillColor: Colors.blue.withOpacity(0.3),
strokeColor: Colors.blue,

2
lib/views/home/map_widget.dart/main_bottom_Menu_map.dart
View File

@@ -348,7 +348,7 @@ class FavioratePlacesDialogu extends StatelessWidget {
Get.back();
await controller.getLocation();
await controller.getMap(
'${controller.myLocation.latitude},${controller.myLocation.longitude}',
'${controller.passengerLocation.latitude},${controller.passengerLocation.longitude}',
'${favoritePlaces[index]['latitude']},${favoritePlaces[index]['longitude']}',
);
// controller.changePickerShown();

4
lib/views/home/map_widget.dart/picker_animation_container.dart
View File

@@ -135,7 +135,7 @@ class PickerAnimtionContainerFormPlaces extends StatelessWidget {
onPressed: () async {
await controller
.getMap(
'${controller.myLocation.latitude},${controller.myLocation.longitude}',
'${controller.passengerLocation.latitude},${controller.passengerLocation.longitude}',
'${favoritePlaces[index]['latitude']},${favoritePlaces[index]['longitude']}',
);
controller
@@ -193,7 +193,7 @@ class PickerAnimtionContainerFormPlaces extends StatelessWidget {
title: 'Go to this Target'.tr,
onPressed: () async {
await controller.getMap(
'${controller.myLocation.latitude},${controller.myLocation.longitude}',
'${controller.passengerLocation.latitude},${controller.passengerLocation.longitude}',
'${controller.newMyLocation.latitude},${controller.newMyLocation.longitude}',
);
controller.changePickerShown();