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

4/10/5

Browse Source
This commit is contained in:
Hamza Aleghwairyeen
2024-04-10 05:02:03 +03:00
parent 88b671c112
commit 8fcc9e22e7
13 changed files with 239 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,42 +21,46 @@ GetBuilder<MapDriverController> driverEndRideBar() {
decoration: AppStyle.boxDecoration1,
height: mapDriverController.remainingTimeTimerRideBegin < 60
? mapDriverController.driverEndPage = 190
: 170,
: mapDriverController.carType == 'Mashwari'
? 150
: 170,
// width: 240,
child: Column(
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
Column(
children: [
const Icon(Icons.social_distance),
Text(
'${mapDriverController.distance} ${'KM'.tr}',
style: AppStyle.title,
),
],
),
Column(
children: [
const Icon(Icons.timelapse),
Text(
mapDriverController.hours > 1
? '${'${'Your Ride Duration is '.tr}${mapDriverController.hours}${' H and'.tr}'} ${mapDriverController.minutes} m'
: '${'Your Ride Duration is '.tr} ${mapDriverController.minutes} ${'m'.tr}',
style: AppStyle.title),
],
),
Column(
children: [
const Icon(Icons.money_sharp),
Text(
'${mapDriverController.paymentAmount} ${'\$'.tr}',
style: AppStyle.title),
],
),
],
),
mapDriverController.carType != 'Mashwari'
? Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
Column(
children: [
const Icon(Icons.social_distance),
Text(
'${mapDriverController.distance} ${'KM'.tr}',
style: AppStyle.title,
),
],
),
Column(
children: [
const Icon(Icons.timelapse),
Text(
mapDriverController.hours > 1
? '${'${'Your Ride Duration is '.tr}${mapDriverController.hours}${' H and'.tr}'} ${mapDriverController.minutes} m'
: '${'Your Ride Duration is '.tr} ${mapDriverController.minutes} ${'m'.tr}',
style: AppStyle.title),
],
),
Column(
children: [
const Icon(Icons.money_sharp),
Text(
'${mapDriverController.paymentAmount} ${'\$'.tr}',
style: AppStyle.title),
],
),
],
)
: const SizedBox(),
Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
@@ -99,28 +103,40 @@ GetBuilder<MapDriverController> driverEndRideBar() {
],
)
: const SizedBox(),
Stack(
children: [
LinearProgressIndicator(
backgroundColor: AppColor.accentColor,
color:
mapDriverController.remainingTimeTimerRideBegin <
60
? AppColor.redColor
: AppColor.greenColor,
minHeight: 25,
borderRadius: BorderRadius.circular(15),
value: mapDriverController.progressTimerRideBegin
.toDouble(),
),
Center(
child: Text(
mapDriverController.stringRemainingTimeRideBegin,
style: AppStyle.title,
),
)
],
),
mapDriverController.carType != 'Comfort' ||
mapDriverController.carType != 'Mashwari'
? Stack(
children: [
LinearProgressIndicator(
backgroundColor: AppColor.accentColor,
color: mapDriverController
.remainingTimeTimerRideBegin <
60
? AppColor.redColor
: AppColor.greenColor,
minHeight: 25,
borderRadius: BorderRadius.circular(15),
value: mapDriverController
.progressTimerRideBegin
.toDouble(),
),
Center(
child: Text(
mapDriverController
.stringRemainingTimeRideBegin,
style: AppStyle.title,
),
)
],
)
: const SizedBox(),
Container(
decoration: AppStyle.boxDecoration1,
child: Text(
mapDriverController.carType,
style: AppStyle.title,
),
)
],
),
))

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

@@ -1,6 +1,5 @@
import 'package:SEFER/controller/home/captin/home_captain_controller.dart';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:get/get.dart';
import 'package:SEFER/constant/box_name.dart';
import 'package:SEFER/controller/firebase/firbase_messge.dart';
@@ -63,6 +62,7 @@ class OrderRequestPage extends StatelessWidget {
);
// void addCustomStartIcon() async {
// Create the marker with the resized image
orderRequestController.calculateConsumptionFuel();
ImageConfiguration config = ImageConfiguration(
size: const Size(25, 25), devicePixelRatio: Get.pixelRatio);
@@ -79,13 +79,8 @@ class OrderRequestPage extends StatelessWidget {
endIcon = value;
});
// }
double mpg = 0;
calculateConsumptionFuel() {
mpg = Get.find<HomeCaptainController>().fuelPrice /
12; //todo in register car add mpg in box
}
// orderRequestController.calculateConsumptionFuel();
calculateConsumptionFuel();
return MyScafolld(
title: 'Order Details'.tr,
body: [
@@ -284,11 +279,8 @@ class OrderRequestPage extends StatelessWidget {
style: AppStyle.title,
children: [
TextSpan(
text: ((Get.find<HomeCaptainController>()
.fuelPrice /
12) *
double.parse(myList[5]))
.toStringAsFixed(2),
text:
orderRequestController.mpg.toStringAsFixed(0),
style: AppStyle.headTitle2),
],
),

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

@@ -65,6 +65,7 @@ class OrderSpeedRequest extends StatelessWidget {
);
// void addCustomStartIcon() async {
// Create the marker with the resized image
orderRequestController.calculateConsumptionFuel();
ImageConfiguration config = ImageConfiguration(
size: const Size(25, 25), devicePixelRatio: Get.pixelRatio);
@@ -292,11 +293,7 @@ class OrderSpeedRequest extends StatelessWidget {
style: AppStyle.title,
children: [
TextSpan(
text:
((Get.find<HomeCaptainController>().fuelPrice /
12) *
double.parse(myList[5]))
.toStringAsFixed(2),
text: orderRequestController.mpg.toStringAsFixed(0),
style: AppStyle.headTitle2),
],
),

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

@@ -26,31 +26,56 @@ class ApplyOrderWidget extends StatelessWidget {
right: 0,
child: Container(
decoration: AppStyle.boxDecoration1,
height: Get.height * .2,
height: Get.height * .3,
child: ListView(
children: [
Text.rich(
TextSpan(
children: [
TextSpan(
text: '${'The driver accept your order for'.tr} ',
style: AppStyle.title,
),
TextSpan(
text: controller.totalPassenger.toStringAsFixed(2),
style: AppStyle.title.copyWith(
fontWeight: FontWeight.bold,
// fontSize: 22,
color: AppColor.redColor,
InkWell(
onTap: () {
if (box.read(BoxName.carType) == 'Speed' ||
box.read(BoxName.carType) == 'Delivery') {
Get.snackbar(
'This price is ${controller.totalPassenger.toStringAsFixed(2)}'
.tr,
'This ride type does not allow changes to the destination or additional stops'
.tr,
snackPosition: SnackPosition.BOTTOM,
duration: const Duration(seconds: 2),
backgroundColor: AppColor.yellowColor,
);
} else {
Get.snackbar(
'This price may be changed'.tr,
'This ride type allows changes, but the price may increase'
.tr,
snackPosition: SnackPosition.BOTTOM,
duration: const Duration(seconds: 2),
backgroundColor: AppColor.yellowColor,
);
}
},
child: Text.rich(
TextSpan(
children: [
TextSpan(
text: '${'The driver accept your order for'.tr} ',
style: AppStyle.title,
),
),
TextSpan(
text: ' ${'LE'.tr}',
style: AppStyle.title,
),
],
TextSpan(
text: controller.totalPassenger.toStringAsFixed(2),
style: AppStyle.title.copyWith(
fontWeight: FontWeight.bold,
// fontSize: 22,
color: AppColor.redColor,
),
),
TextSpan(
text: ' ${'LE'.tr}',
style: AppStyle.title,
),
],
),
textAlign: TextAlign.center,
),
textAlign: TextAlign.center,
),
Row(
mainAxisAlignment: MainAxisAlignment.center,
@@ -154,11 +179,15 @@ class ApplyOrderWidget extends StatelessWidget {
},
child: Padding(
padding:
const EdgeInsets.all(4),
child: Text(
'Hello, I\'m at the agreed-upon location'
.tr,
style: AppStyle.title,
const EdgeInsets.all(10),
child: Container(
decoration:
AppStyle.boxDecoration1,
child: Text(
'Hello, I\'m at the agreed-upon location'
.tr,
style: AppStyle.title,
),
),
),
),
@@ -174,11 +203,15 @@ class ApplyOrderWidget extends StatelessWidget {
},
child: Padding(
padding:
const EdgeInsets.all(4),
child: Text(
'My location is correct. You can search for me using the navigation app'
.tr,
style: AppStyle.title,
const EdgeInsets.all(10),
child: Container(
decoration:
AppStyle.boxDecoration1,
child: Text(
'My location is correct. You can search for me using the navigation app'
.tr,
style: AppStyle.title,
),
),
),
),
@@ -194,10 +227,14 @@ class ApplyOrderWidget extends StatelessWidget {
},
child: Padding(
padding:
const EdgeInsets.all(4),
child: Text(
'I\'m waiting for you'.tr,
style: AppStyle.title,
const EdgeInsets.all(10),
child: Container(
decoration:
AppStyle.boxDecoration1,
child: Text(
'I\'m waiting for you'.tr,
style: AppStyle.title,
),
),
),
),

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

@@ -176,6 +176,7 @@ class CashConfirmPageShown extends StatelessWidget {
title: 'Next'.tr,
onPressed: () {
controller.changeCashConfirmPageShown();
controller.isSearchingWindow = true;
controller.confirmRideForFirstDriver();
controller.update();
},

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

@@ -22,7 +22,7 @@ class RideBeginPassenger extends StatelessWidget {
AudioController audioController = Get.put(AudioController());
return GetBuilder<MapPassengerController>(builder: (controller) {
if ( //controller.rideTimerBegin ||
controller.statusRide == 'Begin' && !controller.statusRideFromStart) {
controller.statusRide == 'Begin' || !controller.statusRideFromStart) {
return Positioned(
left: 10,
right: 10,