From dcf7d4363dc1cb6a25c4a1af4556a3dd73be1e50 Mon Sep 17 00:00:00 2001 From: Mohamed Nouffer Date: Thu, 26 Jan 2023 10:57:44 +0530 Subject: [PATCH] update goal --- lib/pages/camera/camera_page.dart | 9 +++++---- pubspec.yaml | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/pages/camera/camera_page.dart b/lib/pages/camera/camera_page.dart index 2e6d8b6..fc92f07 100644 --- a/lib/pages/camera/camera_page.dart +++ b/lib/pages/camera/camera_page.dart @@ -3,6 +3,7 @@ import 'package:get/get.dart'; import 'package:intl/intl.dart'; import 'package:rogapp/pages/destination/destination_controller.dart'; import 'package:rogapp/pages/index/index_controller.dart'; +import 'package:rogapp/routes/app_pages.dart'; import 'package:rogapp/services/external_service.dart'; class CameraPage extends StatelessWidget { @@ -51,7 +52,7 @@ class CameraPage extends StatelessWidget { ExternalService().makeGoal(user_id, _token, _team, destinationController.photos[0].path, formattedDate, _event_code).then((value){ print("---called ext api ${value['status']} ------"); if(value['status'] == 'OK'){ - Get.back(); + Get.off(AppPages.TRAVEL); destinationController.skip_gps = false; Get.snackbar("目標が保存されました", "目標が正常に追加されました"); destinationController.resetRogaining(); @@ -88,7 +89,7 @@ class CameraPage extends StatelessWidget { onPressed: (){ destinationController.makeCheckin(indexController.currentDestinationFeature[0], true, destinationController.photos[0].path); - Get.back(); + Get.off(AppPages.TRAVEL); destinationController.rogaining_counted.value = true; destinationController.skip_gps = false; destinationController.is_photo_shoot.value = false; @@ -187,7 +188,7 @@ class StartRogaining extends StatelessWidget { SizedBox(height: 40.0,), ElevatedButton( onPressed: (){ - Get.back(); + Get.off(AppPages.TRAVEL); destinationController.skip_gps = false; }, child: Text("Back"), @@ -220,7 +221,7 @@ class NotAtGoal extends StatelessWidget { SizedBox(height: 40.0,), ElevatedButton( onPressed: (){ - Get.back(); + Get.off(AppPages.TRAVEL); destinationController.skip_gps = false; }, child: Text("Back"), diff --git a/pubspec.yaml b/pubspec.yaml index cd7ca87..a5b6596 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.0.5+5 +version: 1.0.6+6 environment: sdk: ">=2.16.0 <3.0.0"