From 8fcc9e22e72731d80f9ca6c4c3c01a9c05fb7074 Mon Sep 17 00:00:00 2001 From: Hamza Aleghwairyeen Date: Wed, 10 Apr 2024 05:02:03 +0300 Subject: [PATCH] 4/10/5 --- .env | 4 +- lib/controller/firebase/firbase_messge.dart | 2 + .../home/captin/home_captain_controller.dart | 5 + .../home/captin/map_driver_controller.dart | 11 +- .../home/captin/order_request_controller.dart | 9 +- lib/controller/local/translations.dart | 10 +- lib/views/auth/captin/login_captin.dart | 114 ++++++++-------- .../mapDriverWidgets/driver_end_ride_bar.dart | 126 ++++++++++-------- .../orderCaptin/order_request_page.dart | 16 +-- .../orderCaptin/order_speed_request.dart | 7 +- .../map_widget.dart/apply_order_widget.dart | 107 ++++++++++----- .../cash_confirm_bottom_page.dart | 1 + .../map_widget.dart/ride_begin_passenger.dart | 2 +- 13 files changed, 239 insertions(+), 175 deletions(-) diff --git a/.env b/.env index a4e5216..4b007bf 100644 --- a/.env +++ b/.env @@ -9,7 +9,7 @@ transactionCloude=Qhcwilomqcoib:QVO_JNYED2XWA26YXKC2TP:YK1DVH6SJB31N3PE1UXrXlBl visionApi=3pALsqSSYTvzp69Q5FMIgbzjG6Z1zktJXrXlBl chatGPTkeySefer=zg-IiR34ooza3Yvhvb9rZk1C9XrxgUE0l8jRRZrHj3Qe5QXPlqVXrXlBl chatGPTkeySeferNew=zg-Z4AJcAROgNXjgrEIU8fKC9XrxgUE4Qtrrlq1yiux0jL3dITSXrXlBl -secretKey=mk_femf_56O3CFOSBEVrOUA5MDgaoMM14xXHRzhNy7Fl5OSmcZzjqLpu9RyDTC8ttuP80Fp20FN6PQoNo2eTHllRiQs8rBTPX99Lr4CS8x7DlDrXrXrXlBl +secretKey=zg_ropj_57Iiv6MFCBFq3C2n6IXlmjykpxDmW93SW3vvXh68UA9T5FORTWgWsT37StKsOPdwDdsy8qR9srMUluahs3nPHvgBa33tGk90vV5XrXlBl stripe_publishableKe=vg_ropj_57Iiv6MFCBFq3C2n6kNJnZByV6nuDtXe9IjEPOfhmpDtWmt3MLR0gQpiHcQmAFMUPrZc3QiCDjxBZLbxDC3efxWxz33bWH1ZgrsXrXlBl llamaKey=RR-EuyoFDUvfRDBj46fZKAtKJ3voM8Mt768cPeJV7GNdAkPTKdY8Odm9n4ggGqI5GyoXrXlBl serverPHP=https://ride.mobile-app.store @@ -23,5 +23,3 @@ geminiApi=QOmqZsQYm08vOqjI7klVJfvP4WBFEoemjgy396iXrXlBl geminiApiMasa=QOmqZsQIdM4BRsKmaDJOP7dZp5-c6NWfch7PAlQXrXlBl agoraAppId=71880f2j636509j24y5294480y30u848XrXlBl agoraAppCertificate=j17q944u49390q758u1649448q2y6xfuXrXlBl - - diff --git a/lib/controller/firebase/firbase_messge.dart b/lib/controller/firebase/firbase_messge.dart index d3429cf..c510908 100644 --- a/lib/controller/firebase/firbase_messge.dart +++ b/lib/controller/firebase/firbase_messge.dart @@ -348,6 +348,8 @@ class FirebaseMessagesController extends GetxController { return Get.defaultDialog( barrierDismissible: false, title: 'message From passenger'.tr, + titleStyle: AppStyle.title, + middleTextStyle: AppStyle.title, middleText: message.tr, confirm: MyElevatedButton( title: 'Ok'.tr, diff --git a/lib/controller/home/captin/home_captain_controller.dart b/lib/controller/home/captin/home_captain_controller.dart index db91d0d..8a6ee2c 100644 --- a/lib/controller/home/captin/home_captain_controller.dart +++ b/lib/controller/home/captin/home_captain_controller.dart @@ -264,6 +264,11 @@ class HomeCaptainController extends GetxController { } } + double mpg = 0; + calculateConsumptionFuel() { + mpg = fuelPrice / 12; //todo in register car add mpg in box + } + getCountRideToday() async { var res = await CRUD().get( link: AppLink.getCountRide, diff --git a/lib/controller/home/captin/map_driver_controller.dart b/lib/controller/home/captin/map_driver_controller.dart index 3423bb8..f190e19 100644 --- a/lib/controller/home/captin/map_driver_controller.dart +++ b/lib/controller/home/captin/map_driver_controller.dart @@ -535,6 +535,11 @@ class MapDriverController extends GetxController { // print(durationOfRideValue); int durationOfRide = int.parse(durationOfRideValue); update(); + int infinity = 40000; + if (carType == 'Comfort' || carType == 'Mashwari') { + durationOfRide = infinity; + update(); + } for (int i = 0; i <= durationOfRide; i++) { await Future.delayed(const Duration(seconds: 1)); recentDistanceToDash = Get.find().totalDistance; @@ -547,7 +552,7 @@ class MapDriverController extends GetxController { ? (i ~/ 60) + (recentDistanceToDash * Get.find().speedPrice) - : carType == 'Delivery' + : carType == 'Mashwari' ? (i ~/ 60) + (recentDistanceToDash * Get.find().deliveryPrice) @@ -569,8 +574,8 @@ class MapDriverController extends GetxController { int seconds = remainingTimeTimerRideBegin % 60; stringRemainingTimeRideBegin = '$minutes:${seconds.toString().padLeft(2, '0')}'; - int minutes1 = (rideTimerFromBegin / 60).floor(); - int seconds1 = rideTimerFromBegin % 60; + int minutes1 = (i / 60).floor(); + int seconds1 = i % 60; stringRemainingTimeRideBegin1 = '$minutes1:${seconds1.toString().padLeft(2, '0')}'; update(); diff --git a/lib/controller/home/captin/order_request_controller.dart b/lib/controller/home/captin/order_request_controller.dart index 802a942..5a58020 100644 --- a/lib/controller/home/captin/order_request_controller.dart +++ b/lib/controller/home/captin/order_request_controller.dart @@ -9,6 +9,7 @@ import '../../../constant/box_name.dart'; import '../../../constant/table_names.dart'; import '../../functions/crud.dart'; import '../../functions/location_controller.dart'; +import 'home_captain_controller.dart'; class OrderRequestController extends GetxController { double progress = 0; @@ -24,7 +25,7 @@ class OrderRequestController extends GetxController { @override void onInit() { getRefusedOrderByCaptain(); - + // calculateConsumptionFuel(); update(); super.onInit(); } @@ -34,6 +35,12 @@ class OrderRequestController extends GetxController { update(); } + double mpg = 0; + calculateConsumptionFuel() { + mpg = Get.find().fuelPrice / + 12; //todo in register car add mpg in box + } + void getRefusedOrderByCaptain() async { DateTime today = DateTime.now(); int todayDay = today.day; diff --git a/lib/controller/local/translations.dart b/lib/controller/local/translations.dart index 09c2054..177ba97 100644 --- a/lib/controller/local/translations.dart +++ b/lib/controller/local/translations.dart @@ -478,11 +478,15 @@ class MyTranslation extends Translations { 'Distance from Passenger to destination is ': "المسافة من الراكب إلى الوجهة هي ", 'price is': '‏التكلفة', + 'This ride type does not allow changes to the destination or additional stops': + 'ده نوع الرحلات مش بيسمح بتغيير نقطة الوصول أو الوقوف الإضافي', + 'This price may be changed': 'خلي بالك السعر ممكن يتغي', 'No SIM card, no problem! Call your driver directly through our app. We use advanced technology to ensure your privacy.': 'حتا لو مفيش كارت SIM, متخفش! تقدر تكلم سواقك بمنتهى البساطة عن طريق التطبيق بتاعنا. احنا بنستخدم تكنولوجيا حديثة عشان نحافظ على خصوصيتك.', - 'Driver Finish Trip' - 'distance is' - 'Cost Of Trip IS ': "تكلفة الرحلة هي ", + 'This ride type allows changes, but the price may increase': + 'ده نوع الرحلات بيسمح بالتغيير بس السعر ممكن يزيد ', + 'Cost Of Trip IS ': "تكلفة الرحلة هي ", + 'message From passenger': '‏رسالة من الراكب', 'Select one message': "‏اختر رسالة", 'My location is correct. You can search for me using the navigation app': 'المكان اللي أنا فيه صح، ممكن تدور عليّا من خلال تطبيق الملاحة', diff --git a/lib/views/auth/captin/login_captin.dart b/lib/views/auth/captin/login_captin.dart index 5274712..b03c198 100644 --- a/lib/views/auth/captin/login_captin.dart +++ b/lib/views/auth/captin/login_captin.dart @@ -196,64 +196,64 @@ class LoginCaptin extends StatelessWidget { displayFullTextOnTap: true, stopPauseOnTap: true, ), - // IconButton( - // onPressed: () async { - // // String v = - // // await storage.read(key: BoxName.serverAPI) ?? ''; - // // print(v); - // // sql.deleteAllData(TableName.faceDetectTimes); - // AC credentials = AC(); - // String apiKey = - // 'Qfrhx9d5YVHiy4uEuK4wiFc9kIuFFlvc5A6WVzPK'; - // // // // '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'; - // // credentials.gAK(); - // String? apiKeyf = - // await storage.read(key: BoxName.chatGPTkey); - // print(apiKeyf); - // String convertedString = credentials.c(apiKey, s); - // String convertedStrings = credentials.c(apiKey, s); - // print('Converted String s: $convertedStrings'); - // String convertedStringC = - // credentials.c(convertedStrings, c); - // print('v: $v'); - // 'AAAAinYllCo:APA91bF1shTpzSsSxqbfY6c60D8zs1ZsdIsl9ix6nl7GDdjCqWPRK0G0ub5SqFdb1jDpQDvQPxGg-697MWLo0sy3oYImBwBLObyhk0GjtNzyr0PbE3hI-pOvhf8Vp1xgUgBmofbZYXkH' - // 'AAAAinYllCo:APA91bF1shTpzSsSxqbfY6c60D8zs1ZsdIsl9ix6nl7GDdjCqWPRK0G0ub5SqFdb1jDpQDvQPxGg-697MWLo0sy3oYImBwBLObyhk0GjtNzyr0PbE3hI-pOvhf8Vp1xgUgBmofbZYXkH' - // String convertedStringN = credentials.c( - // credentials.c( - // credentials.c( - // 'ASCeQiScKwmkMyjlrr7l0tT57Br2yPRAgm5xZndjnusED53JA0us1DbqJaJXDVWFCtAHapjVqA5FEEPL', - // cs), - // cC), - // cn); - // print('Converted v: $convertedStringN'); - // // - // String retrievedStringN = - // credentials.r(convertedStringN, n); - // print('Retrieved String: $retrievedStringN'); - // String retrievedStringC = - // credentials.r(retrievedStringN, c); - // print('Retrieved String: $retrievedStringC'); + IconButton( + onPressed: () async { + // // String v = + // // await storage.read(key: BoxName.serverAPI) ?? ''; + // // print(v); + // // sql.deleteAllData(TableName.faceDetectTimes); + // AC credentials = AC(); + // String apiKey = + // 'Qfrhx9d5YVHiy4uEuK4wiFc9kIuFFlvc5A6WVzPK'; + // // // // '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'; + // // credentials.gAK(); + // String? apiKeyf = + // await storage.read(key: BoxName.chatGPTkey); + // print(apiKeyf); + // String convertedString = credentials.c(apiKey, s); + // String convertedStrings = credentials.c(apiKey, s); + // print('Converted String s: $convertedStrings'); + // String convertedStringC = + // credentials.c(convertedStrings, c); + // print('v: $v'); + // 'AAAAinYllCo:APA91bF1shTpzSsSxqbfY6c60D8zs1ZsdIsl9ix6nl7GDdjCqWPRK0G0ub5SqFdb1jDpQDvQPxGg-697MWLo0sy3oYImBwBLObyhk0GjtNzyr0PbE3hI-pOvhf8Vp1xgUgBmofbZYXkH' + // 'AAAAinYllCo:APA91bF1shTpzSsSxqbfY6c60D8zs1ZsdIsl9ix6nl7GDdjCqWPRK0G0ub5SqFdb1jDpQDvQPxGg-697MWLo0sy3oYImBwBLObyhk0GjtNzyr0PbE3hI-pOvhf8Vp1xgUgBmofbZYXkH' + // String convertedStringN = credentials.c( + // credentials.c( + // credentials.c( + // 'ASCeQiScKwmkMyjlrr7l0tT57Br2yPRAgm5xZndjnusED53JA0us1DbqJaJXDVWFCtAHapjVqA5FEEPL', + // cs), + // cC), + // cn); + // print('Converted v: $convertedStringN'); + // // + // String retrievedStringN = + // credentials.r(convertedStringN, n); + // print('Retrieved String: $retrievedStringN'); + // String retrievedStringC = + // credentials.r(retrievedStringN, c); + // print('Retrieved String: $retrievedStringC'); - // String retrievedStringS = credentials.r( - // credentials.r( - // credentials.r(convertedStringN, cn), cC), - // cs); - // print('Retrieved String: $retrievedStringS'); - // - // if (retrievedStringS == apiKey) { - // print('same'); - // } - // print(' AK is ' + AK.chatGPTkey); // - // - // print(' ENV is ' + Env.chatGPTkey); // - // // print('storage is ' + v); // - // print('storage is ' + apiKeyf!); // - // }, - // icon: const Icon( - // Icons.close, - // color: AppColor.blueColor, - // ), - // ), + // String retrievedStringS = credentials.r( + // credentials.r( + // credentials.r(convertedStringN, cn), cC), + // cs); + // print('Retrieved String: $retrievedStringS'); + // + // if (retrievedStringS == apiKey) { + // print('same'); + // } + // print(' AK is ' + AK.chatGPTkey); // + // + // print(' ENV is ' + Env.chatGPTkey); // + // // print('storage is ' + v); // + // print('storage is ' + apiKeyf!); // + }, + icon: const Icon( + Icons.close, + color: AppColor.blueColor, + ), + ), ], ), ) diff --git a/lib/views/home/Captin/mapDriverWidgets/driver_end_ride_bar.dart b/lib/views/home/Captin/mapDriverWidgets/driver_end_ride_bar.dart index 732ad36..51b2e29 100644 --- a/lib/views/home/Captin/mapDriverWidgets/driver_end_ride_bar.dart +++ b/lib/views/home/Captin/mapDriverWidgets/driver_end_ride_bar.dart @@ -21,42 +21,46 @@ GetBuilder 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 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, + ), + ) ], ), )) diff --git a/lib/views/home/Captin/orderCaptin/order_request_page.dart b/lib/views/home/Captin/orderCaptin/order_request_page.dart index 141155f..f6dedc9 100644 --- a/lib/views/home/Captin/orderCaptin/order_request_page.dart +++ b/lib/views/home/Captin/orderCaptin/order_request_page.dart @@ -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().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() - .fuelPrice / - 12) * - double.parse(myList[5])) - .toStringAsFixed(2), + text: + orderRequestController.mpg.toStringAsFixed(0), style: AppStyle.headTitle2), ], ), diff --git a/lib/views/home/Captin/orderCaptin/order_speed_request.dart b/lib/views/home/Captin/orderCaptin/order_speed_request.dart index bcba03b..a3bced5 100644 --- a/lib/views/home/Captin/orderCaptin/order_speed_request.dart +++ b/lib/views/home/Captin/orderCaptin/order_speed_request.dart @@ -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().fuelPrice / - 12) * - double.parse(myList[5])) - .toStringAsFixed(2), + text: orderRequestController.mpg.toStringAsFixed(0), style: AppStyle.headTitle2), ], ), diff --git a/lib/views/home/map_widget.dart/apply_order_widget.dart b/lib/views/home/map_widget.dart/apply_order_widget.dart index c2bf645..7c432de 100644 --- a/lib/views/home/map_widget.dart/apply_order_widget.dart +++ b/lib/views/home/map_widget.dart/apply_order_widget.dart @@ -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, + ), ), ), ), diff --git a/lib/views/home/map_widget.dart/cash_confirm_bottom_page.dart b/lib/views/home/map_widget.dart/cash_confirm_bottom_page.dart index 75e6fd1..005ba56 100644 --- a/lib/views/home/map_widget.dart/cash_confirm_bottom_page.dart +++ b/lib/views/home/map_widget.dart/cash_confirm_bottom_page.dart @@ -176,6 +176,7 @@ class CashConfirmPageShown extends StatelessWidget { title: 'Next'.tr, onPressed: () { controller.changeCashConfirmPageShown(); + controller.isSearchingWindow = true; controller.confirmRideForFirstDriver(); controller.update(); }, diff --git a/lib/views/home/map_widget.dart/ride_begin_passenger.dart b/lib/views/home/map_widget.dart/ride_begin_passenger.dart index c3c9434..8a44106 100644 --- a/lib/views/home/map_widget.dart/ride_begin_passenger.dart +++ b/lib/views/home/map_widget.dart/ride_begin_passenger.dart @@ -22,7 +22,7 @@ class RideBeginPassenger extends StatelessWidget { AudioController audioController = Get.put(AudioController()); return GetBuilder(builder: (controller) { if ( //controller.rideTimerBegin || - controller.statusRide == 'Begin' && !controller.statusRideFromStart) { + controller.statusRide == 'Begin' || !controller.statusRideFromStart) { return Positioned( left: 10, right: 10,