From fcb3ecdbb4d70f3990332dc533232430f5725aa8 Mon Sep 17 00:00:00 2001 From: Sven Carstensen Date: Tue, 2 Sep 2025 11:35:37 +0200 Subject: [PATCH] Fehlerkorrekturen und Erweiterungen --- .../reply/index-2025-02-26T11-39-13-0732.json | 92 ------------------- .../3.22.1-g37088a8/CMakeSystem.cmake | 15 --- .../reply/index-2025-02-26T11-39-14-0469.json | 92 ------------------- .../3.22.1-g37088a8/CMakeSystem.cmake | 15 --- .../reply/index-2025-02-26T11-39-14-0722.json | 92 ------------------- .../3.22.1-g37088a8/CMakeSystem.cmake | 15 --- .../reply/index-2025-02-26T11-39-14-0962.json | 92 ------------------- .../3.22.1-g37088a8/CMakeSystem.cmake | 15 --- lib/content_views/task_list_page.dart | 20 ++-- lib/popups/tasks_popups/arrived_popup.dart | 2 +- .../tasks_popups/commision_number_popup.dart | 2 +- .../pickup_delivery_status_popup.dart | 2 +- .../tasks_popups/receipt_giver_popup.dart | 2 +- lib/popups/tasks_popups/signature_popup.dart | 2 +- .../tasks_popups/station_notice_popup.dart | 2 +- .../tasks_popups/take_photos_popup.dart | 2 +- lib/popups/tasks_popups/zip_popup.dart | 2 +- 17 files changed, 22 insertions(+), 442 deletions(-) delete mode 100644 android/app/.cxx/Debug/2a1172u2/arm64-v8a/.cmake/api/v1/reply/index-2025-02-26T11-39-13-0732.json delete mode 100644 android/app/.cxx/Debug/2a1172u2/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CMakeSystem.cmake delete mode 100644 android/app/.cxx/Debug/2a1172u2/armeabi-v7a/.cmake/api/v1/reply/index-2025-02-26T11-39-14-0469.json delete mode 100644 android/app/.cxx/Debug/2a1172u2/armeabi-v7a/CMakeFiles/3.22.1-g37088a8/CMakeSystem.cmake delete mode 100644 android/app/.cxx/Debug/2a1172u2/x86/.cmake/api/v1/reply/index-2025-02-26T11-39-14-0722.json delete mode 100644 android/app/.cxx/Debug/2a1172u2/x86/CMakeFiles/3.22.1-g37088a8/CMakeSystem.cmake delete mode 100644 android/app/.cxx/Debug/2a1172u2/x86_64/.cmake/api/v1/reply/index-2025-02-26T11-39-14-0962.json delete mode 100644 android/app/.cxx/Debug/2a1172u2/x86_64/CMakeFiles/3.22.1-g37088a8/CMakeSystem.cmake diff --git a/android/app/.cxx/Debug/2a1172u2/arm64-v8a/.cmake/api/v1/reply/index-2025-02-26T11-39-13-0732.json b/android/app/.cxx/Debug/2a1172u2/arm64-v8a/.cmake/api/v1/reply/index-2025-02-26T11-39-13-0732.json deleted file mode 100644 index 07af0bf..0000000 --- a/android/app/.cxx/Debug/2a1172u2/arm64-v8a/.cmake/api/v1/reply/index-2025-02-26T11-39-13-0732.json +++ /dev/null @@ -1,92 +0,0 @@ -{ - "cmake" : - { - "generator" : - { - "multiConfig" : false, - "name" : "Ninja" - }, - "paths" : - { - "cmake" : "/Users/svencarstensen/Library/Android/sdk/cmake/3.22.1/bin/cmake", - "cpack" : "/Users/svencarstensen/Library/Android/sdk/cmake/3.22.1/bin/cpack", - "ctest" : "/Users/svencarstensen/Library/Android/sdk/cmake/3.22.1/bin/ctest", - "root" : "/Users/svencarstensen/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22" - }, - "version" : - { - "isDirty" : false, - "major" : 3, - "minor" : 22, - "patch" : 1, - "string" : "3.22.1-g37088a8", - "suffix" : "g37088a8" - } - }, - "objects" : - [ - { - "jsonFile" : "codemodel-v2-3b1919ad0feace28094d.json", - "kind" : "codemodel", - "version" : - { - "major" : 2, - "minor" : 3 - } - }, - { - "jsonFile" : "cache-v2-b1ae28bb951fb7fa9806.json", - "kind" : "cache", - "version" : - { - "major" : 2, - "minor" : 0 - } - }, - { - "jsonFile" : "cmakeFiles-v1-4136774c1467998798b4.json", - "kind" : "cmakeFiles", - "version" : - { - "major" : 1, - "minor" : 0 - } - } - ], - "reply" : - { - "client-agp" : - { - "cache-v2" : - { - "jsonFile" : "cache-v2-b1ae28bb951fb7fa9806.json", - "kind" : "cache", - "version" : - { - "major" : 2, - "minor" : 0 - } - }, - "cmakeFiles-v1" : - { - "jsonFile" : "cmakeFiles-v1-4136774c1467998798b4.json", - "kind" : "cmakeFiles", - "version" : - { - "major" : 1, - "minor" : 0 - } - }, - "codemodel-v2" : - { - "jsonFile" : "codemodel-v2-3b1919ad0feace28094d.json", - "kind" : "codemodel", - "version" : - { - "major" : 2, - "minor" : 3 - } - } - } - } -} diff --git a/android/app/.cxx/Debug/2a1172u2/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CMakeSystem.cmake b/android/app/.cxx/Debug/2a1172u2/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CMakeSystem.cmake deleted file mode 100644 index 45175f6..0000000 --- a/android/app/.cxx/Debug/2a1172u2/arm64-v8a/CMakeFiles/3.22.1-g37088a8/CMakeSystem.cmake +++ /dev/null @@ -1,15 +0,0 @@ -set(CMAKE_HOST_SYSTEM "Darwin-24.3.0") -set(CMAKE_HOST_SYSTEM_NAME "Darwin") -set(CMAKE_HOST_SYSTEM_VERSION "24.3.0") -set(CMAKE_HOST_SYSTEM_PROCESSOR "arm64") - -include("/Users/svencarstensen/Library/Android/sdk/ndk/26.3.11579264/build/cmake/android.toolchain.cmake") - -set(CMAKE_SYSTEM "Android-1") -set(CMAKE_SYSTEM_NAME "Android") -set(CMAKE_SYSTEM_VERSION "1") -set(CMAKE_SYSTEM_PROCESSOR "aarch64") - -set(CMAKE_CROSSCOMPILING "TRUE") - -set(CMAKE_SYSTEM_LOADED 1) diff --git a/android/app/.cxx/Debug/2a1172u2/armeabi-v7a/.cmake/api/v1/reply/index-2025-02-26T11-39-14-0469.json b/android/app/.cxx/Debug/2a1172u2/armeabi-v7a/.cmake/api/v1/reply/index-2025-02-26T11-39-14-0469.json deleted file mode 100644 index b3f29fd..0000000 --- a/android/app/.cxx/Debug/2a1172u2/armeabi-v7a/.cmake/api/v1/reply/index-2025-02-26T11-39-14-0469.json +++ /dev/null @@ -1,92 +0,0 @@ -{ - "cmake" : - { - "generator" : - { - "multiConfig" : false, - "name" : "Ninja" - }, - "paths" : - { - "cmake" : "/Users/svencarstensen/Library/Android/sdk/cmake/3.22.1/bin/cmake", - "cpack" : "/Users/svencarstensen/Library/Android/sdk/cmake/3.22.1/bin/cpack", - "ctest" : "/Users/svencarstensen/Library/Android/sdk/cmake/3.22.1/bin/ctest", - "root" : "/Users/svencarstensen/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22" - }, - "version" : - { - "isDirty" : false, - "major" : 3, - "minor" : 22, - "patch" : 1, - "string" : "3.22.1-g37088a8", - "suffix" : "g37088a8" - } - }, - "objects" : - [ - { - "jsonFile" : "codemodel-v2-d01317a0accf1a7231c5.json", - "kind" : "codemodel", - "version" : - { - "major" : 2, - "minor" : 3 - } - }, - { - "jsonFile" : "cache-v2-db11ab8f8a940e1ed792.json", - "kind" : "cache", - "version" : - { - "major" : 2, - "minor" : 0 - } - }, - { - "jsonFile" : "cmakeFiles-v1-e827c7cc57f910f51aff.json", - "kind" : "cmakeFiles", - "version" : - { - "major" : 1, - "minor" : 0 - } - } - ], - "reply" : - { - "client-agp" : - { - "cache-v2" : - { - "jsonFile" : "cache-v2-db11ab8f8a940e1ed792.json", - "kind" : "cache", - "version" : - { - "major" : 2, - "minor" : 0 - } - }, - "cmakeFiles-v1" : - { - "jsonFile" : "cmakeFiles-v1-e827c7cc57f910f51aff.json", - "kind" : "cmakeFiles", - "version" : - { - "major" : 1, - "minor" : 0 - } - }, - "codemodel-v2" : - { - "jsonFile" : "codemodel-v2-d01317a0accf1a7231c5.json", - "kind" : "codemodel", - "version" : - { - "major" : 2, - "minor" : 3 - } - } - } - } -} diff --git a/android/app/.cxx/Debug/2a1172u2/armeabi-v7a/CMakeFiles/3.22.1-g37088a8/CMakeSystem.cmake b/android/app/.cxx/Debug/2a1172u2/armeabi-v7a/CMakeFiles/3.22.1-g37088a8/CMakeSystem.cmake deleted file mode 100644 index 8709029..0000000 --- a/android/app/.cxx/Debug/2a1172u2/armeabi-v7a/CMakeFiles/3.22.1-g37088a8/CMakeSystem.cmake +++ /dev/null @@ -1,15 +0,0 @@ -set(CMAKE_HOST_SYSTEM "Darwin-24.3.0") -set(CMAKE_HOST_SYSTEM_NAME "Darwin") -set(CMAKE_HOST_SYSTEM_VERSION "24.3.0") -set(CMAKE_HOST_SYSTEM_PROCESSOR "arm64") - -include("/Users/svencarstensen/Library/Android/sdk/ndk/26.3.11579264/build/cmake/android.toolchain.cmake") - -set(CMAKE_SYSTEM "Android-1") -set(CMAKE_SYSTEM_NAME "Android") -set(CMAKE_SYSTEM_VERSION "1") -set(CMAKE_SYSTEM_PROCESSOR "armv7-a") - -set(CMAKE_CROSSCOMPILING "TRUE") - -set(CMAKE_SYSTEM_LOADED 1) diff --git a/android/app/.cxx/Debug/2a1172u2/x86/.cmake/api/v1/reply/index-2025-02-26T11-39-14-0722.json b/android/app/.cxx/Debug/2a1172u2/x86/.cmake/api/v1/reply/index-2025-02-26T11-39-14-0722.json deleted file mode 100644 index 68d7588..0000000 --- a/android/app/.cxx/Debug/2a1172u2/x86/.cmake/api/v1/reply/index-2025-02-26T11-39-14-0722.json +++ /dev/null @@ -1,92 +0,0 @@ -{ - "cmake" : - { - "generator" : - { - "multiConfig" : false, - "name" : "Ninja" - }, - "paths" : - { - "cmake" : "/Users/svencarstensen/Library/Android/sdk/cmake/3.22.1/bin/cmake", - "cpack" : "/Users/svencarstensen/Library/Android/sdk/cmake/3.22.1/bin/cpack", - "ctest" : "/Users/svencarstensen/Library/Android/sdk/cmake/3.22.1/bin/ctest", - "root" : "/Users/svencarstensen/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22" - }, - "version" : - { - "isDirty" : false, - "major" : 3, - "minor" : 22, - "patch" : 1, - "string" : "3.22.1-g37088a8", - "suffix" : "g37088a8" - } - }, - "objects" : - [ - { - "jsonFile" : "codemodel-v2-4d80a8a940d7a69a4b74.json", - "kind" : "codemodel", - "version" : - { - "major" : 2, - "minor" : 3 - } - }, - { - "jsonFile" : "cache-v2-5c8774f7fe661cf8c673.json", - "kind" : "cache", - "version" : - { - "major" : 2, - "minor" : 0 - } - }, - { - "jsonFile" : "cmakeFiles-v1-cf1a4d8cd36f16199d07.json", - "kind" : "cmakeFiles", - "version" : - { - "major" : 1, - "minor" : 0 - } - } - ], - "reply" : - { - "client-agp" : - { - "cache-v2" : - { - "jsonFile" : "cache-v2-5c8774f7fe661cf8c673.json", - "kind" : "cache", - "version" : - { - "major" : 2, - "minor" : 0 - } - }, - "cmakeFiles-v1" : - { - "jsonFile" : "cmakeFiles-v1-cf1a4d8cd36f16199d07.json", - "kind" : "cmakeFiles", - "version" : - { - "major" : 1, - "minor" : 0 - } - }, - "codemodel-v2" : - { - "jsonFile" : "codemodel-v2-4d80a8a940d7a69a4b74.json", - "kind" : "codemodel", - "version" : - { - "major" : 2, - "minor" : 3 - } - } - } - } -} diff --git a/android/app/.cxx/Debug/2a1172u2/x86/CMakeFiles/3.22.1-g37088a8/CMakeSystem.cmake b/android/app/.cxx/Debug/2a1172u2/x86/CMakeFiles/3.22.1-g37088a8/CMakeSystem.cmake deleted file mode 100644 index 23c0010..0000000 --- a/android/app/.cxx/Debug/2a1172u2/x86/CMakeFiles/3.22.1-g37088a8/CMakeSystem.cmake +++ /dev/null @@ -1,15 +0,0 @@ -set(CMAKE_HOST_SYSTEM "Darwin-24.3.0") -set(CMAKE_HOST_SYSTEM_NAME "Darwin") -set(CMAKE_HOST_SYSTEM_VERSION "24.3.0") -set(CMAKE_HOST_SYSTEM_PROCESSOR "arm64") - -include("/Users/svencarstensen/Library/Android/sdk/ndk/26.3.11579264/build/cmake/android.toolchain.cmake") - -set(CMAKE_SYSTEM "Android-1") -set(CMAKE_SYSTEM_NAME "Android") -set(CMAKE_SYSTEM_VERSION "1") -set(CMAKE_SYSTEM_PROCESSOR "i686") - -set(CMAKE_CROSSCOMPILING "TRUE") - -set(CMAKE_SYSTEM_LOADED 1) diff --git a/android/app/.cxx/Debug/2a1172u2/x86_64/.cmake/api/v1/reply/index-2025-02-26T11-39-14-0962.json b/android/app/.cxx/Debug/2a1172u2/x86_64/.cmake/api/v1/reply/index-2025-02-26T11-39-14-0962.json deleted file mode 100644 index e6398d5..0000000 --- a/android/app/.cxx/Debug/2a1172u2/x86_64/.cmake/api/v1/reply/index-2025-02-26T11-39-14-0962.json +++ /dev/null @@ -1,92 +0,0 @@ -{ - "cmake" : - { - "generator" : - { - "multiConfig" : false, - "name" : "Ninja" - }, - "paths" : - { - "cmake" : "/Users/svencarstensen/Library/Android/sdk/cmake/3.22.1/bin/cmake", - "cpack" : "/Users/svencarstensen/Library/Android/sdk/cmake/3.22.1/bin/cpack", - "ctest" : "/Users/svencarstensen/Library/Android/sdk/cmake/3.22.1/bin/ctest", - "root" : "/Users/svencarstensen/Library/Android/sdk/cmake/3.22.1/share/cmake-3.22" - }, - "version" : - { - "isDirty" : false, - "major" : 3, - "minor" : 22, - "patch" : 1, - "string" : "3.22.1-g37088a8", - "suffix" : "g37088a8" - } - }, - "objects" : - [ - { - "jsonFile" : "codemodel-v2-37ad76214cfbcb034981.json", - "kind" : "codemodel", - "version" : - { - "major" : 2, - "minor" : 3 - } - }, - { - "jsonFile" : "cache-v2-74fe6f938c7e82425fa9.json", - "kind" : "cache", - "version" : - { - "major" : 2, - "minor" : 0 - } - }, - { - "jsonFile" : "cmakeFiles-v1-bee62d12eb1a3cd2f623.json", - "kind" : "cmakeFiles", - "version" : - { - "major" : 1, - "minor" : 0 - } - } - ], - "reply" : - { - "client-agp" : - { - "cache-v2" : - { - "jsonFile" : "cache-v2-74fe6f938c7e82425fa9.json", - "kind" : "cache", - "version" : - { - "major" : 2, - "minor" : 0 - } - }, - "cmakeFiles-v1" : - { - "jsonFile" : "cmakeFiles-v1-bee62d12eb1a3cd2f623.json", - "kind" : "cmakeFiles", - "version" : - { - "major" : 1, - "minor" : 0 - } - }, - "codemodel-v2" : - { - "jsonFile" : "codemodel-v2-37ad76214cfbcb034981.json", - "kind" : "codemodel", - "version" : - { - "major" : 2, - "minor" : 3 - } - } - } - } -} diff --git a/android/app/.cxx/Debug/2a1172u2/x86_64/CMakeFiles/3.22.1-g37088a8/CMakeSystem.cmake b/android/app/.cxx/Debug/2a1172u2/x86_64/CMakeFiles/3.22.1-g37088a8/CMakeSystem.cmake deleted file mode 100644 index f5c04d6..0000000 --- a/android/app/.cxx/Debug/2a1172u2/x86_64/CMakeFiles/3.22.1-g37088a8/CMakeSystem.cmake +++ /dev/null @@ -1,15 +0,0 @@ -set(CMAKE_HOST_SYSTEM "Darwin-24.3.0") -set(CMAKE_HOST_SYSTEM_NAME "Darwin") -set(CMAKE_HOST_SYSTEM_VERSION "24.3.0") -set(CMAKE_HOST_SYSTEM_PROCESSOR "arm64") - -include("/Users/svencarstensen/Library/Android/sdk/ndk/26.3.11579264/build/cmake/android.toolchain.cmake") - -set(CMAKE_SYSTEM "Android-1") -set(CMAKE_SYSTEM_NAME "Android") -set(CMAKE_SYSTEM_VERSION "1") -set(CMAKE_SYSTEM_PROCESSOR "x86_64") - -set(CMAKE_CROSSCOMPILING "TRUE") - -set(CMAKE_SYSTEM_LOADED 1) diff --git a/lib/content_views/task_list_page.dart b/lib/content_views/task_list_page.dart index 066e29c..3de6b29 100644 --- a/lib/content_views/task_list_page.dart +++ b/lib/content_views/task_list_page.dart @@ -258,7 +258,8 @@ class _TaskListPageState extends State with ProducerMixin { Util.logInfo('Task ${taskInfo.task.sId} called'); if (!mounted) return; - showTaskArrivedPopup(context, taskInfo, () async { + final currentContext = context; + showTaskArrivedPopup(currentContext, taskInfo, () async { DateFormat dateFormat = DateFormat("dd.MM.yyyy HH:mm"); var answer = await _createAnswerHeader(taskInfo); @@ -281,7 +282,8 @@ class _TaskListPageState extends State with ProducerMixin { Util.logInfo('Task ${taskInfo.task.sId} called'); if (!mounted) return; - showComissionNumberPopup(context, taskInfo, (comissionNumber) async { + final currentContext = context; + showComissionNumberPopup(currentContext, taskInfo, (comissionNumber) async { var answer = await _createAnswerHeader(taskInfo); answer.val = comissionNumber; @@ -323,7 +325,8 @@ class _TaskListPageState extends State with ProducerMixin { Util.logInfo('Task ${taskInfo.task.sId} called'); if (!mounted) return; - showTakePhotosPopup(context, taskInfo, (List? photos) async { + final currentContext = context; + showTakePhotosPopup(currentContext, taskInfo, (List? photos) async { if (photos != null) { await MyApp.isarInstance.writeTxn(() async { await MyApp.isarInstance.pictures.filter().tourIdEqualTo(widget.tour.id).deleteAll(); @@ -354,7 +357,9 @@ class _TaskListPageState extends State with ProducerMixin { void _processStationNotice(TaskInfo taskInfo) { Util.logInfo('Task ${taskInfo.task.sId} called'); - showStationNoticePopup(context, taskInfo, (notice) async { + if (!mounted) return; + final currentContext = context; + showStationNoticePopup(currentContext, taskInfo, (notice) async { var answer = await _createAnswerHeader(taskInfo); answer.val = notice; @@ -364,7 +369,9 @@ class _TaskListPageState extends State with ProducerMixin { _finishTaskProcessing(taskInfo); - setState(() {}); + if (mounted) { + setState(() {}); + } }); } @@ -372,7 +379,8 @@ class _TaskListPageState extends State with ProducerMixin { Util.logInfo('Task ${taskInfo.task.sId} called'); if (!mounted) return; - showReceiptGiverPopup(context, taskInfo, (receiptGiver, selectedTourEntry) async { + final currentContext = context; + showReceiptGiverPopup(currentContext, taskInfo, (receiptGiver, selectedTourEntry) async { var answer = await _createAnswerHeader(taskInfo); answer.code = selectedTourEntry.code; answer.val = receiptGiver; diff --git a/lib/popups/tasks_popups/arrived_popup.dart b/lib/popups/tasks_popups/arrived_popup.dart index 4d8bbc9..e0cf909 100644 --- a/lib/popups/tasks_popups/arrived_popup.dart +++ b/lib/popups/tasks_popups/arrived_popup.dart @@ -8,7 +8,7 @@ showTaskArrivedPopup(BuildContext context, TaskInfo taskInfo, Function() onFinis builder: (BuildContext context) { return PopScope( canPop: false, - onPopInvoked: (bool didPop) async { + onPopInvokedWithResult: (bool didPop, dynamic result) async { if (!didPop) { final shouldPop = await taskDialogSecurityException(context); if (shouldPop && context.mounted) { diff --git a/lib/popups/tasks_popups/commision_number_popup.dart b/lib/popups/tasks_popups/commision_number_popup.dart index 6900fb5..2f0b2f9 100644 --- a/lib/popups/tasks_popups/commision_number_popup.dart +++ b/lib/popups/tasks_popups/commision_number_popup.dart @@ -9,7 +9,7 @@ showComissionNumberPopup(BuildContext context, TaskInfo taskInfo, Function(Strin builder: (BuildContext context) { return PopScope( canPop: false, - onPopInvoked: (bool didPop) async { + onPopInvokedWithResult: (bool didPop, dynamic result) async { if (!didPop) { final shouldPop = await taskDialogSecurityException(context); if (shouldPop && context.mounted) { diff --git a/lib/popups/tasks_popups/pickup_delivery_status_popup.dart b/lib/popups/tasks_popups/pickup_delivery_status_popup.dart index 9858219..e127b60 100644 --- a/lib/popups/tasks_popups/pickup_delivery_status_popup.dart +++ b/lib/popups/tasks_popups/pickup_delivery_status_popup.dart @@ -20,7 +20,7 @@ showPickupDeliveryStatusPopup(BuildContext context, TaskInfo taskInfo, Function( return PopScope( canPop: false, - onPopInvoked: (bool didPop) async { + onPopInvokedWithResult: (bool didPop, dynamic result) async { if (!didPop) { final shouldPop = await taskDialogSecurityException(context); if (shouldPop && context.mounted) { diff --git a/lib/popups/tasks_popups/receipt_giver_popup.dart b/lib/popups/tasks_popups/receipt_giver_popup.dart index 6f3fa9f..39f74e1 100644 --- a/lib/popups/tasks_popups/receipt_giver_popup.dart +++ b/lib/popups/tasks_popups/receipt_giver_popup.dart @@ -19,7 +19,7 @@ showReceiptGiverPopup(BuildContext context, TaskInfo taskInfo, Function(String, builder: (BuildContext context) { return PopScope( canPop: false, - onPopInvoked: (bool didPop) async { + onPopInvokedWithResult: (bool didPop, dynamic result) async { if (!didPop) { final shouldPop = await taskDialogSecurityException(context); if (shouldPop && context.mounted) { diff --git a/lib/popups/tasks_popups/signature_popup.dart b/lib/popups/tasks_popups/signature_popup.dart index 62ca833..bf2df28 100644 --- a/lib/popups/tasks_popups/signature_popup.dart +++ b/lib/popups/tasks_popups/signature_popup.dart @@ -10,7 +10,7 @@ showSignaturePopup(BuildContext context, TaskInfo taskInfo, Function(String?) on builder: (BuildContext context) { return PopScope( canPop: false, - onPopInvoked: (bool didPop) async { + onPopInvokedWithResult: (bool didPop, dynamic result) async { if (!didPop) { final shouldPop = await taskDialogSecurityException(context); if (shouldPop) { diff --git a/lib/popups/tasks_popups/station_notice_popup.dart b/lib/popups/tasks_popups/station_notice_popup.dart index 867add1..05a7ba9 100644 --- a/lib/popups/tasks_popups/station_notice_popup.dart +++ b/lib/popups/tasks_popups/station_notice_popup.dart @@ -9,7 +9,7 @@ showStationNoticePopup(BuildContext context, TaskInfo taskInfo, Function(String) builder: (BuildContext context) { return PopScope( canPop: false, - onPopInvoked: (bool didPop) async { + onPopInvokedWithResult: (bool didPop, dynamic result) async { if (!didPop) { final shouldPop = await taskDialogSecurityException(context); if (shouldPop && context.mounted) { diff --git a/lib/popups/tasks_popups/take_photos_popup.dart b/lib/popups/tasks_popups/take_photos_popup.dart index a1ef486..838c32d 100644 --- a/lib/popups/tasks_popups/take_photos_popup.dart +++ b/lib/popups/tasks_popups/take_photos_popup.dart @@ -18,7 +18,7 @@ Future showTakePhotosPopup(BuildContext context, TaskInfo taskInfo, Functi builder: (BuildContext context) { return PopScope( canPop: false, - onPopInvoked: (bool didPop) async { + onPopInvokedWithResult: (bool didPop, dynamic result) async { if (!didPop) { final shouldPop = await taskDialogSecurityException(context); if (shouldPop && context.mounted) { diff --git a/lib/popups/tasks_popups/zip_popup.dart b/lib/popups/tasks_popups/zip_popup.dart index b7b7921..07e71ce 100644 --- a/lib/popups/tasks_popups/zip_popup.dart +++ b/lib/popups/tasks_popups/zip_popup.dart @@ -7,7 +7,7 @@ showZipPopup(BuildContext context, String text, String buttonText, Function(Stri builder: (BuildContext context) { return PopScope( canPop: false, - onPopInvoked: (bool didPop) async { + onPopInvokedWithResult: (bool didPop, dynamic result) async { if (!didPop) { final shouldPop = await taskDialogSecurityException(context); if (shouldPop && context.mounted) {