Erweiterungen und cleanup

lib/content_views/accepted_jobs_page.dart

@@ -5,7 +5,6 @@ import 'package:stadtbote/content_views/tour_list_page.dart';
 import 'package:stadtbote/content_views/utils/content_view_widget.dart';
 import 'package:intl/intl.dart';
 import 'package:stadtbote/messages/pop_content_view_message.dart';
-import 'package:stadtbote/tools/message_service.dart';
 
 import '../main.dart';
 import '../model/job.dart';

lib/content_views/approach_area_page.dart

@@ -10,9 +10,7 @@ import 'package:stadtbote/model/rank.dart';
 import 'package:stadtbote/popups/tasks_popups/zip_popup.dart';
 import 'package:stadtbote/protocoll_messages/zip_message.dart';
 import 'package:stadtbote/tools/constants.dart';
-import 'package:stadtbote/tools/message_service.dart';
 import 'package:stadtbote/tools/messages/publish_payload_message.dart';
-import 'package:stadtbote/tools/messages/ranking_updated.dart';
 import 'package:badges/badges.dart' as badges;
 
 import '../tools/util.dart';
@@ -31,7 +29,7 @@ class ApproachAreaPage extends ContentViewWidget {
   }
 }
 
-class _ApproachAreaPageState extends State<ApproachAreaPage> with ProducerMixin{
+class _ApproachAreaPageState extends State<ApproachAreaPage> with ProducerMixin, ConsumerMixin {
   late Ranking? _ranking;
 
   late bool _initCompleted = false;
@@ -51,14 +49,6 @@ class _ApproachAreaPageState extends State<ApproachAreaPage> with ProducerMixin{
     _initMessages();
   }
 
-  @override
-  void deactivate() {
-    super.deactivate();
-
-    // TODO MESSAGING
-    //MessageService().unsubscribe(Constants.messageTopicRankingUpdated, this);
-  }
-
   @override
   Widget build(BuildContext context) {
     if (!_initCompleted) {
@@ -213,12 +203,14 @@ class _ApproachAreaPageState extends State<ApproachAreaPage> with ProducerMixin{
   }
 
   _initMessages() {
-    // TODO MESSAGING
-    sendMessage(
-      routingKey: Constants.messageTopicPopContentView,
-      payload: PopContentViewMessage(count: 1),
-    );
+    subscribe(
+      queueId: Constants.messageTopicRankingUpdated,
+      callback: (message) async {
+        _ranking = await MyApp.isarInstance.rankings.where().findFirst();
 
+        setState(() {});
+      },
+    );
     /*MessageService().subscribe<RankingUpdated>(Constants.messageTopicRankingUpdated, this, (rankingUpdateMessage) async {
       _ranking = await MyApp.isarInstance.rankings.where().findFirst();
 

lib/content_views/assigned_jobs_page.dart

@@ -10,7 +10,6 @@ import 'package:badges/badges.dart' as badges;
 import 'package:stadtbote/messages/pop_content_view_message.dart';
 import 'package:stadtbote/protocoll_messages/accept_job_message.dart';
 import 'package:stadtbote/protocoll_messages/fin_task_message.dart';
-import 'package:stadtbote/tools/message_service.dart';
 import 'package:stadtbote/tools/messages/publish_payload_message.dart';
 import 'package:stadtbote/tools/messages/refresh_badges_message.dart';
 

lib/content_views/finished_jobs_page.dart

@@ -5,7 +5,6 @@ import 'package:stadtbote/content_views/tour_list_page.dart';
 import 'package:stadtbote/content_views/utils/content_view_widget.dart';
 import 'package:intl/intl.dart';
 import 'package:stadtbote/messages/pop_content_view_message.dart';
-import 'package:stadtbote/tools/message_service.dart';
 
 import '../main.dart';
 import '../model/job.dart';

lib/content_views/main_page.dart

@@ -16,17 +16,11 @@ import 'package:stadtbote/model/session_status.dart';
 import 'package:stadtbote/popups/infos_popup.dart';
 import 'package:stadtbote/protocoll_messages/logout_message.dart';
 import 'package:stadtbote/tools/constants.dart';
-import 'package:stadtbote/tools/message_service.dart';
-import 'package:stadtbote/tools/messages/job_deleted_message.dart';
 import 'package:stadtbote/tools/messages/job_received_message.dart';
-import 'package:stadtbote/tools/messages/message_message.dart';
 import 'package:stadtbote/tools/messages/publish_payload_message.dart';
 import 'package:stadtbote/tools/messages/connect_client_message.dart';
 import 'package:stadtbote/tools/messages/disconnect_client_message.dart';
-import 'package:stadtbote/tools/messages/refresh_badges_message.dart';
-import 'package:stadtbote/tools/messages/session_info_update.dart';
 import 'package:badges/badges.dart' as badges;
-import 'package:stadtbote/tools/messages/status_info_update.dart';
 import 'package:stadtbote/tools/util.dart';
 
 class MainPage extends ContentViewWidget {

lib/content_views/messages_page.dart

@@ -12,7 +12,6 @@ import 'package:stadtbote/model/chat_message.dart' as sbmessage;
 import 'package:stadtbote/model/chat_message.dart';
 import 'package:stadtbote/model/session_status.dart';
 import 'package:stadtbote/tools/constants.dart';
-import 'package:stadtbote/tools/message_service.dart';
 import 'package:stadtbote/tools/messages/publish_payload_message.dart';
 
 import '../tools/util.dart';

lib/content_views/task_list_page.dart

@@ -24,7 +24,6 @@ import 'package:stadtbote/protocoll_messages/fin_task_message.dart';
 import 'package:stadtbote/protocoll_messages/fin_tour_message.dart';
 import 'package:stadtbote/protocoll_messages/pic_message.dart';
 import 'package:stadtbote/tools/constants.dart';
-import 'package:stadtbote/tools/message_service.dart';
 import 'package:stadtbote/tools/messages/publish_payload_message.dart';
 
 import '../main.dart';

lib/content_views/tour_details_page.dart

@@ -4,7 +4,6 @@ import 'package:stadtbote/content_views/task_list_page.dart';
 import 'package:stadtbote/content_views/utils/content_view_widget.dart';
 import 'package:stadtbote/messages/pop_content_view_message.dart';
 import 'package:stadtbote/model/job_tour.dart';
-import 'package:stadtbote/tools/message_service.dart';
 
 import '../model/job.dart';
 import '../popups/map_popup.dart';

lib/content_views/tour_list_page.dart

@@ -5,7 +5,6 @@ import 'package:stadtbote/content_views/utils/content_view_widget.dart';
 import 'package:stadtbote/messages/pop_content_view_message.dart';
 import 'package:stadtbote/model/job_tour.dart';
 import 'package:stadtbote/popups/map_popup.dart';
-import 'package:stadtbote/tools/message_service.dart';
 
 import '../model/job.dart';
 import '../tools/constants.dart';