From ac84011102a15f8b05e7df11e8bf0cefb06288aa Mon Sep 17 00:00:00 2001 From: Hamza-Ayed Date: Sat, 8 Jun 2024 02:12:15 +0300 Subject: [PATCH] 6/8/1 --- lib/constant/colors.dart | 29 +- lib/constant/style.dart | 12 +- lib/controller/firebase/firbase_messge.dart | 2 + lib/controller/functions/audio_record1.dart | 2 +- .../home/map_passenger_controller.dart | 5 +- lib/controller/local/translations.dart | 4 + .../map_widget.dart/cancel_raide_page.dart | 5 +- .../home/my_wallet/passenger_wallet.dart | 47 +- .../my_wallet/passenger_wallet_dialoge.dart | 30 +- .../payment_history_passenger_page.dart | 29 +- lib/views/home/my_wallet/points_captain.dart | 115 ----- lib/views/home/my_wallet/walet_captain.dart | 463 ------------------ lib/views/home/profile/order_history.dart | 50 +- 13 files changed, 128 insertions(+), 665 deletions(-) delete mode 100644 lib/views/home/my_wallet/points_captain.dart delete mode 100644 lib/views/home/my_wallet/walet_captain.dart diff --git a/lib/constant/colors.dart b/lib/constant/colors.dart index 1fbb03f..d2592a6 100644 --- a/lib/constant/colors.dart +++ b/lib/constant/colors.dart @@ -1,31 +1,16 @@ import 'package:flutter/material.dart'; class AppColor { - static const Color primaryColor = Colors.black; // Slightly softer red - static const Color secondaryColor = Color.fromARGB(255, 255, 255, 255); - static const Color accentColor = - Color.fromARGB(255, 231, 84, 84); // Google Green - static const Color backgroundColor = - Color(0xFFF5F5F5); // Light grey background + static const Color primaryColor = Color(0xFF1DA1F2); + static const Color writeColor = Color(0xFF333333); + static const Color secondaryColor = Colors.white; + static const Color accentColor = Colors.grey; + static const Color twitterColor = Color(0xFF1DA1F2); // Twitter blue + static const Color redColor = Color(0xFFEA4335); // Google Red static const Color greenColor = Color(0xFF34A853); // Google Green - static const Color blueColor = Color(0xFF4285F4); // Google Blue + static const Color blueColor = Color(0xFF1DA1F2); // Google Blue static const Color yellowColor = Color(0xFFFBBC05); // Google Yellow static Color deepPurpleAccent = const Color.fromARGB(255, 123, 76, 254).withOpacity(0.3); - static const Color greyColor = - Color(0xFF9E9E9E); // Light grey for text and dividers - static const Color darkGreyColor = - Color(0xFF333333); // Dark grey for headings - - // For dynamic elements like gradients - static List gradientStartEnd = [ - const Color(0xFFD81F26), // Start with primary color - const Color(0xFFEF5350), // End with a slightly darker shade - ]; - - static List secondaryGradientStartEnd = [ - const Color(0xFF34A853), // Start with green - const Color(0xFF4CAF50), // End with a slightly darker shade of green - ]; } diff --git a/lib/constant/style.dart b/lib/constant/style.dart index 3477e82..63cf478 100644 --- a/lib/constant/style.dart +++ b/lib/constant/style.dart @@ -15,28 +15,28 @@ class AppStyle { static TextStyle headTitle2 = TextStyle( fontWeight: FontWeight.bold, fontSize: 26, - color: AppColor.primaryColor, + color: AppColor.writeColor, fontFamily: box.read(BoxName.lang) == 'ar' ? 'mohanad' : GoogleFonts.josefinSans().fontFamily); static TextStyle title = TextStyle( fontWeight: FontWeight.normal, fontSize: box.read(BoxName.lang) == 'ar' ? 14 : 16, - color: AppColor.primaryColor, + color: AppColor.writeColor, fontFamily: box.read(BoxName.lang) == 'ar' ? 'mohanad' : GoogleFonts.josefinSans().fontFamily); static TextStyle subtitle = TextStyle( fontWeight: FontWeight.bold, fontSize: 13, - color: AppColor.primaryColor, + color: AppColor.writeColor, fontFamily: box.read(BoxName.lang) == 'ar' ? 'mohanad' : GoogleFonts.josefinSans().fontFamily); static TextStyle number = const TextStyle( fontWeight: FontWeight.bold, fontSize: 14, - color: AppColor.primaryColor, + color: AppColor.writeColor, fontFamily: 'digit'); static BoxDecoration boxDecoration = const BoxDecoration( @@ -44,7 +44,7 @@ class AppStyle { BoxShadow( color: AppColor.accentColor, blurRadius: 5, offset: Offset(2, 4)), BoxShadow( - color: AppColor.accentColor, blurRadius: 5, offset: Offset(-2, -2)) + color: AppColor.twitterColor, blurRadius: 5, offset: Offset(-2, -2)) ], color: AppColor.secondaryColor, borderRadius: BorderRadius.all( @@ -55,7 +55,7 @@ class AppStyle { BoxShadow( color: AppColor.accentColor, blurRadius: 5, offset: Offset(2, 4)), BoxShadow( - color: AppColor.accentColor, blurRadius: 5, offset: Offset(-2, -2)) + color: AppColor.twitterColor, blurRadius: 5, offset: Offset(-2, -2)) ], color: AppColor.secondaryColor, borderRadius: BorderRadius.all( diff --git a/lib/controller/firebase/firbase_messge.dart b/lib/controller/firebase/firbase_messge.dart index c2b1238..39de1f1 100644 --- a/lib/controller/firebase/firbase_messge.dart +++ b/lib/controller/firebase/firbase_messge.dart @@ -307,7 +307,9 @@ class FirebaseMessagesController extends GetxController { return Get.defaultDialog( barrierDismissible: false, title: 'Hi ,I Arrive your site'.tr, + titleStyle: AppStyle.title, middleText: 'Please go to Car Driver'.tr, + middleTextStyle: AppStyle.title, confirm: MyElevatedButton( title: 'Ok I will go now.'.tr, onPressed: () { diff --git a/lib/controller/functions/audio_record1.dart b/lib/controller/functions/audio_record1.dart index d955078..13a47d7 100644 --- a/lib/controller/functions/audio_record1.dart +++ b/lib/controller/functions/audio_record1.dart @@ -30,7 +30,7 @@ class AudioRecorderController extends GetxController { final directory = await getApplicationDocumentsDirectory(); // Generate a unique file name using the current timestamp String fileName = - '${DateTime.now().year}-${DateTime.now().month}-${DateTime.now().day}_${Get.find().rideId}.m4a'; + '${DateTime.now().year}-${DateTime.now().month}-${DateTime.now().day}_${Get.find().rideId}.aac'; filePath = '${directory.path}/$fileName'; // Define the configuration for the recording diff --git a/lib/controller/home/map_passenger_controller.dart b/lib/controller/home/map_passenger_controller.dart index 9576cb7..7b92889 100644 --- a/lib/controller/home/map_passenger_controller.dart +++ b/lib/controller/home/map_passenger_controller.dart @@ -2623,9 +2623,10 @@ class MapPassengerController extends GetxController { if (jsonDecode(res)['message']['rating'] == null) { passengerRate = 5; } else { - passengerRate = - double.parse(jsonDecode(res)['message']['rating'].toString()); + passengerRate = jsonDecode(res)['message']['rating']; } + } else { + passengerRate = 5; } } diff --git a/lib/controller/local/translations.dart b/lib/controller/local/translations.dart index 659bfe8..35abd55 100644 --- a/lib/controller/local/translations.dart +++ b/lib/controller/local/translations.dart @@ -4,6 +4,10 @@ class MyTranslation extends Translations { @override Map> get keys => { "ar": { + "Notifications": "إشعارات", + '💳 Pay with Credit Card': "ادفع باستخدام بطاقة الائتمان💳", + "⚠️ You need to choose an amount!": "⚠️ يجب عليك اختيار مبلغ!", + '💰 Pay with Wallet': "ادفع باستخدام المحفظة", "You must restart the app to change the language.": "يجب إعادة تشغيل التطبيق لتغيير اللغة", "joined": "انضم", diff --git a/lib/views/home/map_widget.dart/cancel_raide_page.dart b/lib/views/home/map_widget.dart/cancel_raide_page.dart index a0c90e1..16d7830 100644 --- a/lib/views/home/map_widget.dart/cancel_raide_page.dart +++ b/lib/views/home/map_widget.dart/cancel_raide_page.dart @@ -65,7 +65,10 @@ GetBuilder cancelRidePage() { reasons[index].toString(), ); }, - child: Text(reasons[index])), + child: Text( + reasons[index], + style: AppStyle.title, + )), leading: Radio( value: index, groupValue: controller.selectedReason, diff --git a/lib/views/home/my_wallet/passenger_wallet.dart b/lib/views/home/my_wallet/passenger_wallet.dart index 4c685f3..5815cfd 100644 --- a/lib/views/home/my_wallet/passenger_wallet.dart +++ b/lib/views/home/my_wallet/passenger_wallet.dart @@ -90,22 +90,28 @@ class CardSeferWallet extends StatelessWidget { width: Get.width * .85, height: Get.height * .3, decoration: BoxDecoration( - color: AppColor.deepPurpleAccent, + color: AppColor.twitterColor.withOpacity(.8), borderRadius: const BorderRadius.all(Radius.circular(12)), - gradient: const LinearGradient( - colors: [AppColor.blueColor, AppColor.primaryColor]), + gradient: const LinearGradient(colors: [ + AppColor.redColor, + AppColor.yellowColor, + AppColor.yellowColor, + ]), ), child: Column( mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [ - Row( - children: [ - Text( - '${AppInformation.appName} Wallet', - style: AppStyle.headTitle - .copyWith(color: AppColor.primaryColor), - ) - ], + Padding( + padding: const EdgeInsets.all(8.0), + child: Row( + children: [ + Text( + '${AppInformation.appName} Wallet', + style: AppStyle.headTitle + .copyWith(color: AppColor.writeColor), + ) + ], + ), ), Row( mainAxisAlignment: MainAxisAlignment.center, @@ -117,14 +123,17 @@ class CardSeferWallet extends StatelessWidget { ) ], ), - Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - Text( - box.read(BoxName.name), - style: AppStyle.title, - ) - ], + Padding( + padding: const EdgeInsets.all(8.0), + child: Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + Text( + box.read(BoxName.name), + style: AppStyle.title, + ) + ], + ), ) ], ), diff --git a/lib/views/home/my_wallet/passenger_wallet_dialoge.dart b/lib/views/home/my_wallet/passenger_wallet_dialoge.dart index 38be839..fa8cf9e 100644 --- a/lib/views/home/my_wallet/passenger_wallet_dialoge.dart +++ b/lib/views/home/my_wallet/passenger_wallet_dialoge.dart @@ -146,20 +146,22 @@ class PassengerWalletDialoge extends StatelessWidget { ], )), const Spacer(), - MyElevatedButton( - kolor: AppColor.blueColor, - title: '${'Pay with Your'.tr} PayPal', - onPressed: () { - if (controller.selectedAmount != 0) { - controller.makePaymentPayPal(context); - } else { - Toast.show( - context, - 'You will choose one of above !'.tr, - AppColor.redColor); - } - }, - ), + box.read(BoxName.countryCode) == 'Egypt' + ? const SizedBox() + : MyElevatedButton( + kolor: AppColor.blueColor, + title: '${'Pay with Your'.tr} PayPal', + onPressed: () { + if (controller.selectedAmount != 0) { + controller.makePaymentPayPal(context); + } else { + Toast.show( + context, + 'You will choose one of above !'.tr, + AppColor.redColor); + } + }, + ), box.read(BoxName.countryCode) == 'Egypt' ? Column( children: [ diff --git a/lib/views/home/my_wallet/payment_history_passenger_page.dart b/lib/views/home/my_wallet/payment_history_passenger_page.dart index 2ecc4a0..5a33d50 100644 --- a/lib/views/home/my_wallet/payment_history_passenger_page.dart +++ b/lib/views/home/my_wallet/payment_history_passenger_page.dart @@ -36,19 +36,22 @@ class PaymentHistoryPassengerPage extends StatelessWidget { color: double.parse(list['balance']) < 0 ? AppColor.redColor.withOpacity(.4) : AppColor.greenColor.withOpacity(.4)), - child: Row( - mainAxisAlignment: - MainAxisAlignment.spaceBetween, - children: [ - Text( - list['balance'], - style: AppStyle.title, - ), - Text( - list['created_at'], - style: AppStyle.title, - ), - ], + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Row( + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + children: [ + Text( + list['balance'], + style: AppStyle.title, + ), + Text( + list['created_at'], + style: AppStyle.title, + ), + ], + ), ), ), ); diff --git a/lib/views/home/my_wallet/points_captain.dart b/lib/views/home/my_wallet/points_captain.dart deleted file mode 100644 index 9e8b0f3..0000000 --- a/lib/views/home/my_wallet/points_captain.dart +++ /dev/null @@ -1,115 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; -import 'package:SEFER/constant/colors.dart'; -import 'package:SEFER/constant/style.dart'; -import 'package:SEFER/controller/home/payment/captain_wallet_controller.dart'; -import 'package:SEFER/controller/payment/payment_controller.dart'; - -import '../../../constant/box_name.dart'; -import '../../../main.dart'; -import '../../widgets/elevated_btn.dart'; - -class PointsCaptain extends StatelessWidget { - PaymentController paymentController = Get.put(PaymentController()); - CaptainWalletController captainWalletController = - Get.put(CaptainWalletController()); - - PointsCaptain({ - super.key, - required this.kolor, - required this.countPoint, - required this.pricePoint, - }); - final Color kolor; - final String countPoint; - double pricePoint; - - @override - Widget build(BuildContext context) { - return InkWell( - onTap: () async { - box.read(BoxName.countryCode) == 'Egypt' - ? Get.defaultDialog( - title: 'Which method you will pay'.tr, - titleStyle: AppStyle.title, - content: Column( - children: [ - MyElevatedButton( - title: '💳 Pay with Credit Card'.tr, - onPressed: () async { - Get.back(); - await paymentController.payWithPayMob( - context, - pricePoint.toStringAsFixed(2), - box.read(BoxName.countryCode) == 'Egypt' - ? 'EGP' - : 'JOD', () async { - await captainWalletController.addDriverPayment( - 'visa', pricePoint); - await captainWalletController.addDriverWallet( - 'visa', countPoint); - // await captainWalletController - // .getCaptainWalletFromBuyPoints(); - }); - }, //51524 - ), - // Add some spacing between buttons - MyElevatedButton( - kolor: AppColor.yellowColor, - title: '💰 Pay with Wallet'.tr, - onPressed: () async { - Get.back(); - await paymentController.payWithPayMobWallet( - context, - pricePoint.toStringAsFixed(2), - box.read(BoxName.countryCode) == 'Egypt' - ? 'EGP' - : 'JOD', () async { - await captainWalletController.addDriverPayment( - 'visa', pricePoint); - await captainWalletController.addDriverWallet( - 'visa', countPoint); - // await captainWalletController - // .getCaptainWalletFromBuyPoints(); - }); - }, - ), - ], - )) - : await paymentController.makePaymentStripe(pricePoint, - box.read(BoxName.countryCode) == 'Jordan' ? 'jod' : 'egp', - () async { - await captainWalletController.addDriverPayment( - 'visa', pricePoint); - await captainWalletController.addDriverWallet( - 'visa', countPoint); - // await captainWalletController.getCaptainWalletFromBuyPoints(); - }); - }, - child: Container( - width: Get.width * .22, - height: Get.width * .15, - margin: const EdgeInsets.all(4), - decoration: BoxDecoration( - color: kolor, - border: Border.all(color: AppColor.accentColor), - borderRadius: BorderRadius.circular(12), - shape: BoxShape.rectangle, - ), - child: Center( - child: Column( - children: [ - Text( - '$countPoint ${'Point'.tr}', - style: AppStyle.subtitle, - ), - Text( - '$pricePoint ${box.read(BoxName.countryCode) == 'Jordan' ? 'JOD'.tr : 'LE'.tr}', - style: AppStyle.title, - ), - ], - ), - )), - ); - } -} diff --git a/lib/views/home/my_wallet/walet_captain.dart b/lib/views/home/my_wallet/walet_captain.dart deleted file mode 100644 index 741971d..0000000 --- a/lib/views/home/my_wallet/walet_captain.dart +++ /dev/null @@ -1,463 +0,0 @@ -import 'package:SEFER/controller/functions/tts.dart'; -import 'package:SEFER/views/home/my_wallet/payment_history_driver_page.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; -import 'package:SEFER/constant/box_name.dart'; -import 'package:SEFER/constant/colors.dart'; -import 'package:SEFER/constant/info.dart'; -import 'package:SEFER/constant/style.dart'; -import 'package:SEFER/controller/home/map_passenger_controller.dart'; -import 'package:SEFER/controller/home/payment/captain_wallet_controller.dart'; -import 'package:SEFER/controller/payment/payment_controller.dart'; -import 'package:SEFER/main.dart'; -import 'package:SEFER/views/widgets/elevated_btn.dart'; -import 'package:SEFER/views/widgets/my_textField.dart'; -import 'package:SEFER/views/widgets/mycircular.dart'; -import 'package:path/path.dart'; - -import '../../widgets/my_scafold.dart'; -import 'points_captain.dart'; - -class WalletCaptain extends StatelessWidget { - WalletCaptain({super.key}); - CaptainWalletController captainWalletController = - Get.put(CaptainWalletController()); - @override - Widget build(BuildContext context) { - Get.put(MapPassengerController()); - return MyScafolld( - title: 'Driver Wallet'.tr, - body: [ - GetBuilder( - builder: (captainWalletController) => captainWalletController - .isLoading - ? const MyCircularProgressIndicator() - : Padding( - padding: const EdgeInsets.all(10), - child: ListView( - // crossAxisAlignment: CrossAxisAlignment.center, - children: [ - const SizedBox(), - Container( - decoration: AppStyle.boxDecoration.copyWith( - color: double.parse(captainWalletController - .totalPoints) < - 0 && - double.parse(captainWalletController - .totalPoints) > - -300 - ? AppColor.yellowColor - : double.parse(captainWalletController - .totalPoints) < - -300 - ? AppColor.redColor - : AppColor.greenColor, - ), - child: InkWell( - onTap: () { - Get.snackbar( - 'the 300 points equal 300 L.E'.tr, - 'the 300 points equal 300 L.E for you \nSo go and gain your money' - .tr, - backgroundColor: AppColor.greenColor, - snackPosition: SnackPosition.BOTTOM, - duration: const Duration(seconds: 4), - ); - }, - child: Padding( - padding: - const EdgeInsets.symmetric(horizontal: 4), - child: Text( - '${'Total Points is'.tr} ${captainWalletController.totalPoints.toString()} 💎', - style: AppStyle.headTitle2, - ), - ), - ), - ), - const SizedBox( - height: 10, - ), - double.parse(captainWalletController.totalPoints - .toString()) < - -300 - ? MyElevatedButton( - title: 'Charge your Account'.tr, - onPressed: () {}) - : const SizedBox(), - const SizedBox( - height: 10, - ), - const CardSeferWalletDriver(), - Card( - elevation: 4, - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 4), - child: Column( - children: [ - Row( - mainAxisAlignment: - MainAxisAlignment.spaceBetween, - children: [ - Text( - 'Total Budget from trips is '.tr, - style: AppStyle.title, - ), - Container( - decoration: BoxDecoration( - border: Border.all( - width: 2, - color: AppColor.redColor)), - child: GestureDetector( - onTap: () { - Get.snackbar( - icon: InkWell( - onTap: () async { - await Get.find< - TextToSpeechController>() - .speakText( - 'This amount for all trip I get from Passengers' - .tr); - }, - child: const Icon( - Icons.headphones)), - '${'Total Amount:'.tr} ${captainWalletController.totalAmount}\$', - 'This amount for all trip I get from Passengers' - .tr, - duration: - const Duration(seconds: 6), - backgroundColor: - AppColor.yellowColor, - snackPosition: SnackPosition.BOTTOM, - ); - }, - child: Padding( - padding: const EdgeInsets.all(2), - child: Text( - '${captainWalletController.totalAmount}\$'), - ), - ), - ) - ], - ), - const SizedBox( - height: 10, - ), - Row( - mainAxisAlignment: - MainAxisAlignment.spaceBetween, - children: [ - Text( - 'Total Budget from trips by\nCredit card is ' - .tr, - style: AppStyle.title, - ), - Container( - decoration: BoxDecoration( - border: Border.all( - width: 2, - color: AppColor.greenColor)), - child: Padding( - padding: const EdgeInsets.all(2), - child: InkWell( - onTap: () { - Get.snackbar( - icon: InkWell( - onTap: () async { - await Get.find< - TextToSpeechController>() - .speakText( - 'This amount for all trip I get from Passengers and Collected For me in' - .tr + - ' SAFAR Wallet'.tr, - ); - }, - child: const Icon( - Icons.headphones), - ), - '${'Total Amount:'.tr} ${captainWalletController.totalAmountVisa}\$', - 'This amount for all trip I get from Passengers and Collected For me in' - .tr + - ' ${AppInformation.appName} Wallet' - .tr, - duration: - const Duration(seconds: 6), - backgroundColor: - AppColor.redColor, - snackPosition: - SnackPosition.BOTTOM, - ); - }, - child: Text( - '${captainWalletController.totalAmountVisa}\$'), - ), - )) - ], - ), - const SizedBox( - height: 10, - ), - MyElevatedButton( - title: - 'You can buy points from your budget'.tr, - onPressed: () { - Get.defaultDialog( - title: 'Pay from my budget'.tr, - titleStyle: AppStyle.title, - content: Form( - key: captainWalletController.formKey, - child: MyTextForm( - controller: captainWalletController - .amountFromBudgetController, - label: - '${'You have in account'.tr} ${captainWalletController.totalAmountVisa}', - hint: - '${'You have in account'.tr} ${captainWalletController.totalAmountVisa}', - type: TextInputType.number, - ), - ), - confirm: MyElevatedButton( - title: 'Pay', - onPressed: () async { - if (double.parse( - captainWalletController - .amountFromBudgetController - .text) < - double.parse( - captainWalletController - .totalAmountVisa)) { - await captainWalletController - .payFromBudget(); - } else { - Get.back(); - Get.snackbar( - 'Your Budget less than needed' - .tr, - '', - duration: const Duration( - seconds: 3), - backgroundColor: - AppColor.redColor, - snackPosition: - SnackPosition.BOTTOM, - ); - } - }), - cancel: MyElevatedButton( - title: 'Cancel'.tr, - onPressed: () { - Get.back(); - })); - }, - ), - ], - ), - ), - ), - const SizedBox( - height: 10, - ), - Container( - decoration: AppStyle.boxDecoration, - child: Column( - children: [ - Text( - 'You can buy Points to let you online\nby this list below' - .tr, - textAlign: TextAlign.center, - style: AppStyle.title, - ), - const Divider( - indent: 30, - endIndent: 30, - color: AppColor.accentColor, - thickness: 3, - ), - const SizedBox( - height: 10, - ), - Container( - decoration: AppStyle.boxDecoration, - height: Get.height * .1, - child: ListView( - scrollDirection: Axis.horizontal, - children: [ - PointsCaptain( - kolor: AppColor.blueColor, - pricePoint: - box.read(BoxName.countryCode) == - 'Jordan' - ? 5 - : 100, - countPoint: - box.read(BoxName.countryCode) == - 'Jordan' - ? '300' - : '100', - ), - PointsCaptain( - kolor: Colors.green, - pricePoint: - box.read(BoxName.countryCode) == - 'Jordan' - ? 10 - : 200, - countPoint: - box.read(BoxName.countryCode) == - 'Jordan' - ? '1040' - : '210', - ), - PointsCaptain( - kolor: Colors.amberAccent, - pricePoint: - box.read(BoxName.countryCode) == - 'Jordan' - ? 22 - : 400, - countPoint: - box.read(BoxName.countryCode) == - 'Jordan' - ? '2300' - : '450', - ), - PointsCaptain( - kolor: AppColor.yellowColor, - pricePoint: - box.read(BoxName.countryCode) == - 'Jordan' - ? 50 - : 1000, - countPoint: - box.read(BoxName.countryCode) == - 'Jordan' - ? '55000' - : '1200', - ), - ], - )), - ], - ), - ), - const SizedBox( - height: 30, - ), - box - .read(BoxName.accountIdStripeConnect) - .toString() - .isEmpty - ? Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - MyElevatedButton( - title: - 'Create Wallet to receive your money', - onPressed: () async { - PaymentController paymentController = - Get.find(); - paymentController - .createConnectAccount(); - }), - ], - ) - : const SizedBox( - height: 30, - ), - Padding( - padding: const EdgeInsets.symmetric(horizontal: 30), - child: Row( - children: [ - MyElevatedButton( - kolor: AppColor.blueColor, - title: 'Payment History'.tr, - onPressed: () { - Get.to(() => const PaymentHistoryDriverPage(), - transition: Transition.size); - }, - ), - ], - ), - ), - - // TextButton( - // onPressed: () async { - // PaymentController paymentController = - // Get.put(PaymentController()); - // await paymentController.createTransactionToCaptain( - // '1000', - // box.read(BoxName.accountIdStripeConnect)); - // }, - // child: const Text( - // "Pay to Captain", - // ), - // ) - ], - ), - )) - ], - isleading: true, - action: InkWell( - onTap: () { - // captainWalletController.getCaptainWalletFromBuyPoints(); - }, - child: const Icon(Icons.refresh)), - ); - } -} - -class CardSeferWalletDriver extends StatelessWidget { - const CardSeferWalletDriver({ - super.key, - }); - - @override - Widget build(BuildContext context) { - return Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Container( - width: Get.width * .85, - height: Get.height * .25, - decoration: BoxDecoration( - color: AppColor.deepPurpleAccent, - borderRadius: const BorderRadius.all(Radius.circular(12)), - gradient: const LinearGradient( - colors: [AppColor.blueColor, AppColor.primaryColor]), - ), - child: Column( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - Row( - children: [ - Text( - '${AppInformation.appName} Wallet', - style: AppStyle.headTitle - .copyWith(color: AppColor.primaryColor), - ) - ], - ), - Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Text( - '${Get.find().totalAmountVisa}\$' ?? - '0.0 \$', - style: AppStyle.headTitle2, - ) - ], - ), - Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - Text( - box.read(BoxName.nameDriver), - style: AppStyle.title, - ) - ], - ) - ], - ), - ), - ], - ); - } -} diff --git a/lib/views/home/profile/order_history.dart b/lib/views/home/profile/order_history.dart index 932d9d5..fe8cba4 100644 --- a/lib/views/home/profile/order_history.dart +++ b/lib/views/home/profile/order_history.dart @@ -63,13 +63,39 @@ class OrderHistory extends StatelessWidget { width: Get.width * .75, child: GoogleMap( initialCameraPosition: CameraPosition( - target: Get.find< - MapPassengerController>() - .passengerLocation, // Assuming passenger location is available - zoom: 15, + target: LatLng( + (double.parse( + rides['start_location'] + .toString() + .split(',')[0]) + + double.parse( + rides['end_location'] + .toString() + .split(',')[0])) / + 2, + (double.parse( + rides['start_location'] + .toString() + .split(',')[1]) + + double.parse( + rides['end_location'] + .toString() + .split(',')[1])) / + 2, + ), + zoom: 12, ), + // bounds: LatLngBounds( + // northeast: LatLng( + // double.parse(rides['end_location'].toString().split(',')[0]), + // double.parse(rides['end_location'].toString().split(',')[1]), + // ), + // southwest: LatLng( + // double.parse(rides['start_location'].toString().split(',')[0]), + // double.parse(rides['start_location'].toString().split(',')[1]), + // ), + // ), zoomControlsEnabled: true, - // liteModeEnabled: false, polylines: { Polyline( zIndex: 2, @@ -106,6 +132,7 @@ class OrderHistory extends StatelessWidget { width: 5, ), }, + mapType: MapType.normal, ), ), Row( @@ -122,12 +149,17 @@ class OrderHistory extends StatelessWidget { ), Text( rides['status'], - style: rides['status'] != + style: rides['status'] == 'Canceled'.tr ? AppStyle.subtitle.copyWith( - color: AppColor.greenColor) - : AppStyle.subtitle.copyWith( - color: AppColor.redColor), + color: AppColor.redColor) + : rides['status'] == 'Finished'.tr + ? AppStyle.subtitle.copyWith( + color: + AppColor.greenColor) + : AppStyle.subtitle.copyWith( + color: + AppColor.yellowColor), ), Text( '${'Price is'.tr} ${rides['price']}',