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

4/11/3

Browse Source
This commit is contained in:
Hamza Aleghwairyeen
2024-04-11 16:04:19 +03:00
parent b3cf2d4fe2
commit bcb220b02f
7 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -420,12 +420,14 @@ class MapDriverController extends GetxController {
middleText: '', middleText: '',
confirm: MyElevatedButton( confirm: MyElevatedButton(
title: 'Ok'.tr, title: 'Ok'.tr,
kolor: AppColor.greenColor,
onPressed: () { onPressed: () {
Get.back(); Get.back();
finishRideFromDriver1(); finishRideFromDriver1();
}), }),
cancel: MyElevatedButton( cancel: MyElevatedButton(
title: 'Cancel'.tr, title: 'Cancel'.tr,
kolor: Colors.red,
onPressed: () { onPressed: () {
Get.back(); Get.back();
})); }));

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

@@ -658,9 +658,9 @@ class MapPassengerController extends GetxController {
update(); update();
} }
rideTimerBegin = false; // rideTimerBegin = false;
isRideFinished = true; // isRideFinished = true;
update(); // update();
} }
void tripFinishedFromDriver() async { void tripFinishedFromDriver() async {

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

@@ -22,10 +22,11 @@ GetBuilder<MapDriverController> driverEndRideBar() {
height: mapDriverController.remainingTimeTimerRideBegin < 60 height: mapDriverController.remainingTimeTimerRideBegin < 60
? mapDriverController.driverEndPage = 190 ? mapDriverController.driverEndPage = 190
: mapDriverController.carType == 'Mashwari' : mapDriverController.carType == 'Mashwari'
? 150 ? 120
: 170, : 170,
// width: 240, // width: 240,
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [ children: [
mapDriverController.carType != 'Mashwari' mapDriverController.carType != 'Mashwari'
? Row( ? Row(

61
lib/views/home/Captin/mapDriverWidgets/passenger_info_window.dart
View File

@@ -109,50 +109,25 @@ class PassengerInfoWindow extends StatelessWidget {
], ],
), ),
], ],
) )),
// AnimatedTextKit(
// animatedTexts: [
// ScaleAnimatedText(
// 'Go to passenger Location now'.tr,
// ),
// WavyAnimatedText(
// 'Go to passenger Location now'.tr),
// FlickerAnimatedText(
// 'Go to passenger Location now'.tr),
// WavyAnimatedText(
// 'Go to passenger Location now'.tr),
// ],
// isRepeatingAnimation: true,
// onTap: () {
// // print("Tap Event");
// },
// ),
),
Row( Row(
children: [ children: [
Text( Text(
controller.hours > 1 controller.hours > 1
? '${'${'Your Ride Duration is '.tr}${controller.hours}${' H and'.tr}'} ${controller.minutes} m' ? '⌚️ ${controller.hours}h ${controller.minutes}m' // Ride Duration with emoji
: '${'Your Ride Duration is '.tr} ${controller.minutes} ${'m'.tr}', : '⌚️ ${controller.minutes}m', // Short ride duration
style: AppStyle.title),
],
),
Row(
children: [
Text('Distance of the Ride is '.tr,
style: AppStyle.title),
Text(
'${controller.distance} ${'KM'.tr}',
style: AppStyle.title, style: AppStyle.title,
), ),
], const SizedBox(
), width: 16.0), // Add spacing between sections
Row(
children: [
Text('Name of the Passenger is '.tr,
style: AppStyle.title),
Text( Text(
controller.passengerName.toString(), ' ${controller.distance}km', // Distance with emoji
style: AppStyle.title,
),
const SizedBox(
width: 16.0), // Add spacing between sections
Text(
' ${controller.passengerName}', // Passenger name with emoji
style: AppStyle.title, style: AppStyle.title,
), ),
], ],
@@ -214,11 +189,17 @@ class PassengerInfoWindow extends StatelessWidget {
title: title:
'Is the Passenger in your Car ?' 'Is the Passenger in your Car ?'
.tr, .tr,
titleStyle:
AppStyle.title,
middleText: middleText:
'don\'t start trip if not ' 'don\'t start trip if not '
.tr, .tr,
middleTextStyle:
AppStyle.title,
confirm: MyElevatedButton( confirm: MyElevatedButton(
title: 'OK'.tr, title: 'OK'.tr,
kolor: AppColor
.greenColor,
onPressed: () async { onPressed: () async {
await controller await controller
.startRideFromDriver(); .startRideFromDriver();
@@ -228,6 +209,8 @@ class PassengerInfoWindow extends StatelessWidget {
title: title:
'No ,still Waiting.' 'No ,still Waiting.'
.tr, .tr,
kolor:
AppColor.redColor,
onPressed: () { onPressed: () {
Get.back(); Get.back();
})); }));
@@ -319,6 +302,8 @@ class PassengerInfoWindow extends StatelessWidget {
title: title:
'Are you sure to cancel?' 'Are you sure to cancel?'
.tr, .tr,
titleStyle:
AppStyle.title,
middleText: '', middleText: '',
confirm: confirm:
MyElevatedButton( MyElevatedButton(

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

@@ -88,6 +88,7 @@ class ApplyOrderWidget extends StatelessWidget {
width: Get.width * .9, width: Get.width * .9,
decoration: AppStyle.boxDecoration1, decoration: AppStyle.boxDecoration1,
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [ children: [
Row( Row(
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,

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

@@ -50,6 +50,16 @@ class RideBeginPassenger extends StatelessWidget {
), ),
Column( Column(
children: [ children: [
Container(
decoration: AppStyle.boxDecoration1,
child: Padding(
padding: const EdgeInsets.all(3),
child: Text(
'${box.read(BoxName.carType)}',
style: AppStyle.title,
),
),
),
Text( Text(
'${controller.driverRate} 📈', '${controller.driverRate} 📈',
style: AppStyle.title, style: AppStyle.title,

5
lib/views/home/map_widget.dart/ride_from_start_app.dart
View File

@@ -16,8 +16,9 @@ class RideFromStartApp extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProfileController profileController = Get.put(ProfileController()); ProfileController profileController = Get.put(ProfileController());
return GetBuilder<MapPassengerController>(builder: (controller) { return GetBuilder<MapPassengerController>(builder: (controller) {
return (controller.statusRideFromStart || return (controller.statusRideFromStart
controller.statusRide == 'Begin') // || controller.statusRide == 'Begin'
)
? Positioned( ? Positioned(
left: 10, left: 10,
right: 10, right: 10,