9/12/1
This commit is contained in:
@@ -8,8 +8,6 @@ import 'package:ride/constant/colors.dart';
|
|||||||
import 'package:ride/constant/style.dart';
|
import 'package:ride/constant/style.dart';
|
||||||
import 'package:ride/controller/functions/crud.dart';
|
import 'package:ride/controller/functions/crud.dart';
|
||||||
import 'package:ride/controller/functions/launch.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/home/profile/promos_passenger_page.dart';
|
||||||
import 'package:ride/views/widgets/elevated_btn.dart';
|
import 'package:ride/views/widgets/elevated_btn.dart';
|
||||||
|
|
||||||
|
|||||||
@@ -389,7 +389,7 @@ class MapController extends GetxController {
|
|||||||
|
|
||||||
LatLngBounds calculateBounds(
|
LatLngBounds calculateBounds(
|
||||||
double centerLat, double centerLng, double radius) {
|
double centerLat, double centerLng, double radius) {
|
||||||
double radius = 4000; // 10 km in meters
|
// double radius = 4000; // 10 km in meters
|
||||||
|
|
||||||
southwest = LatLng(
|
southwest = LatLng(
|
||||||
centerLat - (radius / 111000),
|
centerLat - (radius / 111000),
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ import 'package:firebase_messaging/firebase_messaging.dart';
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
import 'package:get_storage/get_storage.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/auth/login_page.dart';
|
||||||
import 'package:ride/views/home/Captin/home_captin.dart';
|
import 'package:ride/views/home/Captin/home_captin.dart';
|
||||||
import 'package:ride/views/lang/languages.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 'constant/box_name.dart';
|
||||||
import 'controller/firebase/firbase_messge.dart';
|
import 'controller/firebase/firbase_messge.dart';
|
||||||
import 'controller/functions/location_permission.dart';
|
import 'controller/functions/location_permission.dart';
|
||||||
import 'controller/functions/locaton_controller.dart';
|
|
||||||
import 'controller/local/local_controller.dart';
|
import 'controller/local/local_controller.dart';
|
||||||
import 'controller/local/translations.dart';
|
import 'controller/local/translations.dart';
|
||||||
import 'firebase_options.dart';
|
import 'firebase_options.dart';
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
import 'package:ride/constant/style.dart';
|
import 'package:ride/constant/style.dart';
|
||||||
import 'package:ride/views/widgets/mycircular.dart';
|
|
||||||
|
|
||||||
import '../../../controller/functions/locaton_controller.dart';
|
import '../../../controller/functions/locaton_controller.dart';
|
||||||
import '../../widgets/my_scafold.dart';
|
import '../../widgets/my_scafold.dart';
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ import 'package:get/get.dart';
|
|||||||
import 'package:ride/constant/colors.dart';
|
import 'package:ride/constant/colors.dart';
|
||||||
import 'package:ride/constant/style.dart';
|
import 'package:ride/constant/style.dart';
|
||||||
import 'package:ride/views/lang/languages.dart';
|
import 'package:ride/views/lang/languages.dart';
|
||||||
import 'package:ride/views/widgets/circle_container.dart';
|
|
||||||
import 'package:ride/views/widgets/my_scafold.dart';
|
import 'package:ride/views/widgets/my_scafold.dart';
|
||||||
|
|
||||||
class HomePage extends StatelessWidget {
|
class HomePage extends StatelessWidget {
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import 'package:ride/constant/colors.dart';
|
|||||||
import 'package:ride/constant/style.dart';
|
import 'package:ride/constant/style.dart';
|
||||||
import 'package:ride/controller/home/map_page_controller.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/home/map_widget.dart/cancel_raide_page.dart';
|
||||||
|
import 'package:ride/views/widgets/elevated_btn.dart';
|
||||||
import 'package:ride/views/widgets/mycircular.dart';
|
import 'package:ride/views/widgets/mycircular.dart';
|
||||||
|
|
||||||
import '../../controller/home/menu_controller.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/map_menu_widget.dart';
|
||||||
import 'map_widget.dart/menu_map_page.dart';
|
import 'map_widget.dart/menu_map_page.dart';
|
||||||
import 'map_widget.dart/payment_method.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 {
|
class MapPage extends StatelessWidget {
|
||||||
const MapPage({super.key});
|
const MapPage({super.key});
|
||||||
@@ -74,17 +73,102 @@ class MapPage extends StatelessWidget {
|
|||||||
'${argument.latitude},${argument.longitude}'),
|
'${argument.latitude},${argument.longitude}'),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
onConfirm: () async {
|
confirm: MyElevatedButton(
|
||||||
controller.clearpolyline();
|
title: 'Ok'.tr,
|
||||||
await controller.getMap(
|
onPressed: () async {
|
||||||
'${controller.mylocation.latitude},${controller.mylocation.longitude}',
|
controller.clearpolyline();
|
||||||
'${argument.latitude.toString()},${argument.longitude.toString()}');
|
if (controller.dataCarsLocationByPassenger !=
|
||||||
|
null) {
|
||||||
|
await controller.getMap(
|
||||||
|
'${controller.mylocation.latitude},${controller.mylocation.longitude}',
|
||||||
|
'${argument.latitude.toString()},${argument.longitude.toString()}');
|
||||||
|
|
||||||
Get.back();
|
Get.back();
|
||||||
controller.bottomSheet();
|
controller.bottomSheet();
|
||||||
controller.showBottomSheet1();
|
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,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
//
|
||||||
|
}),
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
@@ -2,8 +2,6 @@ import 'package:flutter/material.dart';
|
|||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
import 'package:ride/constant/box_name.dart';
|
import 'package:ride/constant/box_name.dart';
|
||||||
import 'package:ride/constant/style.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 '../../../constant/colors.dart';
|
||||||
import '../../../controller/home/map_page_controller.dart';
|
import '../../../controller/home/map_page_controller.dart';
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
|
|||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
import 'package:get/get_rx/src/rx_typedefs/rx_typedefs.dart';
|
import 'package:get/get_rx/src/rx_typedefs/rx_typedefs.dart';
|
||||||
import 'package:ride/constant/style.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/my_wallet/passenger_wallet.dart';
|
||||||
import 'package:ride/views/home/profile/order_history.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/promos_passenger_page.dart';
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
import 'package:ride/constant/table_names.dart';
|
import 'package:ride/constant/table_names.dart';
|
||||||
import 'package:ride/models/db_sql.dart';
|
|
||||||
|
|
||||||
import '../../../constant/colors.dart';
|
import '../../../constant/colors.dart';
|
||||||
import '../../../constant/style.dart';
|
import '../../../constant/style.dart';
|
||||||
|
|||||||
@@ -3,8 +3,6 @@ import 'package:get/get.dart';
|
|||||||
import 'package:ride/constant/colors.dart';
|
import 'package:ride/constant/colors.dart';
|
||||||
|
|
||||||
import '../../constant/box_name.dart';
|
import '../../constant/box_name.dart';
|
||||||
import '../../constant/links.dart';
|
|
||||||
import '../../controller/functions/crud.dart';
|
|
||||||
import '../../main.dart';
|
import '../../main.dart';
|
||||||
import '../widgets/my_scafold.dart';
|
import '../widgets/my_scafold.dart';
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user