diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 63217d6..6fa3c5c 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -21,11 +21,11 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 17
+ 20
CFBundleSignature
????
CFBundleVersion
- 1.37
+ 1.40
FirebaseAppDelegateProxyEnabled
NO
GMSApiKey
diff --git a/lib/controller/home/map_passenger_controller.dart b/lib/controller/home/map_passenger_controller.dart
index 132331a..3216932 100644
--- a/lib/controller/home/map_passenger_controller.dart
+++ b/lib/controller/home/map_passenger_controller.dart
@@ -1153,7 +1153,9 @@ class MapPassengerController extends GetxController {
['latitude']),
double.parse(datadriverCarsLocationToPassengerAfterApplied['message'][0]
['longitude'])));
-
+ CarLocationModel model = CarLocationModel.fromJson(
+ datadriverCarsLocationToPassengerAfterApplied['message'][0]);
+ carLocationsModels.add(model);
update();
}
diff --git a/lib/controller/local/translations.dart b/lib/controller/local/translations.dart
index 7bbac93..54695a7 100644
--- a/lib/controller/local/translations.dart
+++ b/lib/controller/local/translations.dart
@@ -458,7 +458,7 @@ class MyTranslation extends Translations {
'Are you sure to cancel?': "هل أنت متأكد من الإلغاء؟",
'Yes': 'نعم',
'Insert Emergincy Number': "أدخل رقم الطوارئ",
- 'Insert': "إدراج",
+ 'Insert': "إدراج",'You can decline a request without any cost':'يمكنك إلغاء الطلب بدون أي تكلفة',
" My current location is:": "موقعي الحالي هو:",
" \nand I have a trip on": "\nولدي رحلة على",
"App \nwith Passenger ": "التطبيق\nمع الراكب ",
diff --git a/lib/views/home/Captin/mapDriverWidgets/driver_end_ride_bar.dart b/lib/views/home/Captin/mapDriverWidgets/driver_end_ride_bar.dart
index 9f7a092..2d8827d 100644
--- a/lib/views/home/Captin/mapDriverWidgets/driver_end_ride_bar.dart
+++ b/lib/views/home/Captin/mapDriverWidgets/driver_end_ride_bar.dart
@@ -113,17 +113,19 @@ GetBuilder speedCircle() {
? Positioned(
// left: 5,
bottom: 25,
- right: 5,
+ right: 100,
child: Container(
decoration: BoxDecoration(
shape: BoxShape.circle,
color: AppColor.redColor,
- border: Border.all(width: 1)),
+ border: Border.all(width: 2,color: AppColor.secondaryColor)),
height: 60,
width: 60,
- child: Text(
- mapDriverController.speed.toStringAsFixed(0),
- style: AppStyle.number,
+ child: Center(
+ child: Text(
+ mapDriverController.speed.toStringAsFixed(0),
+ style: AppStyle.number,
+ ),
),
))
: const SizedBox());
diff --git a/lib/views/home/map_widget.dart/google_map_passenger_widget.dart b/lib/views/home/map_widget.dart/google_map_passenger_widget.dart
index 6afb37a..23e7051 100644
--- a/lib/views/home/map_widget.dart/google_map_passenger_widget.dart
+++ b/lib/views/home/map_widget.dart/google_map_passenger_widget.dart
@@ -159,23 +159,22 @@ class GoogleMapPassengerWidget extends StatelessWidget {
),
// controller.carMarrkerAplied,
if (controller.statusRide == 'Apply')
- // for (var carLocation
- // in controller.driverCarsLocationToPassengerAfterApplied)
- Marker(
- // anchor: const Offset(4, 4),
- position: LatLng(
- double.parse(controller.datadriverCarsLocationToPassengerAfterApplied['message']
- [0]['latitude']),
- double.parse(controller.datadriverCarsLocationToPassengerAfterApplied['message']
- [0]['longitude'])), //carLocation,
- icon: controller.carIcon,
- rotation: double.parse(
- controller.datadriverCarsLocationToPassengerAfterApplied['message']
- [0]['heading']),
- markerId: MarkerId(controller
- .datadriverCarsLocationToPassengerAfterApplied['message']
- [0]['longitude']
- .toString())),
+ for (var carLocation
+ in controller.driverCarsLocationToPassengerAfterApplied)
+ Marker(
+ // anchor: const Offset(4, 4),
+ position: LatLng(
+ carLocation.latitude,
+ carLocation.longitude,
+ ), //carLocation,
+ icon: controller.carIcon,
+ rotation: double.parse(controller
+ .datadriverCarsLocationToPassengerAfterApplied[
+ 'message'][0]['heading']),
+ markerId: MarkerId(controller
+ .datadriverCarsLocationToPassengerAfterApplied[
+ 'message'][0]['longitude']
+ .toString())),
for (int i = 1;
i < controller.coordinatesWithoutEmpty.length - 1;
i++)