nouffer/rog_app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated cp start back to minus one and auto center timer to 10 sec

Browse Source
This commit is contained in:
Mohamed Nouffer
2024-03-05 12:20:24 +05:30
parent eaee1ce820
commit cd258744fc
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/pages/destination/destination_controller.dart
View File

@ -180,6 +180,7 @@ class DestinationController extends GetxController {
photos.clear(); photos.clear();
if (shouldShowBottomSheet) { if (shouldShowBottomSheet) {
shouldShowBottomSheet = false; shouldShowBottomSheet = false;
if (d.cp == -1) return;
await showModalBottomSheet( await showModalBottomSheet(
constraints: constraints:
BoxConstraints.loose(Size(Get.width, Get.height * 0.75)), BoxConstraints.loose(Size(Get.width, Get.height * 0.75)),
@ -208,7 +209,7 @@ class DestinationController extends GetxController {
isAtStart.value = true; isAtStart.value = true;
if (shouldShowBottomSheet) { if (shouldShowBottomSheet) {
shouldShowBottomSheet = false; shouldShowBottomSheet = false;
if (d.cp == 0) return; if (d.cp == -1) return;
await showModalBottomSheet( await showModalBottomSheet(
constraints: constraints:
BoxConstraints.loose(Size(Get.width, Get.height * 0.85)), BoxConstraints.loose(Size(Get.width, Get.height * 0.85)),
@ -231,7 +232,7 @@ class DestinationController extends GetxController {
isInCheckin.value = true; isInCheckin.value = true;
if (shouldShowBottomSheet) { if (shouldShowBottomSheet) {
shouldShowBottomSheet = false; shouldShowBottomSheet = false;
if (d.cp == 0) return; if (d.cp == -1) return;
await showModalBottomSheet( await showModalBottomSheet(
constraints: constraints:
BoxConstraints.loose(Size(Get.width, Get.height * 0.75)), BoxConstraints.loose(Size(Get.width, Get.height * 0.75)),
@ -279,7 +280,7 @@ class DestinationController extends GetxController {
// print("--- calling checkin ---"); // print("--- calling checkin ---");
if (shouldShowBottomSheet) { if (shouldShowBottomSheet) {
shouldShowBottomSheet = false; shouldShowBottomSheet = false;
if (d.cp == 0) return; if (d.cp == -1) return;
await showModalBottomSheet( await showModalBottomSheet(
constraints: constraints:
BoxConstraints.loose(Size(Get.width, Get.height * 0.75)), BoxConstraints.loose(Size(Get.width, Get.height * 0.75)),
@ -301,7 +302,7 @@ class DestinationController extends GetxController {
isInCheckin.value = true; isInCheckin.value = true;
if (shouldShowBottomSheet) { if (shouldShowBottomSheet) {
shouldShowBottomSheet = false; shouldShowBottomSheet = false;
if (d.cp == 0) return; if (d.cp == -1) return;
await showMaterialModalBottomSheet( await showMaterialModalBottomSheet(
expand: true, expand: true,
context: Get.context!, context: Get.context!,
@ -331,7 +332,7 @@ class DestinationController extends GetxController {
//print("--- open buy point $buyPointImageAdded ${d.buypoint_image} ----"); //print("--- open buy point $buyPointImageAdded ${d.buypoint_image} ----");
if (shouldShowBottomSheet) { if (shouldShowBottomSheet) {
shouldShowBottomSheet = false; shouldShowBottomSheet = false;
if (d.cp == 0) return; if (d.cp == -1) return;
await showModalBottomSheet( await showModalBottomSheet(
constraints: constraints:
BoxConstraints.loose(Size(Get.width, Get.height * 0.75)), BoxConstraints.loose(Size(Get.width, Get.height * 0.75)),
@ -370,7 +371,7 @@ class DestinationController extends GetxController {
photos.clear(); photos.clear();
if (shouldShowBottomSheet) { if (shouldShowBottomSheet) {
shouldShowBottomSheet = false; shouldShowBottomSheet = false;
if (d.cp == 0) return; if (d.cp == -1) return;
await showModalBottomSheet( await showModalBottomSheet(
constraints: constraints:
BoxConstraints.loose(Size(Get.width, Get.height * 0.75)), BoxConstraints.loose(Size(Get.width, Get.height * 0.75)),
@ -395,7 +396,7 @@ class DestinationController extends GetxController {
isAtStart.value = true; isAtStart.value = true;
if (shouldShowBottomSheet) { if (shouldShowBottomSheet) {
shouldShowBottomSheet = false; shouldShowBottomSheet = false;
if (d.cp == 0) return; if (d.cp == -1) return;
await showModalBottomSheet( await showModalBottomSheet(
constraints: constraints:
BoxConstraints.loose(Size(Get.width, Get.height * 0.75)), BoxConstraints.loose(Size(Get.width, Get.height * 0.75)),

4
lib/widgets/bottom_sheet_new.dart
View File

@ -31,8 +31,8 @@ class BottomSheetNew extends GetView<BottomSheetController> {
Image getImage() { Image getImage() {
String serverUrl = ConstValues.currentServer(); String serverUrl = ConstValues.currentServer();
if (indexController.rogMode == 1) { if (indexController.rogMode == 1) {
//print("----- rogaining mode 1");
if (indexController.currentDestinationFeature.isEmpty || if (indexController.currentDestinationFeature.isEmpty ||
indexController.currentDestinationFeature[0].photos! == "") { indexController.currentDestinationFeature[0].photos! == "") {
return const Image(image: AssetImage('assets/images/empty_image.png')); return const Image(image: AssetImage('assets/images/empty_image.png'));
@ -63,7 +63,7 @@ class BottomSheetNew extends GetView<BottomSheetController> {
} }
} else { } else {
GeoJSONFeature gf = indexController.currentFeature[0]; GeoJSONFeature gf = indexController.currentFeature[0];
//print("=== photo sss ${gf.properties!["photos"]}"); print("=== photo sss ${gf.properties!["photos"]}");
if (gf.properties!["photos"] == null || gf.properties!["photos"] == "") { if (gf.properties!["photos"] == null || gf.properties!["photos"] == "") {
return const Image(image: AssetImage('assets/images/empty_image.png')); return const Image(image: AssetImage('assets/images/empty_image.png'));
} else { } else {

7
lib/widgets/map_widget.dart
View File

@ -88,7 +88,7 @@ class _MapWidgetState extends State<MapWidget> {
Icons.circle, Icons.circle,
size: 6.0, size: 6.0,
), ),
i.properties!['cp'] == -1 || i.properties!['cp'] == 0 i.properties!['cp'] == -1
? Transform.translate( ? Transform.translate(
offset: Offset(18, 0), offset: Offset(18, 0),
child: Transform.rotate( child: Transform.rotate(
@ -167,8 +167,7 @@ class _MapWidgetState extends State<MapWidget> {
} }
void _startIdleTimer() { void _startIdleTimer() {
_timer = _timer = Timer(const Duration(milliseconds: (1000 * 10)), _centerMapOnUser);
Timer(const Duration(milliseconds: (1000 * 60 * 10)), _centerMapOnUser);
} }
void _resetTimer() { void _resetTimer() {
@ -180,7 +179,7 @@ class _MapWidgetState extends State<MapWidget> {
indexController.mapController.move( indexController.mapController.move(
LatLng( LatLng(
destinationController.currentLat, destinationController.currentLon), destinationController.currentLat, destinationController.currentLon),
15.0); 17.0);
} }
@override @override