Erweiterungen

lib/content_views/task_list_page.dart

@@ -3,8 +3,10 @@ import 'package:flutter/services.dart';
 import 'package:intl/intl.dart';
 import 'package:isar/isar.dart';
 import 'package:kumi_popup_window/kumi_popup_window.dart';
+import 'package:stadtbote/content_views/tour_list_page.dart';
 import 'package:stadtbote/content_views/utils/content_view_widget.dart';
 import 'package:stadtbote/content_views/utils/header_info.dart';
+import 'package:stadtbote/messages/PopContentViewMessage.dart';
 import 'package:stadtbote/model/job.dart';
 import 'package:stadtbote/model/job_tour.dart';
 import 'package:stadtbote/popups/tasks_popups/arrived_popup.dart';
@@ -19,6 +21,7 @@ import 'package:stadtbote/protocoll_messages/accept_job_message.dart';
 import 'package:stadtbote/protocoll_messages/fin_task_message.dart';
 import 'package:stadtbote/protocoll_messages/fin_tour_message.dart';
 import 'package:stadtbote/tools/constants.dart';
+import 'package:stadtbote/tools/message_service.dart';
 import 'package:stadtbote/tools/mqtt_core.dart';
 
 import '../main.dart';
@@ -337,7 +340,7 @@ class _TaskListPageState extends State<TaskListPage> {
     SystemChrome.setPreferredOrientations([DeviceOrientation.landscapeLeft]);
 
     Future.delayed(const Duration(seconds: 1), () async {
-      _popup = showSignaturePopup(context, taskInfo, () {
+      showSignaturePopup(context, taskInfo, () {
         taskInfo.completed = true;
 
         SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
@@ -346,7 +349,7 @@ class _TaskListPageState extends State<TaskListPage> {
 
         _finishTaskProcessing(taskInfo);
 
-        _popup.dismiss(context);
+        MessageService().publish<PopContentViewMessage>(Constants.messageTopicPopContentView, arguments: PopContentViewMessage(count: 2));
       });
     });
   }
@@ -425,7 +428,5 @@ class _TaskListPageState extends State<TaskListPage> {
     await MyApp.isarInstance.writeTxn(() async {
       await MyApp.isarInstance.jobs.put(widget.job);
     });
-
-    Navigator.of(context).popUntil((route) => route.isFirst);
   }
 }