Refactoring

lib/popups/infos_popup.dart

@@ -1,9 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:stadtbote/main.dart';
 import 'package:stadtbote/model/session_status.dart';
+import 'package:stadtbote/tools/connection_status.dart';
 import 'package:stadtbote/tools/constants.dart';
 import 'package:stadtbote/tools/message_service.dart';
-import 'package:stadtbote/tools/mqtt_core.dart';
+import 'package:stadtbote/tools/messages/current_connection_status_message.dart';
+import 'package:stadtbote/tools/messages/request_connection_status_message.dart';
 import 'package:stadtbote/tools/util.dart';
 
 void showInfosPopup(BuildContext context, SessionStatus? status) async {
@@ -12,7 +14,8 @@ void showInfosPopup(BuildContext context, SessionStatus? status) async {
   late String connectedString = "Bitte warten...";
 
   Future.delayed(const Duration(seconds: 2), () async {
-    MessageService().publish<RequestConnectionStatusMessage>(Constants.messageTopicRequestConnectionStatus, arguments: RequestConnectionStatusMessage());
+    MessageService()
+        .publish<RequestConnectionStatusMessage>(Constants.messageTopicRequestConnectionStatus, arguments: RequestConnectionStatusMessage());
   });
 
   void unsubscribeMessages() {
@@ -52,14 +55,20 @@ void showInfosPopup(BuildContext context, SessionStatus? status) async {
                     text += "Keine Informationen gefunden";
                   }
 
-  await showDialog(
+                  MessageService().subscribe<CurrentConnectionStatusMessage>(Constants.messageTopicCurrentConnectionStatus, version,
-      context: context,
+                      (CurrentConnectionStatusMessage currentConnectionStatusMessage) async {
-      builder: (BuildContext context) {
+                    connectedString = currentConnectionStatusMessage.state ? "Verbunden" : "NICHT verbunden";
-        return AlertDialog(
+
-            contentPadding: EdgeInsets.zero,
+                    if (context.mounted) setState(() {});
-            shadowColor: Colors.transparent,
+                  });
-            backgroundColor: Colors.white,
+
-            content: StatefulBuilder(builder: (BuildContext context, StateSetter setState) {
+                  MessageService().subscribe<ConnectionStatus>(Constants.messageTopicConnectionStatusChanged, version,
+                      (ConnectionStatus connectionStatus) async {
+                    connectedString = connectionStatus.status == ConnectionStatusEnum.connected ? "Verbunden" : "NICHT verbunden";
+
+                    if (context.mounted) setState(() {});
+                  });
+
                   return SizedBox(
                       key: GlobalKey(),
                       height: 350,
@@ -81,12 +90,16 @@ void showInfosPopup(BuildContext context, SessionStatus? status) async {
                               Expanded(child: Text(text, textAlign: TextAlign.left)),
                               getDefaultButton(
                                 'OK',
-                            () => {Navigator.pop(context)},
+                                () {
+                                  unsubscribeMessages();
+
+                                  Navigator.pop(context);
+                                },
                               ),
                             ],
                           ),
                         ),
                       ));
-            }));
+                })));
       });
 }

lib/tools/messages/RequestConnectionStatusMessage.dart

@@ -0,0 +1,3 @@
+class RequestConnectionStatusMessage {
+  RequestConnectionStatusMessage();
+}