Erweiterungen

lib/content_views/accepted_jobs_page.dart

@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_broadcast_receiver/flutter_broadcast_receiver.dart';
 import 'package:isar/isar.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:intl/intl.dart';
+import 'package:stadtbote/tools/message_service.dart';
 
 import '../main.dart';
 import '../model/job.dart';
@@ -131,6 +131,6 @@ class _AcceptedJobsPageState extends State<AcceptedJobsPage> {
   }
 
   void _clicked(Job job) {
-    BroadcastReceiver().publish<ContentViewWidget>(Constants.messageTopicPushContentView, arguments: TourListPage(job: job));
+    MessageService().publish<ContentViewWidget>(Constants.messageTopicPushContentView, arguments: TourListPage(job: job));
   }
 }

lib/content_views/finished_jobs_page.dart

@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_broadcast_receiver/flutter_broadcast_receiver.dart';
 import 'package:isar/isar.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:intl/intl.dart';
+import 'package:stadtbote/tools/message_service.dart';
 
 import '../main.dart';
 import '../model/job.dart';
@@ -131,6 +131,6 @@ class _FinishedJobsPageState extends State<FinishedJobsPage> {
   }
 
   void _clicked(Job job) {
-    BroadcastReceiver().publish<ContentViewWidget>(Constants.messageTopicPushContentView, arguments: TourListPage(job: job, readOnly: true,));
+    MessageService().publish<ContentViewWidget>(Constants.messageTopicPushContentView, arguments: TourListPage(job: job, readOnly: true,));
   }
 }

lib/content_views/main_page.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_broadcast_receiver/flutter_broadcast_receiver.dart';
 import 'package:isar/isar.dart';
 import 'package:stadtbote/content_views/accepted_jobs_page.dart';
 import 'package:stadtbote/content_views/assigned_jobs_page.dart';
@@ -11,6 +10,7 @@ import 'package:stadtbote/model/job.dart';
 import 'package:stadtbote/model/status.dart';
 import 'package:stadtbote/popups/accept_jobs_popup.dart';
 import 'package:stadtbote/popups/infos_popup.dart';
+import 'package:stadtbote/tools/message_service.dart';
 import 'package:stadtbote/tools/messages/job_received_message.dart';
 import 'package:stadtbote/tools/messages/session_info_update.dart';
 import 'package:badges/badges.dart' as badges;
@@ -131,7 +131,7 @@ class _MainPageState extends State<MainPage> {
                     child: getDefaultButton(
                         'Zugewiesene Aufträge',
                         image: Image.asset('assets/zugewiesene_auftraege.png', width: 30, height: 30),
-                        () => {BroadcastReceiver()
+                        () => {MessageService()
                             .publish<ContentViewWidget>(Constants.messageTopicPushContentView, arguments: const AssignedJobsPage())}),
                   );
                 },
@@ -161,7 +161,7 @@ class _MainPageState extends State<MainPage> {
                           'Angenommene Aufträge',
                           image: Image.asset('assets/angenommene_auftraege.png', width: 30, height: 30),
                           () => {
-                                BroadcastReceiver()
+                            MessageService()
                                     .publish<ContentViewWidget>(Constants.messageTopicPushContentView, arguments: const AcceptedJobsPage())
                               }));
                 },
@@ -170,7 +170,7 @@ class _MainPageState extends State<MainPage> {
               getDefaultButton(
                   'Erledigte Aufträge',
                   image: Image.asset('assets/erledigte_auftraege.png', width: 30, height: 30),
-                  () => {BroadcastReceiver().publish<ContentViewWidget>(Constants.messageTopicPushContentView, arguments: const FinishedJobsPage())}),
+                  () => {MessageService().publish<ContentViewWidget>(Constants.messageTopicPushContentView, arguments: const FinishedJobsPage())}),
               const SizedBox(height: 20),
               ValueListenableBuilder<int>(
                 valueListenable: _messagesValueNotifier,
@@ -196,7 +196,7 @@ class _MainPageState extends State<MainPage> {
                           'Nachrichten',
                           image: Image.asset('assets/nachrichten.png', width: 30, height: 30),
                           () => {
-                                BroadcastReceiver().publish<ContentViewWidget>(Constants.messageTopicPushContentView, arguments: const MessagesPage())
+                            MessageService().publish<ContentViewWidget>(Constants.messageTopicPushContentView, arguments: const MessagesPage())
                               }));
                 },
               ),
@@ -252,19 +252,19 @@ class _MainPageState extends State<MainPage> {
   }*/
 
   _initMessages() {
-    BroadcastReceiver().subscribe<StatusInfoUpdate>(Constants.messageTopicStatusInfoUpdate, (statusInfoUpdateMessage) {
+    MessageService().subscribe<StatusInfoUpdate>(Constants.messageTopicStatusInfoUpdate, (statusInfoUpdateMessage) {
       widget.sidValueNotifier.value = statusInfoUpdateMessage.status.sid;
     });
 
-    BroadcastReceiver().subscribe<JobReceivedMessage>(Constants.messageTopicJobReceived, (JobReceivedMessage jobReceivedMessage) {
+    MessageService().subscribe<JobReceivedMessage>(Constants.messageTopicJobReceived, (JobReceivedMessage jobReceivedMessage) {
       _jobReceived(jobReceivedMessage.job);
     });
   }
 
   void _exitMessages() {
-    BroadcastReceiver().unsubscribe<StatusInfoUpdate>(Constants.messageTopicStatusInfoUpdate);
+    MessageService().unsubscribe<StatusInfoUpdate>(Constants.messageTopicStatusInfoUpdate);
 
-    BroadcastReceiver().unsubscribe<StatusInfoUpdate>(Constants.messageTopicJobReceived);
+    MessageService().unsubscribe<StatusInfoUpdate>(Constants.messageTopicJobReceived);
   }
 
   void _refreshBadges() async {

lib/content_views/tour_details_page.dart

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_broadcast_receiver/flutter_broadcast_receiver.dart';
 import 'package:stadtbote/content_views/task_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/model/job_tour.dart';
+import 'package:stadtbote/tools/message_service.dart';
 
 import '../model/job.dart';
 import '../popups/map_popup.dart';
@@ -142,7 +142,7 @@ class _TourDetailsPageState extends State<TourDetailsPage> {
           const SizedBox(height: 10),
           getDefaultButton('Weiter', () =>
           {
-            BroadcastReceiver().publish<ContentViewWidget>(Constants.messageTopicPushContentView, arguments: TaskListPage(tour: widget.tour, readOnly: widget.readOnly))
+            MessageService().publish<ContentViewWidget>(Constants.messageTopicPushContentView, arguments: TaskListPage(tour: widget.tour, readOnly: widget.readOnly))
           }),
         ],
       ),

lib/content_views/tour_list_page.dart

@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_broadcast_receiver/flutter_broadcast_receiver.dart';
 import 'package:stadtbote/content_views/tour_details_page.dart';
 import 'package:stadtbote/content_views/utils/content_view_widget.dart';
 import 'package:stadtbote/content_views/utils/header_info.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';
@@ -194,7 +194,7 @@ class _TourListPageState extends State<TourListPage> {
 
   void _clicked(JobTour tour) {
     if (tour.state == 0) {
-      BroadcastReceiver().publish<ContentViewWidget>(Constants.messageTopicPushContentView, arguments: TourDetailsPage(job: widget.job, tour: tour, readOnly: widget.readOnly));
+      MessageService().publish<ContentViewWidget>(Constants.messageTopicPushContentView, arguments: TourDetailsPage(job: widget.job, tour: tour, readOnly: widget.readOnly));
     }
   }
 }

lib/main.dart

@@ -1,7 +1,6 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
-import 'package:flutter_broadcast_receiver/flutter_broadcast_receiver.dart';
 import 'package:geolocator/geolocator.dart';
 import 'package:isar/isar.dart';
 import 'package:path_provider/path_provider.dart';
@@ -11,6 +10,7 @@ import 'package:stadtbote/popups/accept_jobs_popup.dart';
 import 'package:stadtbote/tools/colored_safe_area.dart';
 import 'package:stadtbote/model/status.dart';
 import 'package:stadtbote/tools/connection_status.dart';
+import 'package:stadtbote/tools/message_service.dart';
 import 'package:stadtbote/tools/messages/job_received_message.dart';
 
 import 'tools/mqtt_core.dart';
@@ -304,22 +304,22 @@ class _MainState extends State<Main> with SingleTickerProviderStateMixin {
   }
 
   void _initMessages() {
-    BroadcastReceiver().subscribe<ContentViewWidget>(Constants.messageTopicPushContentView, (ContentViewWidget widget) {
+    MessageService().subscribe<ContentViewWidget>(Constants.messageTopicPushContentView, (ContentViewWidget widget) {
       _pushContentView(widget);
     });
-    BroadcastReceiver().subscribe<ContentViewWidget>(Constants.messageTopicPopContentView, (ContentViewWidget widget) {
+    MessageService().subscribe<ContentViewWidget>(Constants.messageTopicPopContentView, (ContentViewWidget widget) {
       _popContentView();
     });
-    BroadcastReceiver().subscribe<ContentViewWidget>(Constants.messageTopicReplaceContentView, (ContentViewWidget widget) {
+    MessageService().subscribe<ContentViewWidget>(Constants.messageTopicReplaceContentView, (ContentViewWidget widget) {
       _replaceContentView(widget);
     });
-    BroadcastReceiver().subscribe<bool>(Constants.messageTopicHideRightButton, (hideButton) {
+    MessageService().subscribe<bool>(Constants.messageTopicHideRightButton, (hideButton) {
       _hideRightButton(hideButton);
     });
-    BroadcastReceiver().subscribe<ConnectionStatus>(Constants.messageTopicConnectionStatusChanged, (ConnectionStatus connectionStatus) {
+    MessageService().subscribe<ConnectionStatus>(Constants.messageTopicConnectionStatusChanged, (ConnectionStatus connectionStatus) {
       _connectionStatusChanged(connectionStatus);
     });
-    BroadcastReceiver().subscribe<JobReceivedMessage>(Constants.messageTopicJobReceived, (JobReceivedMessage jobReceivedMessage) {
+    MessageService().subscribe<JobReceivedMessage>(Constants.messageTopicJobReceived, (JobReceivedMessage jobReceivedMessage) {
       _jobReceived(jobReceivedMessage.job);
     });
   }

lib/tools/message_service.dart

@@ -0,0 +1,92 @@
+typedef EventHandler<T> = void Function(T args);
+
+/// The Custom Events Service that can publish data
+/// from one module/component to another.
+class MessageService {
+  static final MessageService _singleton = new MessageService._internal();
+
+  Map<String, dynamic> _callbackMaps = Map<String, dynamic>();
+
+  factory MessageService() {
+    return _singleton;
+  }
+
+  MessageService._internal();
+
+  /// Subscribe to an event topic. Events that
+  /// get posted to that topic will trigger
+  /// the provided handler
+  /// * [topic] The topic to subscribe to
+  /// * [handler] The event handler
+  subscribe<T>(String topic, EventHandler<T>? handler) {
+    List<EventHandler<T>>? handlers = _callbackMaps[topic];
+    if (handler == null) {
+      _callbackMaps.remove(topic);
+      return;
+    }
+    if (handlers == null) {
+      handlers = [];
+      _callbackMaps[topic] = handlers;
+    }
+    handlers.add(handler);
+  }
+
+  /// Unsubscribe from the given topic. Your handler
+  /// will no longer recieve events published to this
+  /// topic
+  /// * [topic] The topic to unsubscribe from
+  /// * [handler] The event handler
+  unsubscribe<T>(String topic, {EventHandler<T>? handler}) {
+    if (handler == null) {
+      _callbackMaps.remove(topic);
+      return;
+    }
+
+    final handlers = _callbackMaps[topic];
+    if (handlers == null) {
+      return;
+    }
+
+    // We now need to remove specific handler
+    final handlerIndex = handlers.indexOf(handler);
+
+    if (handlerIndex >= 0) {
+      handlers.removeAt(handlerIndex);
+      if (handlers.length == 0) {
+        _callbackMaps.remove(topic);
+      }
+    }
+  }
+
+  /// Publish an Event to given topic.
+  /// * [topic] The topic to publish to
+  /// * [arguments] The arguments to pass to
+  /// the handlers. It's better if custom
+  /// Structure is used.
+  publish<T>(String topic, {T? arguments}) {
+    List<EventHandler<T>>? handlers;
+    try {
+      handlers = _callbackMaps[topic];
+    } catch (_) {
+      throw FormatException(
+          'Type mismatch between Publisher Arguments and what Subscriber Expects');
+    }
+
+    if (handlers == null || handlers.isEmpty) {
+      return;
+    }
+
+    handlers.forEach((EventHandler<T> handler) {
+      try {
+        if (arguments != null) {
+          handler(arguments);
+        } else {
+          throw 'arguments null';
+        }
+      } catch (_) {
+        print('Error Occured while executing handler for topic $topic');
+        print(_);
+      }
+    });
+  }
+}

lib/tools/mqtt_core.dart

@@ -2,7 +2,6 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:math';
 
-import 'package:flutter_broadcast_receiver/flutter_broadcast_receiver.dart';
 import 'package:isar/isar.dart';
 import 'package:mqtt_client/mqtt_client.dart';
 import 'package:mqtt_client/mqtt_server_client.dart';
@@ -16,6 +15,7 @@ import 'package:stadtbote/protocoll_messages/payload_container.dart';
 import 'package:stadtbote/protocoll_messages/start_session_message.dart';
 import 'package:stadtbote/protocoll_messages/sync_jobs_message.dart';
 import 'package:stadtbote/tools/connection_status.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';
@@ -90,7 +90,7 @@ class MqttCore {
       } else {
         Util.logInfo('Verbindung zum MQTT-Broker fehlgeschlagen!');
 
-        BroadcastReceiver().publish<ConnectionStatus>(Constants.messageTopicConnectionStatusChanged, arguments: ConnectionStatus(status: ConnectionStatusEnum.notConnected));
+        MessageService().publish<ConnectionStatus>(Constants.messageTopicConnectionStatusChanged, arguments: ConnectionStatus(status: ConnectionStatusEnum.notConnected));
 
         _startReconnectTimer();
       }
@@ -100,7 +100,7 @@ class MqttCore {
 
       Util.logInfo('Verbindung zum MQTT-Broker fehlgeschlagen!: $ex');
 
-      BroadcastReceiver().publish<ConnectionStatus>(Constants.messageTopicConnectionStatusChanged, arguments: ConnectionStatus(status: ConnectionStatusEnum.notConnected));
+      MessageService().publish<ConnectionStatus>(Constants.messageTopicConnectionStatusChanged, arguments: ConnectionStatus(status: ConnectionStatusEnum.notConnected));
     }
   }
 
@@ -194,7 +194,7 @@ class MqttCore {
     _mqttClient.subscribe(_fromServerTopic, MqttQos.exactlyOnce);
     Util.logInfo('subscribed to topic: $_fromServerTopic');
 
-    BroadcastReceiver().publish<ConnectionStatus>(Constants.messageTopicConnectionStatusChanged, arguments: ConnectionStatus(status: ConnectionStatusEnum.connected));
+    MessageService().publish<ConnectionStatus>(Constants.messageTopicConnectionStatusChanged, arguments: ConnectionStatus(status: ConnectionStatusEnum.connected));
   }
 
   void _sessionMessageReceived(payloadData) async {
@@ -208,7 +208,7 @@ class MqttCore {
       await MyApp.isarInstance.status.put(statusMessage);
     });
 
-    BroadcastReceiver().publish<StatusInfoUpdate>(Constants.messageTopicStatusInfoUpdate, arguments: StatusInfoUpdate(status: statusMessage));
+    MessageService().publish<StatusInfoUpdate>(Constants.messageTopicStatusInfoUpdate, arguments: StatusInfoUpdate(status: statusMessage));
   }
 
   void _rankingMessageReceived(payloadData) async {
@@ -231,7 +231,7 @@ class MqttCore {
         MyApp.isarInstance.jobs.putSync(newJob);
       });
 
-      BroadcastReceiver().publish<JobReceivedMessage>(Constants.messageTopicJobReceived, arguments: JobReceivedMessage(job: newJob));
+      MessageService().publish<JobReceivedMessage>(Constants.messageTopicJobReceived, arguments: JobReceivedMessage(job: newJob));
     }
   }
 
@@ -245,7 +245,7 @@ class MqttCore {
         await MyApp.isarInstance.jobs.delete(jobId);
       });
 
-      BroadcastReceiver().publish<JobDeletedMessage>(Constants.messageTopicJobDeleted, arguments: JobDeletedMessage(jobId: jobId));
+      MessageService().publish<JobDeletedMessage>(Constants.messageTopicJobDeleted, arguments: JobDeletedMessage(jobId: jobId));
     }
   }
 
@@ -270,7 +270,7 @@ class MqttCore {
       await MyApp.isarInstance.messages.put(newMessage);
     });
 
-    BroadcastReceiver().publish<MessageReceivedMessage>(Constants.messageTopicMessageReceived, arguments: MessageReceivedMessage(message: newMessage));
+    MessageService().publish<MessageReceivedMessage>(Constants.messageTopicMessageReceived, arguments: MessageReceivedMessage(message: newMessage));
   }
 
   void _startReconnectTimer() {
@@ -290,7 +290,7 @@ class MqttCore {
 
     Util.logInfo("_clientDisconnected called");
 
-    BroadcastReceiver().publish<ConnectionStatus>(Constants.messageTopicConnectionStatusChanged, arguments: ConnectionStatus(status: ConnectionStatusEnum.notConnected));
+    MessageService().publish<ConnectionStatus>(Constants.messageTopicConnectionStatusChanged, arguments: ConnectionStatus(status: ConnectionStatusEnum.notConnected));
 
     _startReconnectTimer();
   }