From 8c61a79de3fcc35c1f97eb9cb2a4a9f49ec0f71e Mon Sep 17 00:00:00 2001 From: Hamza-Ayed Date: Fri, 9 Feb 2024 02:56:37 +0300 Subject: [PATCH] 2/9/1 --- android/app/build.gradle | 4 +- ios/Runner/Info.plist | 4 +- lib/constant/box_name.dart | 1 + lib/constant/links.dart | 1 + lib/controller/firebase/firbase_messge.dart | 23 +- .../functions/location_controller.dart | 2 +- .../home/captin/map_driver_controller.dart | 18 ++ .../payment/captain_wallet_controller.dart | 31 +- .../payment/payment_controller.dart | 6 +- .../google_driver_map_page.dart | 14 +- .../Captin/mapDriverWidgets/sos_connect.dart | 71 ++++- .../my_wallet/passenger_wallet_dialoge.dart | 2 +- lib/views/home/my_wallet/points_captain.dart | 6 +- lib/views/home/my_wallet/walet_captain.dart | 284 +++++++++++++++--- lib/views/widgets/elevated_btn.dart | 1 + 15 files changed, 397 insertions(+), 71 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 1d4f4d2..05e9f41 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -55,8 +55,8 @@ android { // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. minSdkVersion 26 targetSdkVersion flutter.targetSdkVersion - versionCode 16 - versionName '1.4.0' + versionCode 17 + versionName '1.4.1' // manifestPlaceholders = [mapsApiKey: 'android/app/src/main/AndroidManifest.xml'] } diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index f44a366..6220f0c 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -37,11 +37,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 14 + 16 CFBundleSignature ???? CFBundleVersion - 1.34 + 1.36 LSRequiresIPhoneOS UILaunchStoryboardName diff --git a/lib/constant/box_name.dart b/lib/constant/box_name.dart index 78f248e..10c15c8 100644 --- a/lib/constant/box_name.dart +++ b/lib/constant/box_name.dart @@ -12,6 +12,7 @@ class BoxName { static const String accountIdStripeConnect = "accountIdStripeConnect"; static const String faceDetectTimes = "faceDetectTimes"; static const String sosPhonePassenger = "sosPhonePassenger"; + static const String sosPhoneDriver = "sosPhoneDriver"; static const String passengerID = "pasengerID"; static const String phone = "phone"; static const String phoneDriver = "phoneDriver"; diff --git a/lib/constant/links.dart b/lib/constant/links.dart index 1c007de..1020a94 100644 --- a/lib/constant/links.dart +++ b/lib/constant/links.dart @@ -61,6 +61,7 @@ class AppLink { static String getDriverPaymentPoints = "$ride/driverWallet/get.php"; static String getDriverpaymentToday = "$ride/payment/get.php"; static String getAllPaymentFromRide = "$ride/payment/getAllPayment.php"; + static String getAllPaymentVisa = "$ride/payment/getAllPaymentVisa.php"; //-----------------Passenger NotificationCaptain------------------ static String addNotificationPassenger = diff --git a/lib/controller/firebase/firbase_messge.dart b/lib/controller/firebase/firbase_messge.dart index fb203fc..86c8c05 100644 --- a/lib/controller/firebase/firbase_messge.dart +++ b/lib/controller/firebase/firbase_messge.dart @@ -20,6 +20,7 @@ import '../../views/home/Captin/home_captain/home_captin.dart'; import '../../views/home/profile/promos_passenger_page.dart'; import '../../views/home/Captin/orderCaptin/order_request_page.dart'; import '../home/map_passenger_controller.dart'; +import '../home/payment/captain_wallet_controller.dart'; class FirebaseMessagesController extends GetxController { final fcmToken = FirebaseMessaging.instance; @@ -102,15 +103,15 @@ class FirebaseMessagesController extends GetxController { }); FirebaseMessaging.onMessage.listen((RemoteMessage message) { - if (message.notification != null && message.data.isNotEmpty) { - fireBaseTitles(message); - } + // if (message.notification != null && message.data.isNotEmpty) { + // fireBaseTitles(message); + // } // If the app is in the background or terminated, show a system tray message RemoteNotification? notification = message.notification; AndroidNotification? android = notification?.android; // if (notification != null && android != null) { - if (message.data.isNotEmpty) { + if (message.data.isNotEmpty && message.notification != null) { fireBaseTitles(message); } }); @@ -221,6 +222,14 @@ class FirebaseMessagesController extends GetxController { 'passenger_id': box.read(BoxName.passengerID).toString(), 'balance': ((-1) * tip).toString() }); + + await CRUD().post(link: AppLink.addDriversWallet, payload: { + 'driverID': driverList[0].toString(), + 'paymentID': '${Get.find().rideId}tip', + 'amount': (tip * 100).toString(), + 'paymentMethod': 'visa-tip', + }); + if (res != 'failure') { FirebaseMessagesController().sendNotificationToAnyWithoutData( 'You Have Tips', @@ -238,8 +247,10 @@ class FirebaseMessagesController extends GetxController { cancel: MyElevatedButton( title: 'No,I want'.tr, onPressed: () { - Get.back(); - Get.off(() => RateCaptainFromPassenger()); + Get.to(() => RateCaptainFromPassenger(), arguments: { + 'driverId': driverList[0].toString(), + 'rideId': driverList[1].toString(), + }); }, kolor: AppColor.redColor, )); diff --git a/lib/controller/functions/location_controller.dart b/lib/controller/functions/location_controller.dart index 0dc1f9b..e1f00fb 100644 --- a/lib/controller/functions/location_controller.dart +++ b/lib/controller/functions/location_controller.dart @@ -37,7 +37,7 @@ class LocationController extends GetxController { // if (isActive) { if (double.parse(totalPoints) > -100) { - print('total point is ll$totalPoints'); + print('total point is $totalPoints'); await getLocation(); await CRUD().post(link: AppLink.addCarsLocationByPassenger, payload: { diff --git a/lib/controller/home/captin/map_driver_controller.dart b/lib/controller/home/captin/map_driver_controller.dart index 0432018..99c6bc5 100644 --- a/lib/controller/home/captin/map_driver_controller.dart +++ b/lib/controller/home/captin/map_driver_controller.dart @@ -22,6 +22,8 @@ import '../../functions/location_controller.dart'; class MapDriverController extends GetxController { bool isLoading = true; + final formKey1 = GlobalKey(); + final sosEmergincyNumberCotroller = TextEditingController(); List data = []; List dataDestination = []; LatLngBounds? boundsData; @@ -478,6 +480,20 @@ class MapDriverController extends GetxController { polyLines.add(polyline); // rideConfirm = false; + // Define the northeast and southwest coordinates + final bounds = response["routes"][0]["bounds"]; + LatLng northeast = + LatLng(bounds['northeast']['lat'], bounds['northeast']['lng']); + LatLng southwest = + LatLng(bounds['southwest']['lat'], bounds['southwest']['lng']); + +// Create the LatLngBounds object + LatLngBounds boundsData = + LatLngBounds(northeast: northeast, southwest: southwest); + +// Fit the camera to the bounds + var cameraUpdate = CameraUpdate.newLatLngBounds(boundsData, 130); + mapController!.animateCamera(cameraUpdate); update(); } } @@ -519,6 +535,8 @@ class MapDriverController extends GetxController { // updateCameraFromBoundsAfterGetMap(dataBounds); // polyLinesDestination.add(polyline); // rideConfirm = false; + // Define the northeast and southwest coordinates + update(); } } diff --git a/lib/controller/home/payment/captain_wallet_controller.dart b/lib/controller/home/payment/captain_wallet_controller.dart index 4fdfcf7..665359b 100644 --- a/lib/controller/home/payment/captain_wallet_controller.dart +++ b/lib/controller/home/payment/captain_wallet_controller.dart @@ -10,10 +10,29 @@ import 'package:ride/main.dart'; class CaptainWalletController extends GetxController { bool isLoading = false; Map walletDate = {}; + Map walletDateVisa = {}; Map walletDriverPointsDate = {}; final formKey = GlobalKey(); String totalAmount = '0'; + String totalAmountVisa = '0'; String totalPoints = '0'; + final amountFromBudgetController = TextEditingController(); + + payFromBudget() async { + if (formKey.currentState!.validate()) { + var pointFromBudget = int.parse((amountFromBudgetController.text)) * 100; + + await addDriverPayment('fromBudgetToPoints', + int.parse((amountFromBudgetController.text)) * -1); + Future.delayed(const Duration(seconds: 2)); + await addDriverWallet('fromBudget', pointFromBudget.toString()); + update(); + Get.back(); + getCaptainWalletFromRide(); + getCaptainWalletFromBuyPoints(); + checkAccountCaptainBank(); + } + } Future getCaptainWalletFromRide() async { isLoading = true; @@ -26,6 +45,16 @@ class CaptainWalletController extends GetxController { totalAmount = walletDate['message'][0]['total_amount'].toString() == null ? '0' : walletDate['message'][0]['total_amount']; + print(totalAmount); + + var res1 = await CRUD().get( + link: AppLink.getAllPaymentVisa, + payload: {'driverID': box.read(BoxName.driverID)}); + walletDateVisa = jsonDecode(res1); + totalAmountVisa = walletDateVisa['message'][0]['diff'].toString() == null + ? '0' + : walletDateVisa['message'][0]['diff']; + print(totalAmountVisa); isLoading = false; update(); } @@ -60,7 +89,7 @@ class CaptainWalletController extends GetxController { }); var d = jsonDecode(res); paymentID = d['message'].toString(); - // print(paymentID); + print('paymentID $paymentID'); } Future addDriverWallet(String paymentMethod, point) async { diff --git a/lib/controller/payment/payment_controller.dart b/lib/controller/payment/payment_controller.dart index 876dcce..bc90896 100644 --- a/lib/controller/payment/payment_controller.dart +++ b/lib/controller/payment/payment_controller.dart @@ -125,8 +125,8 @@ class PaymentController extends GetxController { late String clientSecret; Future makePaymentStripe( - int amount, String currency, Function method) async { - var newAmount = amount * 100; + double amount, String currency, Function method) async { + var newAmount = (amount * 100).toInt(); try { // Check if local authentication is available @@ -427,7 +427,7 @@ class PaymentController extends GetxController { final body = { 'amount': amount, //amount - 'currency': 'aed', + 'currency': 'usd', 'destination': account //'acct_1OKIjQRgcWrsdyDT' //account id }; diff --git a/lib/views/home/Captin/mapDriverWidgets/google_driver_map_page.dart b/lib/views/home/Captin/mapDriverWidgets/google_driver_map_page.dart index 9e70641..bb685ff 100644 --- a/lib/views/home/Captin/mapDriverWidgets/google_driver_map_page.dart +++ b/lib/views/home/Captin/mapDriverWidgets/google_driver_map_page.dart @@ -22,6 +22,7 @@ class GoogleDriverMap extends StatelessWidget { builder: (controller) => GoogleMap( onMapCreated: controller.onMapCreated, initialCameraPosition: CameraPosition( + // bearing: 45, target: locationController.myLocation, zoom: 15, tilt: 40, @@ -31,8 +32,15 @@ class GoogleDriverMap extends StatelessWidget { print(position); }, minMaxZoomPreference: const MinMaxZoomPreference(6, 18), + myLocationEnabled: true, + compassEnabled: true, + mapType: MapType.normal, + trafficEnabled: true, buildingsEnabled: true, mapToolbarEnabled: true, + zoomControlsEnabled: true, + fortyFiveDegreeImageryEnabled: true, + zoomGesturesEnabled: true, polylines: { Polyline( zIndex: 2, @@ -44,7 +52,7 @@ class GoogleDriverMap extends StatelessWidget { polylineId: const PolylineId('route1'), points: controller.polylineCoordinates, color: AppColor.greenColor, - width: 5, + width: 3, ), Polyline( zIndex: 2, @@ -55,8 +63,8 @@ class GoogleDriverMap extends StatelessWidget { visible: true, polylineId: const PolylineId('route'), points: controller.polylineCoordinatesDestination, - color: AppColor.redColor, - width: 5, + color: AppColor.primaryColor, + width: 2, ), }, markers: { diff --git a/lib/views/home/Captin/mapDriverWidgets/sos_connect.dart b/lib/views/home/Captin/mapDriverWidgets/sos_connect.dart index d28ed4b..b5e4e82 100644 --- a/lib/views/home/Captin/mapDriverWidgets/sos_connect.dart +++ b/lib/views/home/Captin/mapDriverWidgets/sos_connect.dart @@ -1,6 +1,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_font_icons/flutter_font_icons.dart'; import 'package:get/get.dart'; +import 'package:ride/constant/info.dart'; +import 'package:ride/controller/functions/location_controller.dart'; +import 'package:ride/views/widgets/elevated_btn.dart'; +import 'package:ride/views/widgets/my_textField.dart'; import '../../../../constant/box_name.dart'; import '../../../../constant/colors.dart'; @@ -20,17 +24,44 @@ class SosConnect extends StatelessWidget { builder: (mapDriverController) => mapDriverController.isRideStarted ? Positioned( left: 5, - top: Get.height * .3, + bottom: 20, child: Container( decoration: AppStyle.boxDecoration, - height: 100, - width: 70, - child: Column( + height: 60, + width: 100, + child: Row( mainAxisAlignment: MainAxisAlignment.spaceAround, children: [ InkWell( onTap: () { - launchCommunication('phone', '911', ''); + if (box.read(BoxName.sosPhoneDriver) == null) { + Get.defaultDialog( + title: 'Insert Emergincy Number'.tr, + content: Form( + key: mapDriverController.formKey1, + child: MyTextForm( + controller: mapDriverController + .sosEmergincyNumberCotroller, + label: 'Insert Emergincy Number'.tr, + hint: 'Insert Emergincy Number'.tr, + type: TextInputType.phone), + ), + confirm: MyElevatedButton( + title: 'Insert'.tr, + onPressed: () { + if (mapDriverController + .formKey1.currentState! + .validate()) { + box.write( + BoxName.sosPhoneDriver, + mapDriverController + .sosEmergincyNumberCotroller + .text); + } + })); + } + launchCommunication( + 'phone', box.read(BoxName.sosPhoneDriver), ''); }, child: const Icon( Icons.sos_sharp, @@ -39,10 +70,36 @@ class SosConnect extends StatelessWidget { ), InkWell( onTap: () { + if (box.read(BoxName.sosPhoneDriver) == null) { + Get.defaultDialog( + title: 'Insert Emergincy Number'.tr, + content: Form( + key: mapDriverController.formKey1, + child: MyTextForm( + controller: mapDriverController + .sosEmergincyNumberCotroller, + label: 'Insert Emergincy Number'.tr, + hint: 'Insert Emergincy Number'.tr, + type: TextInputType.phone), + ), + confirm: MyElevatedButton( + title: 'Insert'.tr, + onPressed: () { + if (mapDriverController + .formKey1.currentState! + .validate()) { + box.write( + BoxName.sosPhoneDriver, + mapDriverController + .sosEmergincyNumberCotroller + .text); + } + })); + } launchCommunication( 'whatsapp', - '+962${box.read(BoxName.phoneDriver)}', //todo add number from driver - '${'Hello this is Captain'.tr} ${box.read(BoxName.nameDriver)}'); + '+962${box.read(BoxName.sosPhoneDriver)}', //todo add number from driver + "Hello this is Driver ${box.read(BoxName.nameDriver)}. My current location is: https://www.google.com/maps/place/${Get.find().myLocation.latitude},${Get.find().myLocation.longitude} \nand I have a trip on ${AppInformation.appName} App \nwith Passenger ${mapDriverController.name}"); }, child: const Icon( FontAwesome.whatsapp, diff --git a/lib/views/home/my_wallet/passenger_wallet_dialoge.dart b/lib/views/home/my_wallet/passenger_wallet_dialoge.dart index 46d3779..7cb339d 100644 --- a/lib/views/home/my_wallet/passenger_wallet_dialoge.dart +++ b/lib/views/home/my_wallet/passenger_wallet_dialoge.dart @@ -143,7 +143,7 @@ class PassengerWalletDialoge extends StatelessWidget { onPressed: () { if (controller.selectedAmount != 0) { controller.makePaymentStripe( - controller.selectedAmount as int, 'USD', + controller.selectedAmount as double, 'USD', () { controller.addPassengerWallet(); controller.changePromoSheetDialogue(); diff --git a/lib/views/home/my_wallet/points_captain.dart b/lib/views/home/my_wallet/points_captain.dart index 805e641..54116f9 100644 --- a/lib/views/home/my_wallet/points_captain.dart +++ b/lib/views/home/my_wallet/points_captain.dart @@ -18,7 +18,7 @@ class PointsCaptain extends StatelessWidget { }); final Color kolor; final String countPoint; - int pricePoint; + double pricePoint; @override Widget build(BuildContext context) { @@ -31,8 +31,8 @@ class PointsCaptain extends StatelessWidget { }); }, child: Container( - width: Get.width * .2, - height: Get.width * .2, + width: Get.width * .22, + height: Get.width * .15, margin: const EdgeInsets.all(4), decoration: BoxDecoration( color: kolor, diff --git a/lib/views/home/my_wallet/walet_captain.dart b/lib/views/home/my_wallet/walet_captain.dart index 67df282..6150136 100644 --- a/lib/views/home/my_wallet/walet_captain.dart +++ b/lib/views/home/my_wallet/walet_captain.dart @@ -2,12 +2,14 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:ride/constant/box_name.dart'; import 'package:ride/constant/colors.dart'; +import 'package:ride/constant/info.dart'; import 'package:ride/constant/style.dart'; import 'package:ride/controller/home/map_passenger_controller.dart'; import 'package:ride/controller/home/payment/captain_wallet_controller.dart'; import 'package:ride/controller/payment/payment_controller.dart'; import 'package:ride/main.dart'; import 'package:ride/views/widgets/elevated_btn.dart'; +import 'package:ride/views/widgets/my_textField.dart'; import 'package:ride/views/widgets/mycircular.dart'; import '../../widgets/my_scafold.dart'; @@ -28,9 +30,9 @@ class WaletCaptain extends StatelessWidget { .isLoading ? const MyCircularProgressIndicator() : Padding( - padding: const EdgeInsets.all(20), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + padding: const EdgeInsets.all(10), + child: ListView( + // crossAxisAlignment: CrossAxisAlignment.center, children: [ const SizedBox(), Container( @@ -58,54 +60,177 @@ class WaletCaptain extends StatelessWidget { ? MyElevatedButton( title: 'Charge your Account', onPressed: () {}) : const SizedBox(), + const SizedBox( + height: 10, + ), + CardSeferWalletDriver(), Card( elevation: 4, child: Padding( padding: const EdgeInsets.symmetric(horizontal: 4), - child: Text( - 'Total Budget from trips is ${captainWalletController.totalAmount}\$', - style: AppStyle.title, + child: Column( + children: [ + Row( + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + children: [ + Text( + 'Total Budget from trips is ', + style: AppStyle.title, + ), + Container( + decoration: BoxDecoration( + border: Border.all( + width: 2, + color: AppColor.redColor)), + child: GestureDetector( + onTap: () { + Get.snackbar( + 'Total Amount: ${captainWalletController.totalAmount}\$', + 'This amount for all trip I get from Passengers', + duration: + const Duration(seconds: 6), + backgroundColor: + AppColor.deepPurpleAccent, + 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 ', + 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( + 'Total Amount: ${captainWalletController.totalAmountVisa}\$', + 'This amount for all trip I get from Passengers and Collected For me in ${AppInformation.appName} Wallet' + .tr, + duration: + const Duration(seconds: 6), + backgroundColor: + AppColor.deepPurpleAccent, + 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, + content: Form( + key: captainWalletController.formKey, + child: MyTextForm( + controller: captainWalletController + .amountFromBudgetController, + label: 'insert amount'.tr, + hint: 'insert amount'.tr, + type: TextInputType.number, + ), + ), + confirm: MyElevatedButton( + title: 'Pay', + onPressed: () async { + await captainWalletController + .payFromBudget(); + }), + cancel: MyElevatedButton( + title: 'Cancel'.tr, + onPressed: () { + Get.back(); + })); + }, + ), + ], ), ), ), - Text( - 'You can buy Points to let you online\nby this list below' - .tr, - 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 * .120, - child: Row( - children: [ - PointsCaptain( - kolor: AppColor.blueColor, - pricePoint: 5, - countPoint: '500', - ), - PointsCaptain( - kolor: Colors.green, - pricePoint: 10, - countPoint: '1040', - ), - PointsCaptain( - kolor: Colors.amberAccent, - pricePoint: 20, - countPoint: '2100', - ), - PointsCaptain( - kolor: AppColor.yellowColor, - pricePoint: 50, - countPoint: '50400', - ), - ], - )), + 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: 5.6, + countPoint: '500', + ), + PointsCaptain( + kolor: Colors.green, + pricePoint: 11.2, + countPoint: '1040', + ), + PointsCaptain( + kolor: Colors.amberAccent, + pricePoint: 22.4, + countPoint: '2100', + ), + PointsCaptain( + kolor: AppColor.yellowColor, + pricePoint: 56, + countPoint: '52000', + ), + ], + )), + ], + ), + ), const SizedBox( height: 30, ), @@ -130,6 +255,23 @@ class WaletCaptain extends StatelessWidget { : 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 PaymentHistoryPassengerPage(), + // transition: Transition.size); + }, + ), + ], + ), + ), + // TextButton( // onPressed: () async { // PaymentController paymentController = @@ -155,3 +297,61 @@ class WaletCaptain extends StatelessWidget { ); } } + +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/widgets/elevated_btn.dart b/lib/views/widgets/elevated_btn.dart index ecbd7dc..b86263d 100644 --- a/lib/views/widgets/elevated_btn.dart +++ b/lib/views/widgets/elevated_btn.dart @@ -23,6 +23,7 @@ class MyElevatedButton extends StatelessWidget { onPressed: onPressed, child: Text( title, + textAlign: TextAlign.center, style: AppStyle.title.copyWith(color: AppColor.secondaryColor), ), );