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

1/18/1

Browse Source
This commit is contained in:
Hamza-Ayed
2024-01-18 00:49:00 +03:00
parent 358bb904ab
commit 7af7e71b30
17 changed files with 1028 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/views/home/Captin/home_captain/home_captin.dart
View File

@@ -13,6 +13,7 @@ import '../../../../controller/home/captin/home_captain_controller.dart';
import '../../../../controller/home/captin/order_request_controller.dart';
import '../../../../controller/home/captin/widget/connect.dart';
import '../../../../controller/home/captin/widget/left_menu_map_captain.dart';
import '../../../../controller/local/local_controller.dart';
import '../../../../main.dart';
import '../../../widgets/circle_container.dart';
@@ -26,6 +27,7 @@ class HomeCaptain extends StatelessWidget {
Get.put(OrderRequestController());
Get.put(HomeCaptainController());
// Get.put(HomeCaptainController());
print('local is ${Get.find<LocaleController>().language!.countryCode}');
return Scaffold(
appBar: AppBar(
backgroundColor: AppColor.greenColor,

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

@@ -45,7 +45,12 @@ class OrderRequestPage extends StatelessWidget {
launchUrl1(mapUrl);
},
icon: const Icon(Icons.map),
label: Text('Rouats of Trip'.tr)),
label: myList[20].toString() == 'haveSteps'
? Text(
'Trip has Steps'.tr,
style: AppStyle.title,
)
: Text('Rouats of Trip'.tr, style: AppStyle.title)),
myList[13].toString() ==
'true' //Visa or Cash Method from notify to driver
? Text(
@@ -206,7 +211,13 @@ class OrderRequestPage extends StatelessWidget {
'durationOfRideValue': myList[19].toString(),
'paymentAmount': myList[3].toString(),
'paymentMethod':
myList[13].toString() == 'true' ? 'visa' : 'cash'
myList[13].toString() == 'true' ? 'visa' : 'cash',
'isHaveSteps': myList[20].toString(),
'step0': myList[21].toString(),
'step1': myList[22].toString(),
'step2': myList[23].toString(),
'step3': myList[24].toString(),
'step4': myList[25].toString(),
});
},
),

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

@@ -71,7 +71,9 @@ GetBuilder<MapPassengerController> buttomSheetMapPage() {
MainAxisAlignment.spaceEvenly,
children: [
Text(
'${'Your Ride Duration is '.tr}${controller.duration} minutes',
controller.hours > 1
? '${'Your Ride Duration is '.tr}${controller.hours} H and ${controller.minutes} m'
: '${'Your Ride Duration is '.tr} ${controller.minutes} m',
style: AppStyle.subtitle,
),
Text(

26
lib/views/home/map_widget.dart/points_page_for_rider.dart
View File

@@ -57,18 +57,28 @@ class PointsPageForRider extends StatelessWidget {
controller.clearPolyline();
controller.isWayPointStopsSheetUtilGetMap =
false;
mapPassengerController.durationToRide = 0;
for (var i = 0;
i < wayPointController.wayPoints.length;
i++) {
mapPassengerController.getMapPoints(
mapPassengerController.placesCoordinate[i]
.toString(),
mapPassengerController
.placesCoordinate[i + 1]
.toString(),
i,
);
if (mapPassengerController
.placesCoordinate[i + 1]
.toString() !=
'') {
mapPassengerController.getMapPoints(
mapPassengerController
.placesCoordinate[i]
.toString(),
mapPassengerController
.placesCoordinate[i + 1]
.toString(),
i,
);
}
}
controller.bottomSheet();
controller.showBottomSheet1();
},
child: const Text('Get Map'),
)

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

@@ -74,8 +74,9 @@ class RideBeginPassenger extends StatelessWidget {
.phone, // Set the keyboard type to phone
validator: (value) {
if (value!.isEmpty ||
value.length < 10) {
return 'Please enter a phone number';
value.length != 10) {
return 'Please enter a valid phone number'
.tr;
}
// Add additional validation if needed
return null;