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

1/1/1

Browse Source
This commit is contained in:
Hamza-Ayed
2024-01-01 00:56:25 +03:00
parent 8475bdc831
commit e3a63e18fc
13 changed files with 437 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,6 +45,18 @@ class GoogleDriverMap extends StatelessWidget {
color: AppColor.greenColor,
width: 5,
),
Polyline(
zIndex: 2,
consumeTapEvents: true,
geodesic: true,
endCap: Cap.buttCap,
startCap: Cap.buttCap,
visible: true,
polylineId: const PolylineId('route'),
points: controller.polylineCoordinatesDestination,
color: AppColor.redColor,
width: 5,
),
},
markers: {
Marker(

31
lib/views/home/Captin/orderCaptin/order_request_page.dart
View File

@@ -111,25 +111,25 @@ class OrderRequestPage extends StatelessWidget {
),
),
),
// Padding(
// padding: const EdgeInsets.all(8.0),
// child: RichText(
// text: TextSpan(
// text: 'Total For You is '.tr,
// style: AppStyle.title,
// children: [
// TextSpan(
// text: double.parse(myList[3]).toStringAsFixed(2),
// style: AppStyle.headtitle2),
// ],
// ),
// ),
// ),
Padding(
padding: const EdgeInsets.all(8.0),
child: RichText(
text: TextSpan(
text: 'Total For You is '.tr,
style: AppStyle.title,
children: [
TextSpan(
text: double.parse(myList[3]).toStringAsFixed(2),
style: AppStyle.headtitle2),
],
),
),
),
Padding(
padding: const EdgeInsets.all(8.0),
child: RichText(
text: TextSpan(
text: 'Distance is '.tr,
text: 'Distance from Passenger to destination is '.tr,
style: AppStyle.title,
children: [
TextSpan(
@@ -190,6 +190,7 @@ class OrderRequestPage extends StatelessWidget {
Get.back();
Get.to(() => PassengerLocationMapPage(), arguments: {
'passengerLocation': myList[0].toString(),
'passengerDestination': myList[1].toString(),
'Duration': myList[4].toString(),
'Distance': myList[5].toString(),
'name': myList[8].toString(),

142
lib/views/home/map_widget.dart/buttom_sheet_map_show.dart
View File

@@ -47,87 +47,71 @@ GetBuilder<MapPassengerController> buttomSheetMapPage() {
],
borderRadius: const BorderRadius.all(
Radius.circular(15))),
child: ListView.builder(
itemCount:
controller.dataCarsLocationByPassenger.length,
itemBuilder: (BuildContext context, int index) {
return Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
SizedBox(
width: Get.width * .15,
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Column(
children: [
Text(controller
.dataCarsLocationByPassenger
.toString()),
Image.asset(
'assets/images/jeep.png',
width: 50,
fit: BoxFit.fill,
repeat: ImageRepeat.repeatX,
),
],
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
SizedBox(
width: Get.width * .15,
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Image.asset(
'assets/images/jeep.png',
width: 50,
fit: BoxFit.fill,
repeat: ImageRepeat.repeatX,
),
),
),
SizedBox(
width: Get.width * .55,
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
mainAxisAlignment:
MainAxisAlignment.spaceEvenly,
children: [
Text(
'${'Your Ride Duration is '.tr}${controller.duration} minutes',
style: AppStyle.subtitle,
),
Text(
'${'You will be thier in'.tr} ${DateFormat('h:mm a').format(controller.newTime)}',
style: AppStyle.subtitle,
),
Text(
'${'You trip distance is'.tr} ${controller.distance} KM',
style: AppStyle.subtitle,
)
],
),
),
SizedBox(
width: Get.width * .2,
child: Padding(
padding: const EdgeInsets.only(
right: 5, left: 5),
child: Column(
crossAxisAlignment:
CrossAxisAlignment.center,
children: [
Text(
'${'Fee is'.tr} \n${controller.totalPassenger.toStringAsFixed(2)}',
style: AppStyle.subtitle,
),
),
controller.promoTaken
? const Icon(
Icons.filter_vintage_rounded,
color: AppColor.redColor,
)
: const SizedBox(
height: 0,
)
],
),
SizedBox(
width: Get.width * .55,
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
mainAxisAlignment:
MainAxisAlignment.spaceEvenly,
children: [
Text(
'${'Your Ride Duration is '.tr}${controller.duration} minutes',
style: AppStyle.subtitle,
),
Text(
'${'You will be thier in'.tr} ${DateFormat('h:mm a').format(controller.newTime)}',
style: AppStyle.subtitle,
),
Text(
'${'You trip distance is'.tr} ${controller.distance} KM',
style: AppStyle.subtitle,
)
],
),
),
SizedBox(
width: Get.width * .2,
child: Padding(
padding: const EdgeInsets.only(
right: 5, left: 5),
child: Column(
crossAxisAlignment:
CrossAxisAlignment.center,
children: [
Text(
'${'Fee is'.tr} \n${controller.totalPassenger.toStringAsFixed(2)}',
style: AppStyle.subtitle,
),
controller.promoTaken
? const Icon(
Icons
.filter_vintage_rounded,
color: AppColor.redColor,
)
: const SizedBox(
height: 0,
)
],
),
),
),
],
);
},
),
),
),
),
],
)),
const SizedBox(
height: 5,
),

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

@@ -151,7 +151,7 @@ class GoogleMapPassengerWidget extends StatelessWidget {
markerId: MarkerId('MyLocation'.tr),
position: controller.newStartPointLocation,
draggable: true,
icon: controller.markerIcon,
icon: controller.tripIcon,
infoWindow: const InfoWindow(
title: 'Time',
// snippet: controller.durationFromDriverToPassenger
@@ -166,7 +166,7 @@ class GoogleMapPassengerWidget extends StatelessWidget {
markerId: MarkerId('Destination'.tr),
position: controller.newMyLocation,
draggable: true,
icon: controller.markerIcon,
icon: controller.tripIcon,
infoWindow: const InfoWindow(
title: 'Time',
// snippet: controller.durationFromDriverToPassenger

4
lib/views/home/profile/passenger_profile_page.dart
View File

@@ -187,7 +187,7 @@ class PassengerProfilePage extends StatelessWidget {
)),
Positioned(
left: 70,
bottom: 240,
bottom: 100,
right: 70,
child: MyElevatedButton(
title: 'Sign Out'.tr,
@@ -197,7 +197,7 @@ class PassengerProfilePage extends StatelessWidget {
),
Positioned(
left: 70,
bottom: 140,
bottom: 10,
right: 70,
child: MyElevatedButton(
title: 'Delete My Account'.tr,