diff --git a/lib/pages/destination_map/destination_map_page.dart b/lib/pages/destination_map/destination_map_page.dart index e2c9f41..35b2b96 100644 --- a/lib/pages/destination_map/destination_map_page.dart +++ b/lib/pages/destination_map/destination_map_page.dart @@ -64,7 +64,10 @@ class DestinationMapPage extends StatelessWidget { showModalBottomSheet(context: Get.context!, isScrollControlled: true, builder:((context) => BottomSheetNew()) - ); + ).whenComplete((){ + print("---- set skip gps to false -----"); + destinationController.skip_gps = false; + }); } }, child: Row( diff --git a/lib/widgets/bottom_sheet_new.dart b/lib/widgets/bottom_sheet_new.dart index ba5ecac..2a23004 100644 --- a/lib/widgets/bottom_sheet_new.dart +++ b/lib/widgets/bottom_sheet_new.dart @@ -102,8 +102,10 @@ class BottomSheetNew extends GetView { } } + @override Widget build(BuildContext context) { + destinationController.skip_gps = true; print('---- rog_mode ----- ${indexController.rog_mode} -----'); return indexController.rog_mode == 0 ? detailsSheet(context) : destinationSheet(context); } diff --git a/lib/widgets/map_widget.dart b/lib/widgets/map_widget.dart index 4482782..90fa391 100644 --- a/lib/widgets/map_widget.dart +++ b/lib/widgets/map_widget.dart @@ -7,6 +7,7 @@ import 'package:geojson/geojson.dart'; import 'package:get/get.dart'; import 'package:get/get_state_manager/get_state_manager.dart'; import 'package:latlong2/latlong.dart'; +import 'package:rogapp/pages/destination/destination_controller.dart'; import 'package:rogapp/pages/index/index_controller.dart'; import 'package:rogapp/utils/text_util.dart'; import 'package:rogapp/widgets/base_layer_widget.dart'; @@ -16,6 +17,7 @@ import 'package:rogapp/widgets/bottom_sheet_widget.dart'; class MapWidget extends StatelessWidget { final IndexController indexController = Get.find(); + final DestinationController destinationController = Get.find(); MapWidget({ Key? key}) : super(key: key); @@ -44,7 +46,9 @@ class MapWidget extends StatelessWidget { isDismissible: true, builder:((context) => BottomSheetNew()) //builder:((context) => BottomSheetWidget()) - ); + ).whenComplete((){ + destinationController.skip_gps = false; + }); }