diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index 98bf978..e0e94e4 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index 19c9c28..2ae06fc 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index f79c133..6406bd5 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index ad74c87..b111394 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index ea2ac20..9e18545 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/lib/constant/links.dart b/lib/constant/links.dart index 8bf458b..ca15baf 100644 --- a/lib/constant/links.dart +++ b/lib/constant/links.dart @@ -44,6 +44,11 @@ class AppLink { static const String getDriverpaymentToday = "$ride/payment/get.php"; static const String getAllPayment = "$ride/payment/getAllPayment.php"; +//-----------------Feed Back------------------ + static const String addFeedBack = "$ride/feedBack/add.php"; + static const String getFeedBack = "$ride/feedBack/get.php"; + static const String updateFeedBack = "$ride/feedBack/updateFeedBack.php"; + //-----------------DriverOrder------------------ static const String addDriverOrder = "$ride/driver_order/add.php"; diff --git a/lib/controller/auth/captin/login_captin_controller.dart b/lib/controller/auth/captin/login_captin_controller.dart index 758a610..0a4eb08 100644 --- a/lib/controller/auth/captin/login_captin_controller.dart +++ b/lib/controller/auth/captin/login_captin_controller.dart @@ -11,7 +11,7 @@ import 'package:ride/controller/functions/secure_storage.dart'; import 'package:ride/main.dart'; import 'package:ride/views/auth/verify_email_page.dart'; import 'package:ride/views/home/Captin/home_captin.dart'; -import 'package:ride/views/home/map_page.dart'; +import 'package:ride/views/home/map_page_passenger.dart'; class LoginCaptinController extends GetxController { final formKey = GlobalKey(); diff --git a/lib/controller/auth/login_controller.dart b/lib/controller/auth/login_controller.dart index 1da89ca..01cd304 100644 --- a/lib/controller/auth/login_controller.dart +++ b/lib/controller/auth/login_controller.dart @@ -10,7 +10,7 @@ import 'package:ride/controller/functions/crud.dart'; import 'package:ride/controller/functions/secure_storage.dart'; import 'package:ride/main.dart'; import 'package:ride/views/auth/verify_email_page.dart'; -import 'package:ride/views/home/map_page.dart'; +import 'package:ride/views/home/map_page_passenger.dart'; class LoginController extends GetxController { final formKey = GlobalKey(); @@ -56,7 +56,7 @@ class LoginController extends GetxController { box.write(BoxName.name, jsonDecoeded['data'][0]['first_name']); box.write(BoxName.phone, jsonDecoeded['data'][0]['phone']); SecureStorage().saveData(BoxName.password, passwordController.text); - Get.offAll(() => MapPage()); + Get.offAll(() => MapPagePassenger()); isloading = false; update(); print(box.read(BoxName.passengerID).toString()); @@ -98,7 +98,7 @@ class LoginController extends GetxController { goToMapPage() { if (box.read(BoxName.email) != null) { - Get.offAll(() => const MapPage()); + Get.offAll(() => const MapPagePassenger()); } } diff --git a/lib/controller/functions/camer_controller.dart b/lib/controller/functions/camer_controller.dart index 2b42729..88e9d9c 100644 --- a/lib/controller/functions/camer_controller.dart +++ b/lib/controller/functions/camer_controller.dart @@ -109,7 +109,7 @@ class CameraClassController extends GetxController { await http.MultipartFile.fromPath('image', imageFile.path), ); // Add the headers to the request request.headers.addAll({ - // "Content-Type": "application/x-www-form-urlencoded", + "Content-Type": "application/x-www-form-urlencoded", 'Authorization': 'Basic ${base64Encode(utf8.encode(AppCredintials.basicAuthCredentials))}', }); diff --git a/lib/controller/functions/crud.dart b/lib/controller/functions/crud.dart index 72b907a..ce791b7 100644 --- a/lib/controller/functions/crud.dart +++ b/lib/controller/functions/crud.dart @@ -27,8 +27,10 @@ class CRUD { var jsonData = jsonDecode(response.body); if (jsonData['status'] == 'success') { print(jsonData); + return response.body; } + return jsonData['status']; } } @@ -78,7 +80,7 @@ class CRUD { jsonData['status'], jsonData['message'], ); - + // print(response.body); return response.body; } } diff --git a/lib/controller/home/map_passenger_controller.dart b/lib/controller/home/map_passenger_controller.dart index 8436fde..38f7f34 100644 --- a/lib/controller/home/map_passenger_controller.dart +++ b/lib/controller/home/map_passenger_controller.dart @@ -7,6 +7,7 @@ import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:google_polyline_algorithm/google_polyline_algorithm.dart'; import 'package:location/location.dart'; import 'package:ride/constant/box_name.dart'; +import 'package:ride/constant/colors.dart'; import 'package:ride/constant/credential.dart'; import 'package:ride/constant/links.dart'; import 'package:ride/controller/firebase/firbase_messge.dart'; @@ -84,6 +85,7 @@ class MapPassengerController extends GetxController { int remainingTimeTimerRideBegin = 60; String stringRemainingTimeRideBegin = ''; late String rideId; + bool noCarString = false; late String driverToken; int carsOrder = 0; @@ -415,15 +417,19 @@ class MapPassengerController extends GetxController { 'northeastLon': northeast.longitude.toString(), }); if (res == 'failure') { - Get.defaultDialog( - title: 'No Car in your site.Sorry!', - middleText: '', - confirm: MyElevatedButton( - title: 'Back', - onPressed: () { - Get.back(); - markerReloadingTimer.cancel(); - })); + noCarString = true; + update(); + // Get.snackbar('No Car in your site.Sorry!'.tr, '', + // backgroundColor: AppColor.redColor); + // Get.defaultDialog( + // title: 'No Car in your site.Sorry!'.tr, + // middleText: '', + // confirm: MyElevatedButton( + // title: 'Back', + // onPressed: () { + // Get.back(); + // markerReloadingTimer.cancel(); + // })); } else { dataCarsLocationByPassenger = jsonDecode(res); // print(dataCarsLocationByPassenger); diff --git a/lib/controller/home/profile/feed_back_controller.dart b/lib/controller/home/profile/feed_back_controller.dart new file mode 100644 index 0000000..91ac6ce --- /dev/null +++ b/lib/controller/home/profile/feed_back_controller.dart @@ -0,0 +1,45 @@ +import 'dart:convert'; + +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/links.dart'; +import 'package:ride/constant/style.dart'; +import 'package:ride/controller/functions/crud.dart'; +import 'package:ride/main.dart'; +import 'package:ride/views/widgets/elevated_btn.dart'; + +class FeedBackController extends GetxController { + bool isLoading = false; + final formKey = GlobalKey(); + final feedbackController = TextEditingController(); + + void addFeedBack() async { + isLoading = true; + update(); + var res = await CRUD().post(link: AppLink.addFeedBack, payload: { + 'passengerId': box.read(BoxName.passengerID).toString(), + 'feedBack': feedbackController.text + }); + var d = jsonDecode(res); + // print(d); + if (d['status'].toString() == 'success') { + Get.defaultDialog( + title: 'Success'.tr, + titleStyle: AppStyle.title, + middleText: 'Feedback data saved successfully'.tr, + middleTextStyle: AppStyle.title, + confirm: MyElevatedButton( + kolor: AppColor.greenColor, + title: 'Ok'.tr, + onPressed: () { + Get.back(); + Get.back(); + })); + } + + isLoading = false; + update(); + } +} diff --git a/lib/controller/home/profile/promos_controller.dart b/lib/controller/home/profile/promos_controller.dart index cd22008..75e5c0a 100644 --- a/lib/controller/home/profile/promos_controller.dart +++ b/lib/controller/home/profile/promos_controller.dart @@ -2,12 +2,15 @@ import 'dart:convert'; import 'package:get/get.dart'; import 'package:ride/constant/links.dart'; +import 'package:ride/constant/style.dart'; import 'package:ride/controller/functions/crud.dart'; +import 'package:ride/views/home/map_page_passenger.dart'; +import 'package:ride/views/widgets/elevated_btn.dart'; class PromosController extends GetxController { List promoList = []; - bool isloading = true; - + bool isLoading = true; + late String promos; @override void onInit() { getPromoBytody(); @@ -17,16 +20,25 @@ class PromosController extends GetxController { Future getPromoBytody() async { var res = await CRUD().get(link: AppLink.getPromoBytody, payload: {}); if (res.toString() == 'failure') { - Get.snackbar('failure', 'message'); - isloading = false; + Get.defaultDialog( + title: 'No Promo for tody .'.tr, + middleText: '', + titleStyle: AppStyle.title, + confirm: MyElevatedButton( + title: 'Back'.tr, + onPressed: () { + Get.back(); + Get.back(); + })); + isLoading = false; update(); } else { var jsonDecoded = jsonDecode(res); promoList = jsonDecoded['message']; - print(promoList); - isloading = false; + isLoading = false; update(); + print(promoList); } } } diff --git a/lib/controller/home/splash_screen_controlle.dart b/lib/controller/home/splash_screen_controlle.dart index e282c90..0ac3a5f 100644 --- a/lib/controller/home/splash_screen_controlle.dart +++ b/lib/controller/home/splash_screen_controlle.dart @@ -9,7 +9,7 @@ import '../../main.dart'; import '../../onbording_page.dart'; import '../../views/auth/captin/login_captin.dart'; import '../../views/home/Captin/home_captin.dart'; -import '../../views/home/map_page.dart'; +import '../../views/home/map_page_passenger.dart'; class SplashScreenController extends GetxController with SingleGetTickerProviderMixin { @@ -48,7 +48,7 @@ class SplashScreenController extends GetxController box.read(BoxName.onBoarding) == null ? Get.off(() => OnBoardingPage()) : box.read(BoxName.email) != null - ? Get.off(() => const MapPage()) + ? Get.off(() => const MapPagePassenger()) : box.read(BoxName.emailDriver) == null ? Get.off(() => LoginPage()) : box.read(BoxName.emailDriver) != null diff --git a/lib/controller/rate/rate_conroller.dart b/lib/controller/rate/rate_conroller.dart index f79dd23..138acca 100644 --- a/lib/controller/rate/rate_conroller.dart +++ b/lib/controller/rate/rate_conroller.dart @@ -7,7 +7,7 @@ import 'package:ride/controller/functions/crud.dart'; import 'package:ride/controller/home/map_passenger_controller.dart'; import 'package:ride/main.dart'; import 'package:ride/views/home/Captin/home_captin.dart'; -import 'package:ride/views/home/map_page.dart'; +import 'package:ride/views/home/map_page_passenger.dart'; import 'package:ride/views/widgets/elevated_btn.dart'; // import '../home/captin/home_captain_controller.dart'; @@ -72,7 +72,7 @@ class RateController extends GetxController { 'comment': comment.text, }).then((value) { Get.find().restCounter(); - Get.offAll(const MapPage()); + Get.offAll(const MapPagePassenger()); }); } } diff --git a/lib/views/home/home_page.dart b/lib/views/home/home_page.dart index 4312c2b..f98945c 100644 --- a/lib/views/home/home_page.dart +++ b/lib/views/home/home_page.dart @@ -39,7 +39,7 @@ class HomePage extends StatelessWidget { padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 10), child: ListTile( onTap: () { - Get.to(() => Language()); + Get.to(() => const Language()); }, title: Text( 'Language'.tr, diff --git a/lib/views/home/map_page.dart b/lib/views/home/map_page_passenger.dart similarity index 99% rename from lib/views/home/map_page.dart rename to lib/views/home/map_page_passenger.dart index 902095c..edc710b 100644 --- a/lib/views/home/map_page.dart +++ b/lib/views/home/map_page_passenger.dart @@ -21,8 +21,8 @@ import 'map_widget.dart/payment_method.page.dart'; import 'map_widget.dart/timer_for_cancell_trip_from_passenger.dart'; import 'map_widget.dart/timer_to_passenger_from_driver.dart'; -class MapPage extends StatelessWidget { - const MapPage({super.key}); +class MapPagePassenger extends StatelessWidget { + const MapPagePassenger({super.key}); @override Widget build(BuildContext context) { diff --git a/lib/views/home/map_widget.dart/buttom_sheet_map_show.dart b/lib/views/home/map_widget.dart/buttom_sheet_map_show.dart index 6488e74..c9eb3fd 100644 --- a/lib/views/home/map_widget.dart/buttom_sheet_map_show.dart +++ b/lib/views/home/map_widget.dart/buttom_sheet_map_show.dart @@ -49,48 +49,66 @@ GetBuilder buttomSheetMapPage() { child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Padding( - padding: const EdgeInsets.all(8.0), - child: Image.asset( - 'assets/images/jeep.png', - width: 50, - fit: BoxFit.fill, - repeat: ImageRepeat.repeatX, + SizedBox( + width: Get.width * .15, + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Image.asset( + 'assets/images/jeep.png', + width: 50, + fit: BoxFit.fill, + repeat: ImageRepeat.repeatX, + ), ), ), - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - '${'Your Ride Duration is '.tr}${controller.duration} minutes'), - Text( - '${'You will be thier in'.tr} ${DateFormat('h:mm a').format(controller.newTime)}'), - Text( - '${'You trip distance is'.tr} ${controller.distance} KM') - ], - ), - Padding( - padding: - const EdgeInsets.only(right: 5, left: 5), + SizedBox( + width: Get.width * .55, child: Column( crossAxisAlignment: - CrossAxisAlignment.center, + CrossAxisAlignment.start, + mainAxisAlignment: + MainAxisAlignment.spaceEvenly, children: [ Text( - '${'Fee is'.tr} \n${controller.totalPassenger.toStringAsFixed(2)}', + '${'Your Ride Duration is '.tr}${controller.duration} minutes', style: AppStyle.subtitle, ), - controller.promoTaken - ? const Icon( - Icons.filter_vintage_rounded, - color: AppColor.redColor, - ) - : const SizedBox( - height: 0, - ) + Text( + '${'You will be thier in'.tr} ${DateFormat('h:mm a').format(controller.newTime)}', + style: AppStyle.subtitle, + ), + Text( + '${'You trip distance is'.tr} ${controller.distance} KM', + style: AppStyle.subtitle, + ) ], ), ), + SizedBox( + width: Get.width * .2, + child: Padding( + padding: const EdgeInsets.only( + right: 5, left: 5), + child: Column( + crossAxisAlignment: + CrossAxisAlignment.center, + children: [ + Text( + '${'Fee is'.tr} \n${controller.totalPassenger.toStringAsFixed(2)}', + style: AppStyle.subtitle, + ), + controller.promoTaken + ? const Icon( + Icons.filter_vintage_rounded, + color: AppColor.redColor, + ) + : const SizedBox( + height: 0, + ) + ], + ), + ), + ), ], ), ), diff --git a/lib/views/home/map_widget.dart/main_bottom_Menu_map.dart b/lib/views/home/map_widget.dart/main_bottom_Menu_map.dart index 6dfe48e..a975002 100644 --- a/lib/views/home/map_widget.dart/main_bottom_Menu_map.dart +++ b/lib/views/home/map_widget.dart/main_bottom_Menu_map.dart @@ -95,22 +95,48 @@ class MainBottomMenuMap extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.center, children: [ - Text('Nearest Car for you about '.tr), - Container( - decoration: BoxDecoration( - border: Border.all( + controller.noCarString == false + ? Text( + 'Nearest Car for you about '.tr) + : Container( + decoration: BoxDecoration( + borderRadius: + BorderRadius.circular(12), color: AppColor.redColor, - width: 3)), - child: Padding( - padding: const EdgeInsets.all(4), - child: Text( - (controller.nearestCar != null - ? controller - .durationByPassenger - .toString() - : 'N/A')), - ), - ), + ), + child: Padding( + padding: + const EdgeInsets.all(6), + child: Text( + 'No Car in your site. Sorry!' + .tr, + style: AppStyle.title + .copyWith( + color: AppColor + .secondaryColor), + ), + ), + ), + controller.noCarString == false + ? Container( + decoration: BoxDecoration( + border: Border.all( + color: + AppColor.redColor, + width: 3)), + child: Padding( + padding: + const EdgeInsets.all(4), + child: Text((controller + .nearestCar != + null + ? controller + .durationByPassenger + .toString() + : 'N/A')), + ), + ) + : const SizedBox(), ], ) ], diff --git a/lib/views/home/map_widget.dart/map_menu_widget.dart b/lib/views/home/map_widget.dart/map_menu_widget.dart index 2c3ea52..7221b7d 100644 --- a/lib/views/home/map_widget.dart/map_menu_widget.dart +++ b/lib/views/home/map_widget.dart/map_menu_widget.dart @@ -3,8 +3,10 @@ import 'package:get/get.dart'; import 'package:get/get_rx/src/rx_typedefs/rx_typedefs.dart'; import 'package:ride/constant/style.dart'; import 'package:ride/views/home/my_wallet/passenger_wallet.dart'; +import 'package:ride/views/home/profile/feed_back_page.dart'; import 'package:ride/views/home/profile/order_history.dart'; import 'package:ride/views/home/profile/promos_passenger_page.dart'; +import 'package:ride/views/home/profile/taarif_page.dart'; import '../../../constant/colors.dart'; import '../../../controller/home/map_passenger_controller.dart'; @@ -120,7 +122,9 @@ class MapMenuWidget extends StatelessWidget { icon: Icons.history, ), IconMainPageMap( - onTap: () {}, + onTap: () { + Get.to(() => const TaarifPage()); + }, title: 'Tariff', icon: Icons.money, ), @@ -160,7 +164,9 @@ class MapMenuWidget extends StatelessWidget { icon: Icons.settings, ), IconMainPageMap( - onTap: () {}, + onTap: () { + Get.to(() => FeedBackPage()); + }, title: 'Feed Back', icon: Icons.feedback, ), diff --git a/lib/views/home/map_widget.dart/timer_for_cancell_trip_from_passenger.dart b/lib/views/home/map_widget.dart/timer_for_cancell_trip_from_passenger.dart index 43ca8b7..f364aea 100644 --- a/lib/views/home/map_widget.dart/timer_for_cancell_trip_from_passenger.dart +++ b/lib/views/home/map_widget.dart/timer_for_cancell_trip_from_passenger.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:ride/views/home/map_page.dart'; +import 'package:ride/views/home/map_page_passenger.dart'; import '../../../constant/style.dart'; import '../../../controller/home/map_passenger_controller.dart'; diff --git a/lib/views/home/my_wallet/passenger_wallet.dart b/lib/views/home/my_wallet/passenger_wallet.dart index ef42222..fe8a1b2 100644 --- a/lib/views/home/my_wallet/passenger_wallet.dart +++ b/lib/views/home/my_wallet/passenger_wallet.dart @@ -328,12 +328,20 @@ class PassengerWallet extends StatelessWidget { }, ), MyElevatedButton( - title: 'Pay with Credit Card'.tr, - onPressed: () => controller.makePaymentStripe( - controller.selectedAmount as int, - 'USD', - () => Get.snackbar('Hi', '')), - ), + title: 'Pay with Credit Card'.tr, + onPressed: () { + if (controller.selectedAmount != 0) { + controller.makePaymentStripe( + controller.selectedAmount as int, + 'USD', + () => Get.snackbar('Hi', '')); + } else { + Toast.show( + context, + 'You will choose one of above !'.tr, + AppColor.redColor); + } + }), MyElevatedButton( title: 'Cancel'.tr, kolor: AppColor.redColor, diff --git a/lib/views/home/profile/feed_back_page.dart b/lib/views/home/profile/feed_back_page.dart new file mode 100644 index 0000000..af1d03c --- /dev/null +++ b/lib/views/home/profile/feed_back_page.dart @@ -0,0 +1,60 @@ +import 'package:flutter/material.dart'; +import 'package:get/get.dart'; +import 'package:ride/controller/home/profile/feed_back_controller.dart'; +import 'package:ride/views/widgets/my_scafold.dart'; +import 'package:ride/views/widgets/mycircular.dart'; + +import '../../widgets/elevated_btn.dart'; + +class FeedBackPage extends StatelessWidget { + FeedBackPage({super.key}); + FeedBackController feedBackController = Get.put(FeedBackController()); + @override + Widget build(BuildContext context) { + return MyScafolld( + title: 'Feed Back'.tr, + body: [ + Padding( + padding: const EdgeInsets.all(26), + child: Form( + key: feedBackController.formKey, + child: Column( + children: [ + TextFormField( + controller: feedBackController.feedbackController, + decoration: const InputDecoration( + border: OutlineInputBorder(), + hintText: 'Enter your feedback here', + labelText: 'Feedback', + ), + validator: (value) { + if (value == null || value.isEmpty) { + return 'Please enter your feedback.'; + } + return null; + }, + ), + const SizedBox(height: 20), + feedBackController.isLoading + ? const MyCircularProgressIndicator() + : MyElevatedButton( + onPressed: () { + if (feedBackController.formKey.currentState! + .validate()) { + feedBackController.addFeedBack(); + + // Clear the feedback form + feedBackController.formKey.currentState!.reset(); + } + }, + title: 'Submit Feedback'.tr, + ), + ], + ), + ), + ), + ], + isleading: true, + ); + } +} diff --git a/lib/views/home/profile/promos_passenger_page.dart b/lib/views/home/profile/promos_passenger_page.dart index 9105f3a..f6e48f7 100644 --- a/lib/views/home/profile/promos_passenger_page.dart +++ b/lib/views/home/profile/promos_passenger_page.dart @@ -19,7 +19,7 @@ class PromosPassengerPage extends StatelessWidget { isleading: true, body: [ GetBuilder( - builder: (orderHistoryController) => orderHistoryController.isloading + builder: (orderHistoryController) => orderHistoryController.isLoading ? const MyCircularProgressIndicator() : ListView.builder( itemCount: orderHistoryController.promoList.length, diff --git a/lib/views/home/profile/taarif_page.dart b/lib/views/home/profile/taarif_page.dart new file mode 100644 index 0000000..d246aea --- /dev/null +++ b/lib/views/home/profile/taarif_page.dart @@ -0,0 +1,73 @@ +import 'package:flutter/material.dart'; +import 'package:get/get.dart'; +import 'package:ride/constant/style.dart'; +import 'package:ride/views/widgets/my_scafold.dart'; + +class TaarifPage extends StatelessWidget { + const TaarifPage({super.key}); + + @override + Widget build(BuildContext context) { + return MyScafolld(isleading: true, title: 'Tariffs'.tr, body: [ + Padding( + padding: const EdgeInsets.symmetric(horizontal: 4), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + Table( + defaultVerticalAlignment: TableCellVerticalAlignment.middle, + border: TableBorder.symmetric(), + textBaseline: TextBaseline.alphabetic, + children: [ + TableRow( + // decoration: AppStyle.boxDecoration, + children: [ + Text('Minimum fare'.tr, style: AppStyle.title), + Text('1 USD', style: AppStyle.title), + ], + ), + TableRow( + children: [ + Text('Maximum fare'.tr, style: AppStyle.title), + Text('200 USD', style: AppStyle.title), + ], + ), + TableRow( + children: [ + Text('Flag-down fee'.tr, style: AppStyle.title), + Text('0.47 USD', style: AppStyle.title), + ], + ), + TableRow( + children: [ + Text('0.05 USD/min and 0.21 USD/km', style: AppStyle.title), + Text('Including Tax', style: AppStyle.title), + ], + ), + ], + ), + const SizedBox(height: 10), + Text('BookingFee'.tr, style: AppStyle.headtitle2), + const SizedBox(height: 10), + Text('4.17%', style: AppStyle.title), + const SizedBox(height: 20), + Text('Morning', style: AppStyle.headtitle2), + const SizedBox(height: 10), + Text('from 07:30 till 10:30 (Thursday, Friday, Saturday, Monday)', + style: AppStyle.title), + const SizedBox(height: 20), + Text('Evening', style: AppStyle.headtitle2), + const SizedBox(height: 10), + Text('from 12:00 till 15:00 (Thursday, Friday, Saturday, Monday)', + style: AppStyle.title), + const SizedBox(height: 20), + Text('Night', style: AppStyle.headtitle2), + const SizedBox(height: 10), + Text('from 23:59 till 05:30', style: AppStyle.title), + ], + ), + ), + ]); + } +} diff --git a/lib/views/lang/languages.dart b/lib/views/lang/languages.dart index f850edc..21d8f59 100644 --- a/lib/views/lang/languages.dart +++ b/lib/views/lang/languages.dart @@ -6,7 +6,7 @@ import 'package:ride/views/widgets/elevated_btn.dart'; import '../../constant/box_name.dart'; import '../../controller/local/local_controller.dart'; import '../auth/login_page.dart'; -import '../home/map_page.dart'; +import '../home/map_page_passenger.dart'; class Language extends StatelessWidget { const Language({Key? key}) : super(key: key); @@ -31,7 +31,7 @@ class Language extends StatelessWidget { onPressed: () { controller.changeLang("ar"); box.read(BoxName.email) != null - ? Get.offAll(() => const MapPage()) + ? Get.offAll(() => const MapPagePassenger()) : Get.offAll(() => LoginPage()); }, ), @@ -40,7 +40,7 @@ class Language extends StatelessWidget { onPressed: () { controller.changeLang("en"); box.read(BoxName.email) != null - ? Get.offAll(() => const MapPage()) + ? Get.offAll(() => const MapPagePassenger()) : Get.offAll(() => LoginPage()); }, ), @@ -49,7 +49,7 @@ class Language extends StatelessWidget { onPressed: () { controller.changeLang("tr"); box.read(BoxName.email) != null - ? Get.offAll(() => const MapPage()) + ? Get.offAll(() => const MapPagePassenger()) : Get.offAll(() => LoginPage()); }, ),