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

4/11/1

Browse Source
This commit is contained in:
Hamza Aleghwairyeen
2024-04-11 09:55:17 +03:00
parent 8fcc9e22e7
commit a7288e6204
5 changed files with 82 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/controller/home/captin/map_driver_controller.dart
View File

@@ -413,7 +413,25 @@ class MapDriverController extends GetxController {
} }
} }
void finishRideFromDriver() async { void finishRideFromDriver() {
Get.defaultDialog(
title: 'Are you sure to exit ride ?'.tr,
titleStyle: AppStyle.title,
middleText: '',
confirm: MyElevatedButton(
title: 'Ok'.tr,
onPressed: () {
Get.back();
finishRideFromDriver1();
}),
cancel: MyElevatedButton(
title: 'Cancel'.tr,
onPressed: () {
Get.back();
}));
}
void finishRideFromDriver1() async {
double distanceToDestination = Geolocator.distanceBetween( double distanceToDestination = Geolocator.distanceBetween(
latLngPassengerDestination.latitude, latLngPassengerDestination.latitude,
latLngPassengerDestination.longitude, latLngPassengerDestination.longitude,

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

@@ -271,6 +271,12 @@ class MapPassengerController extends GetxController {
coordinatesWithoutEmpty[i + 1].toString(), coordinatesWithoutEmpty[i + 1].toString(),
i, i,
); );
if (i == 0) {
startNameAddress = data[0]['start_address'];
}
if (i == coordinatesWithoutEmpty.length) {
endNameAddress = data[0]['end_address'];
}
} }
} }

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

@@ -77,7 +77,7 @@ GetBuilder<MapDriverController> driverEndRideBar() {
mapDriverController.carType == 'Comfort') && mapDriverController.carType == 'Comfort') &&
mapDriverController.remainingTimeTimerRideBegin > 60 mapDriverController.remainingTimeTimerRideBegin > 60
? Row( ? Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [ children: [
MyElevatedButton( MyElevatedButton(
title: 'End Ride'.tr, title: 'End Ride'.tr,
@@ -86,12 +86,19 @@ GetBuilder<MapDriverController> driverEndRideBar() {
}, },
kolor: AppColor.redColor, kolor: AppColor.redColor,
), ),
Container(
decoration: AppStyle.boxDecoration1,
child: Text(
mapDriverController.carType,
style: AppStyle.title,
),
)
], ],
) )
: const SizedBox(), : const SizedBox(),
mapDriverController.remainingTimeTimerRideBegin < 60 mapDriverController.remainingTimeTimerRideBegin < 60
? Row( ? Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [ children: [
MyElevatedButton( MyElevatedButton(
title: 'End Ride'.tr, title: 'End Ride'.tr,
@@ -100,10 +107,17 @@ GetBuilder<MapDriverController> driverEndRideBar() {
}, },
kolor: AppColor.redColor, kolor: AppColor.redColor,
), ),
Container(
decoration: AppStyle.boxDecoration1,
child: Text(
mapDriverController.carType,
style: AppStyle.title,
),
)
], ],
) )
: const SizedBox(), : const SizedBox(),
mapDriverController.carType != 'Comfort' || mapDriverController.carType != 'Comfort' &&
mapDriverController.carType != 'Mashwari' mapDriverController.carType != 'Mashwari'
? Stack( ? Stack(
children: [ children: [
@@ -130,13 +144,6 @@ GetBuilder<MapDriverController> driverEndRideBar() {
], ],
) )
: const SizedBox(), : const SizedBox(),
Container(
decoration: AppStyle.boxDecoration1,
child: Text(
mapDriverController.carType,
style: AppStyle.title,
),
)
], ],
), ),
)) ))

36
lib/views/home/map_widget.dart/apply_order_widget.dart
View File

@@ -177,12 +177,12 @@ class ApplyOrderWidget extends StatelessWidget {
controller.driverToken); controller.driverToken);
Get.back(); Get.back();
}, },
child: Padding( child: Container(
padding: decoration:
const EdgeInsets.all(10), AppStyle.boxDecoration1,
child: Container( child: Padding(
decoration: padding:
AppStyle.boxDecoration1, const EdgeInsets.all(10),
child: Text( child: Text(
'Hello, I\'m at the agreed-upon location' 'Hello, I\'m at the agreed-upon location'
.tr, .tr,
@@ -201,12 +201,12 @@ class ApplyOrderWidget extends StatelessWidget {
controller.driverToken); controller.driverToken);
Get.back(); Get.back();
}, },
child: Padding( child: Container(
padding: decoration:
const EdgeInsets.all(10), AppStyle.boxDecoration1,
child: Container( child: Padding(
decoration: padding:
AppStyle.boxDecoration1, const EdgeInsets.all(10),
child: Text( child: Text(
'My location is correct. You can search for me using the navigation app' 'My location is correct. You can search for me using the navigation app'
.tr, .tr,
@@ -225,12 +225,12 @@ class ApplyOrderWidget extends StatelessWidget {
controller.driverToken); controller.driverToken);
Get.back(); Get.back();
}, },
child: Padding( child: Container(
padding: decoration:
const EdgeInsets.all(10), AppStyle.boxDecoration1,
child: Container( child: Padding(
decoration: padding:
AppStyle.boxDecoration1, const EdgeInsets.all(10),
child: Text( child: Text(
'I\'m waiting for you'.tr, 'I\'m waiting for you'.tr,
style: AppStyle.title, style: AppStyle.title,

44
lib/views/home/map_widget.dart/ride_begin_passenger.dart
View File

@@ -36,6 +36,28 @@ class RideBeginPassenger extends StatelessWidget {
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
CircleAvatar(
radius: 30,
backgroundImage: NetworkImage(
'https://ride.mobile-app.store/portrate_captain_image/${controller.driverId}.jpg'),
),
Text(
controller.firstName,
style: AppStyle.title,
),
Column(
children: [
Text(
'${controller.driverRate} 📈',
style: AppStyle.title,
),
],
),
],
),
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceAround, mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [ children: [
@@ -107,28 +129,6 @@ class RideBeginPassenger extends StatelessWidget {
), ),
], ],
), ),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
CircleAvatar(
radius: 30,
backgroundImage: NetworkImage(
'https://ride.mobile-app.store/portrate_captain_image/${controller.driverId}.jpg'),
),
Text(
controller.firstName,
style: AppStyle.title,
),
Column(
children: [
Text(
'${controller.driverRate} 📈',
style: AppStyle.title,
),
],
),
],
),
Stack( Stack(
children: [ children: [
// StreamCounter(), // StreamCounter(),