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

1/25/2

Browse Source
This commit is contained in:
Hamza-Ayed
2024-01-25 23:08:54 +03:00
parent 9a58d59f4e
commit 91985fddf6
10 changed files with 236 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,10 +76,10 @@ GetBuilder<MapPassengerController> buttomSheetMapPage() {
: '${'Your Ride Duration is '.tr} ${controller.minutes} m',
style: AppStyle.subtitle,
),
Text(
'${'You will be thier in'.tr} ${DateFormat('h:mm a').format(controller.newTime)}',
style: AppStyle.subtitle,
),
// Text(
// '${'You will be thier in'.tr} ${DateFormat('h:mm a').format(controller.newTime)}',
// style: AppStyle.subtitle,
// ),
Text(
'${'Your trip distance is'.tr} ${controller.distance.toStringAsFixed(2)} KM',
style: AppStyle.subtitle,
@@ -96,9 +96,21 @@ GetBuilder<MapPassengerController> buttomSheetMapPage() {
crossAxisAlignment:
CrossAxisAlignment.center,
children: [
Text(
'${'Fee is'.tr} \n${controller.totalPassenger.toStringAsFixed(2)}',
style: AppStyle.subtitle,
Container(
width: Get.width * .14,
height: Get.height * .06,
decoration: BoxDecoration(
color: AppColor.secondaryColor,
shape: BoxShape.rectangle,
border: Border.all(
width: 2,
color: AppColor.greenColor)),
child: Center(
child: Text(
'${'Fee is'.tr} \n${controller.totalPassenger.toStringAsFixed(2)}',
style: AppStyle.subtitle,
),
),
),
controller.promoTaken
? const Icon(
@@ -205,7 +217,8 @@ GetBuilder<MapPassengerController> buttomSheetMapPage() {
onTap: () async {
controller
.changeCashConfirmPageShown();
PaymentController()
Get.find<
PaymentController>()
.getPassengerWallet();
},
child: GetBuilder<
@@ -337,80 +350,6 @@ GetBuilder<MapPassengerController> buttomSheetMapPage() {
mainAxisAlignment:
MainAxisAlignment.center,
children: [
// TextButton(
// onPressed: () {
// Get.defaultDialog(
// barrierDismissible: false,
// title:
// 'How Many Passengers?'.tr,
// titleStyle: AppStyle.title,
// content: Column(
// children: [
// Text(
// 'Allowed up to 4 Passengers.'
// .tr,
// style: AppStyle.title,
// ),
// SizedBox(
// height:
// 200, // Set the desired height here
// child: CupertinoPicker(
// itemExtent: 32,
// onSelectedItemChanged:
// (index) {
// controller
// .onChangedPassengerCount(
// index + 1);
// },
// children: [
// Text(
// '1 Passenger'.tr),
// Text('2 Passengers'
// .tr),
// Text('3 Passengers'
// .tr),
// Text('4 Passengers'
// .tr),
// ],
// ),
// ),
// MyElevatedButton(
// title: 'Back',
// onPressed: () =>
// Get.back(),
// )
// ],
// ),
// );
// },
// child: Row(
// mainAxisAlignment:
// MainAxisAlignment
// .spaceBetween,
// children: [
// Text('How Many Passengers?'.tr,
// style: AppStyle.title),
// const SizedBox(
// width: 10,
// ),
// Container(
// decoration: BoxDecoration(
// border: Border.all()),
// child: Padding(
// padding:
// const EdgeInsets.all(
// 3.0),
// child: Text(
// controller
// .selectedPassengerCount
// .toString(),
// style: AppStyle.title),
// ),
// ),
// ],
// ),
// ),
controller.isCashSelectedBeforeConfirmRide ==
false
? MyElevatedButton(

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

@@ -9,7 +9,6 @@ import '../../../controller/home/map_passenger_controller.dart';
import '../../../controller/payment/payment_controller.dart';
import '../../../main.dart';
import '../../widgets/elevated_btn.dart';
import '../my_wallet/passenger_wallet_dialoge.dart';
class CashConfirmPageShown extends StatelessWidget {
CashConfirmPageShown({
@@ -70,7 +69,7 @@ class CashConfirmPageShown extends StatelessWidget {
),
Text(
// '${'Your Wallet balance is '.tr}JD ',
'${'Your Wallet balance is '.tr} ${box.read(BoxName.passengerWalletTotal).toString()} JD',
'${'Your Wallet balance is '.tr} ${box.read(BoxName.passengerWalletTotal).toString()} \$',
style: AppStyle.subtitle,
),
],
@@ -144,12 +143,23 @@ class CashConfirmPageShown extends StatelessWidget {
double.parse(box
.read(BoxName.passengerWalletTotal)) <
controller.totalPassenger)
? MyElevatedButton(
title: 'To use Wallet charge it'.tr,
onPressed: () {
Get.to(() => const PassengerWallet());
},
kolor: AppColor.redColor,
? Column(
children: [
MyElevatedButton(
title: 'To use Wallet charge it'.tr,
onPressed: () {
Get.to(() => const PassengerWallet());
},
kolor: AppColor.redColor,
),
MyElevatedButton(
title: 'Next'.tr,
onPressed: () {
paymentController.isCashChecked = true;
controller.changeCashConfirmPageShown();
},
),
],
)
: MyElevatedButton(
title: 'Next'.tr,