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

3/30/5

Browse Source
This commit is contained in:
Hamza Aleghwairyeen
2024-03-30 15:11:14 +03:00
parent d779765da4
commit 66cd964a89
5 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ios/Runner/Info.plist
View File

@@ -21,11 +21,11 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>17</string> <string>20</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1.37</string> <string>1.40</string>
<key>FirebaseAppDelegateProxyEnabled</key> <key>FirebaseAppDelegateProxyEnabled</key>
<string>NO</string> <string>NO</string>
<key>GMSApiKey</key> <key>GMSApiKey</key>

4
lib/controller/home/map_passenger_controller.dart
View File

@@ -1153,7 +1153,9 @@ class MapPassengerController extends GetxController {
['latitude']), ['latitude']),
double.parse(datadriverCarsLocationToPassengerAfterApplied['message'][0] double.parse(datadriverCarsLocationToPassengerAfterApplied['message'][0]
['longitude']))); ['longitude'])));
CarLocationModel model = CarLocationModel.fromJson(
datadriverCarsLocationToPassengerAfterApplied['message'][0]);
carLocationsModels.add(model);
update(); update();
} }

2
lib/controller/local/translations.dart
View File

@@ -458,7 +458,7 @@ class MyTranslation extends Translations {
'Are you sure to cancel?': "هل أنت متأكد من الإلغاء؟", 'Are you sure to cancel?': "هل أنت متأكد من الإلغاء؟",
'Yes': 'نعم', 'Yes': 'نعم',
'Insert Emergincy Number': "أدخل رقم الطوارئ", 'Insert Emergincy Number': "أدخل رقم الطوارئ",
'Insert': "إدراج", 'Insert': "إدراج",'You can decline a request without any cost':'‏يمكنك إلغاء الطلب بدون أي تكلفة',
" My current location is:": "موقعي الحالي هو:", " My current location is:": "موقعي الحالي هو:",
" \nand I have a trip on": "\nولدي رحلة على", " \nand I have a trip on": "\nولدي رحلة على",
"App \nwith Passenger ": "التطبيق\nمع الراكب ", "App \nwith Passenger ": "التطبيق\nمع الراكب ",

12
lib/views/home/Captin/mapDriverWidgets/driver_end_ride_bar.dart
View File

@@ -113,17 +113,19 @@ GetBuilder<MapDriverController> speedCircle() {
? Positioned( ? Positioned(
// left: 5, // left: 5,
bottom: 25, bottom: 25,
right: 5, right: 100,
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
shape: BoxShape.circle, shape: BoxShape.circle,
color: AppColor.redColor, color: AppColor.redColor,
border: Border.all(width: 1)), border: Border.all(width: 2,color: AppColor.secondaryColor)),
height: 60, height: 60,
width: 60, width: 60,
child: Text( child: Center(
mapDriverController.speed.toStringAsFixed(0), child: Text(
style: AppStyle.number, mapDriverController.speed.toStringAsFixed(0),
style: AppStyle.number,
),
), ),
)) ))
: const SizedBox()); : const SizedBox());

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

@@ -159,23 +159,22 @@ class GoogleMapPassengerWidget extends StatelessWidget {
), ),
// controller.carMarrkerAplied, // controller.carMarrkerAplied,
if (controller.statusRide == 'Apply') if (controller.statusRide == 'Apply')
// for (var carLocation for (var carLocation
// in controller.driverCarsLocationToPassengerAfterApplied) in controller.driverCarsLocationToPassengerAfterApplied)
Marker( Marker(
// anchor: const Offset(4, 4), // anchor: const Offset(4, 4),
position: LatLng( position: LatLng(
double.parse(controller.datadriverCarsLocationToPassengerAfterApplied['message'] carLocation.latitude,
[0]['latitude']), carLocation.longitude,
double.parse(controller.datadriverCarsLocationToPassengerAfterApplied['message'] ), //carLocation,
[0]['longitude'])), //carLocation, icon: controller.carIcon,
icon: controller.carIcon, rotation: double.parse(controller
rotation: double.parse( .datadriverCarsLocationToPassengerAfterApplied[
controller.datadriverCarsLocationToPassengerAfterApplied['message'] 'message'][0]['heading']),
[0]['heading']), markerId: MarkerId(controller
markerId: MarkerId(controller .datadriverCarsLocationToPassengerAfterApplied[
.datadriverCarsLocationToPassengerAfterApplied['message'] 'message'][0]['longitude']
[0]['longitude'] .toString())),
.toString())),
for (int i = 1; for (int i = 1;
i < controller.coordinatesWithoutEmpty.length - 1; i < controller.coordinatesWithoutEmpty.length - 1;
i++) i++)