diff --git a/lib/controller/firebase/firbase_messge.dart b/lib/controller/firebase/firbase_messge.dart index f37922b..96cd9c7 100644 --- a/lib/controller/firebase/firbase_messge.dart +++ b/lib/controller/firebase/firbase_messge.dart @@ -8,8 +8,6 @@ import 'package:ride/constant/colors.dart'; import 'package:ride/constant/style.dart'; import 'package:ride/controller/functions/crud.dart'; import 'package:ride/controller/functions/launch.dart'; -import 'package:ride/controller/functions/toast.dart'; -import 'package:ride/controller/home/map_page_controller.dart'; import 'package:ride/views/home/profile/promos_passenger_page.dart'; import 'package:ride/views/widgets/elevated_btn.dart'; diff --git a/lib/controller/home/map_page_controller.dart b/lib/controller/home/map_page_controller.dart index 6470239..23401cb 100644 --- a/lib/controller/home/map_page_controller.dart +++ b/lib/controller/home/map_page_controller.dart @@ -389,7 +389,7 @@ class MapController extends GetxController { LatLngBounds calculateBounds( double centerLat, double centerLng, double radius) { - double radius = 4000; // 10 km in meters + // double radius = 4000; // 10 km in meters southwest = LatLng( centerLat - (radius / 111000), diff --git a/lib/main.dart b/lib/main.dart index d2daca2..3b831dc 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -5,7 +5,6 @@ import 'package:firebase_messaging/firebase_messaging.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:get_storage/get_storage.dart'; -import 'package:ride/views/auth/captin/login_captin.dart'; import 'package:ride/views/auth/login_page.dart'; import 'package:ride/views/home/Captin/home_captin.dart'; import 'package:ride/views/lang/languages.dart'; @@ -13,7 +12,6 @@ import 'package:ride/views/lang/languages.dart'; import 'constant/box_name.dart'; import 'controller/firebase/firbase_messge.dart'; import 'controller/functions/location_permission.dart'; -import 'controller/functions/locaton_controller.dart'; import 'controller/local/local_controller.dart'; import 'controller/local/translations.dart'; import 'firebase_options.dart'; diff --git a/lib/views/home/Captin/home_captin.dart b/lib/views/home/Captin/home_captin.dart index ede1251..e19e238 100644 --- a/lib/views/home/Captin/home_captin.dart +++ b/lib/views/home/Captin/home_captin.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:ride/constant/style.dart'; -import 'package:ride/views/widgets/mycircular.dart'; import '../../../controller/functions/locaton_controller.dart'; import '../../widgets/my_scafold.dart'; diff --git a/lib/views/home/home_page.dart b/lib/views/home/home_page.dart index 282f701..4312c2b 100644 --- a/lib/views/home/home_page.dart +++ b/lib/views/home/home_page.dart @@ -3,7 +3,6 @@ import 'package:get/get.dart'; import 'package:ride/constant/colors.dart'; import 'package:ride/constant/style.dart'; import 'package:ride/views/lang/languages.dart'; -import 'package:ride/views/widgets/circle_container.dart'; import 'package:ride/views/widgets/my_scafold.dart'; class HomePage extends StatelessWidget { diff --git a/lib/views/home/map_page.dart b/lib/views/home/map_page.dart index 1b6a1b7..6f133f4 100644 --- a/lib/views/home/map_page.dart +++ b/lib/views/home/map_page.dart @@ -5,6 +5,7 @@ import 'package:ride/constant/colors.dart'; import 'package:ride/constant/style.dart'; import 'package:ride/controller/home/map_page_controller.dart'; import 'package:ride/views/home/map_widget.dart/cancel_raide_page.dart'; +import 'package:ride/views/widgets/elevated_btn.dart'; import 'package:ride/views/widgets/mycircular.dart'; import '../../controller/home/menu_controller.dart'; @@ -14,8 +15,6 @@ import 'map_widget.dart/main_bottom_Menu_map.dart'; import 'map_widget.dart/map_menu_widget.dart'; import 'map_widget.dart/menu_map_page.dart'; import 'map_widget.dart/payment_method.page.dart'; -import 'my_wallet/passenger_wallet.dart'; -import 'profile/order_history.dart'; class MapPage extends StatelessWidget { const MapPage({super.key}); @@ -74,17 +73,102 @@ class MapPage extends StatelessWidget { '${argument.latitude},${argument.longitude}'), ], ), - onConfirm: () async { - controller.clearpolyline(); - await controller.getMap( - '${controller.mylocation.latitude},${controller.mylocation.longitude}', - '${argument.latitude.toString()},${argument.longitude.toString()}'); + confirm: MyElevatedButton( + title: 'Ok'.tr, + onPressed: () async { + controller.clearpolyline(); + if (controller.dataCarsLocationByPassenger != + null) { + await controller.getMap( + '${controller.mylocation.latitude},${controller.mylocation.longitude}', + '${argument.latitude.toString()},${argument.longitude.toString()}'); - Get.back(); - controller.bottomSheet(); - controller.showBottomSheet1(); - // - }, + Get.back(); + controller.bottomSheet(); + controller.showBottomSheet1(); + } else { + Get.back(); + Get.snackbar( + 'We Are Sorry That we dont have cars in your Location!' + .tr, + 'message', + colorText: AppColor.redColor, + duration: const Duration(seconds: 11), + instantInit: true, + snackPosition: SnackPosition.TOP, + titleText: Text( + 'Error'.tr, + style: const TextStyle( + color: AppColor.redColor), + ), + messageText: Text( + 'We Are Sorry That we dont have cars in your Location!' + .tr, + style: AppStyle.title, + ), + icon: const Icon(Icons.error), + shouldIconPulse: true, + maxWidth: double.infinity, + margin: const EdgeInsets.all(16), + padding: const EdgeInsets.all(16), + borderRadius: 8, + borderColor: AppColor.redColor, + borderWidth: 2, + backgroundColor: AppColor.secondaryColor, + leftBarIndicatorColor: AppColor.redColor, + boxShadows: [ + BoxShadow( + color: Colors.black.withOpacity(0.25), + blurRadius: 4, + spreadRadius: 2, + offset: const Offset(0, 4), + ), + ], + backgroundGradient: const LinearGradient( + colors: [ + AppColor.redColor, + AppColor.accentColor + ], + begin: Alignment.topLeft, + end: Alignment.bottomRight, + ), + // mainButton: TextButton( + // onPressed: () { + // controller.getCarsLocationByPassenger(); + // }, + // child: Text( + // 'Try Again'.tr, + // style: const TextStyle( + // color: AppColor.secondaryColor), + // ), + // ), + onTap: (GetSnackBar snackBar) { + // Do something when the snackbar is tapped. + }, + isDismissible: true, + showProgressIndicator: false, + dismissDirection: DismissDirection.up, + progressIndicatorController: null, + progressIndicatorBackgroundColor: + Colors.transparent, + progressIndicatorValueColor: null, + snackStyle: SnackStyle.GROUNDED, + forwardAnimationCurve: + Curves.easeInToLinear, + reverseAnimationCurve: Curves.easeInOut, + animationDuration: + const Duration(milliseconds: 4000), + barBlur: 8, + overlayBlur: 0, + snackbarStatus: null, + overlayColor: + AppColor.primaryColor.withOpacity(0.5), + userInputForm: null, + ); + } + + // + }), ); }, 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 65232e1..033d837 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 @@ -2,8 +2,6 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:ride/constant/box_name.dart'; import 'package:ride/constant/style.dart'; -import 'package:ride/controller/home/payment/credit_card_Controller.dart'; -import 'package:ride/views/widgets/elevated_btn.dart'; import '../../../constant/colors.dart'; import '../../../controller/home/map_page_controller.dart'; 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 79307fa..462b339 100644 --- a/lib/views/home/map_widget.dart/map_menu_widget.dart +++ b/lib/views/home/map_widget.dart/map_menu_widget.dart @@ -2,7 +2,6 @@ import 'package:flutter/material.dart'; 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/controller/home/profile/order_history_controller.dart'; import 'package:ride/views/home/my_wallet/passenger_wallet.dart'; import 'package:ride/views/home/profile/order_history.dart'; import 'package:ride/views/home/profile/promos_passenger_page.dart'; diff --git a/lib/views/home/map_widget.dart/picker_animation_container.dart b/lib/views/home/map_widget.dart/picker_animation_container.dart index 77be5d6..2e9d87f 100644 --- a/lib/views/home/map_widget.dart/picker_animation_container.dart +++ b/lib/views/home/map_widget.dart/picker_animation_container.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:ride/constant/table_names.dart'; -import 'package:ride/models/db_sql.dart'; import '../../../constant/colors.dart'; import '../../../constant/style.dart'; diff --git a/lib/views/notification/notification_page.dart b/lib/views/notification/notification_page.dart index e8a0e53..fcadc0b 100644 --- a/lib/views/notification/notification_page.dart +++ b/lib/views/notification/notification_page.dart @@ -3,8 +3,6 @@ import 'package:get/get.dart'; import 'package:ride/constant/colors.dart'; import '../../constant/box_name.dart'; -import '../../constant/links.dart'; -import '../../controller/functions/crud.dart'; import '../../main.dart'; import '../widgets/my_scafold.dart';