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

4/2/1

Browse Source
This commit is contained in:
Hamza Aleghwairyeen
2024-04-02 13:51:34 +03:00
parent aa20cd4455
commit 44fe1f494d
8 changed files with 74 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/views/Rate/rate_passenger.dart
View File

@@ -48,10 +48,10 @@ class RatePassenger extends StatelessWidget {
child: Padding(
padding: const EdgeInsets.all(4),
child: Text(
Get.find<MapDriverController>().cartype ==
Get.find<MapDriverController>().carType ==
'Comfort' ||
Get.find<MapDriverController>()
.cartype ==
.carType ==
'Free Ride'
? Get.find<MapDriverController>()
.price

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

@@ -65,7 +65,7 @@ GetBuilder<MapDriverController> driverEndRideBar() {
'Price is ${mapDriverController.price.toStringAsFixed(0)}')
],
),
mapDriverController.cartype == 'Free Ride'
mapDriverController.carType == 'Free Ride'
? Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
@@ -80,7 +80,7 @@ GetBuilder<MapDriverController> driverEndRideBar() {
)
: const SizedBox(),
mapDriverController.remainingTimeTimerRideBegin < 60 &&
mapDriverController.cartype != 'Free Ride'
mapDriverController.carType != 'Free Ride'
? Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [

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

@@ -219,8 +219,8 @@ class PassengerInfoWindow extends StatelessWidget {
.tr,
confirm: MyElevatedButton(
title: 'OK'.tr,
onPressed: () {
controller
onPressed: () async {
await controller
.startRideFromDriver();
Get.back();
}),
@@ -238,7 +238,7 @@ class PassengerInfoWindow extends StatelessWidget {
kolor: AppColor.yellowColor,
onPressed: () async {
if (controller
.calculateDistanseBetweenDriverAndPassengerLocation() <
.calculateDistanceBetweenDriverAndPassengerLocation() <
40) {
FirebaseMessagesController()
.sendNotificationToPassengerToken(
@@ -334,7 +334,7 @@ class PassengerInfoWindow extends StatelessWidget {
.tokenPassenger,
[]);
await controller
.addWaittingTimeCostFromPassengerToDriverWallet();
.addWaitingTimeCostFromPassengerToDriverWallet();
controller
.isdriverWaitTimeEnd =
false;

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

@@ -351,7 +351,8 @@ class OrderRequestPage extends StatelessWidget {
'passengerWalletBurc': myList[26].toString(),
'timeOfOrder': DateTime.now().toString(),
'totalPassenger': myList[2].toString(),
'carType':myList[31].toString(),
'carType': myList[31].toString(),
'kazan': myList[32].toString(),
});
},
),

9
lib/views/home/Captin/orderCaptin/order_speed_request.dart
View File

@@ -306,9 +306,9 @@ class OrderSpeedRequest extends StatelessWidget {
'driver_id': box.read(BoxName.driverID),
});
// .then((value) {
var json = jsonDecode(res);
print('res $json');
if (json['status'] == "failure") {
// var json = jsonDecode(res);
print('res $res');
if (res == "failure") {
Get.defaultDialog(
title:
"This ride is already taken by another driver."
@@ -318,7 +318,7 @@ class OrderSpeedRequest extends StatelessWidget {
middleTextStyle: AppStyle.title,
confirm: MyElevatedButton(
title: 'Ok'.tr, onPressed: () => Get.back()));
} else if (json['status'] == "success") {
} else if (jsonDecode(res)['status'] == "success") {
List<String> bodyToPassenger = [
box.read(BoxName.driverID).toString(),
box.read(BoxName.nameDriver).toString(),
@@ -374,6 +374,7 @@ class OrderSpeedRequest extends StatelessWidget {
'timeOfOrder': DateTime.now().toString(),
'totalPassenger': myList[2].toString(),
'carType': myList[31].toString(),
'kazan': myList[32].toString(),
});
}
// });

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

@@ -199,7 +199,7 @@ class DriverArrivePassengerAndWaitMinute extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
'The driver waitting you in picked location .'.tr,
'The driver waiting you in picked location .'.tr,
style: AppStyle.title,
textAlign: TextAlign.center,
),
@@ -251,9 +251,19 @@ class TimeDriverToPassenger extends StatelessWidget {
: AppColor.greenColor,
minHeight: 25,
borderRadius: BorderRadius.circular(15),
value: controller
.progressTimerToPassengerFromDriverAfterApplied
.toDouble(),
value: () {
// Ensure valid value between 0.0 and 1.0
double progress = controller
.progressTimerToPassengerFromDriverAfterApplied
.toDouble();
if (progress.isNaN || progress.isInfinite) {
// Handle invalid progress (e.g., set to 0.0)
return 0.0;
} else {
return progress.clamp(
0.0, 1.0); // Clamp to valid range
}
}(),
),
Center(
child: Row(