#700

2024-09-11 09:37:02 +02:00
1 parent f89ca690c8
commit 96544ca924
@@ -7,78 +7,38 @@ import 'package:stadtbote/content_views/assigned_jobs_page.dart';
 import 'package:stadtbote/content_views/finished_jobs_page.dart';
 import 'package:stadtbote/content_views/messages_page.dart';
 import 'package:stadtbote/content_views/utils/content_view_widget.dart';
-import 'package:stadtbote/content_views/utils/header_info.dart';
+import 'package:stadtbote/main.dart';
 import 'package:stadtbote/model/job.dart';
+import 'package:stadtbote/model/location_status.dart';
 import 'package:stadtbote/model/message.dart';
 import 'package:stadtbote/model/session_status.dart';
-import 'package:stadtbote/model/location_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/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/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/messages/refresh_badges_message.dart';
-
-import '../main.dart';
-import '../tools/constants.dart';
-import '../tools/util.dart';
+import 'package:stadtbote/tools/util.dart';

 class MainPage extends ContentViewWidget {
-  final ValueNotifier<String> _zipValueNotifier = ValueNotifier("-----");
-  final ValueNotifier<String> sidValueNotifier = ValueNotifier("-----");
-
-  MainPage({super.key});
+  const MainPage({super.key});

  @override
  State<MainPage> createState() => _MainPageState();

  @override
-  Future<HeaderInfo> getHeaderInfo(BuildContext context) async {
-    return HeaderInfo(
-        titleWidget: Container(
-          height: 100,
-          padding: const EdgeInsets.symmetric(horizontal: 5, vertical: 0),
-          child: Column(children: [
-            ValueListenableBuilder<String>(
-              valueListenable: _zipValueNotifier,
-              builder: (context, value, child) {
-                return Text(
-                  value,
-                  style: const TextStyle(
-                    color: Colors.white,
-                    fontSize: 25.0,
-                  ),
-                );
-              },
-            ),
-            const SizedBox(height: 5),
-            ValueListenableBuilder<String>(
-              valueListenable: sidValueNotifier,
-              builder: (context, value, child) {
-                return Text(
-                  value,
-                  style: const TextStyle(
-                    color: Colors.white,
-                    fontSize: 25.0,
-                  ),
-                );
-              },
-            ),
-          ]),
-        ),
-        rightButtonEnabled: true,
-        rightButtonVisible: true,
-        rightButtonImage: Util.fetchFutureIcon(const Icon(Icons.info_outline, size: 20.0, color: Colors.white)),
-        rightButtonOnPressed: () async {
-          showInfosPopup(await MyApp.isarInstance.sessionStatus.where().findFirst());
-        });
+  Future<Widget> getHeaderWidget(BuildContext context) async {
+    await Future.delayed(const Duration(microseconds: 0));
+
+    return _HeaderWidget();
  }
 }

@@ -93,8 +53,6 @@ class _MainPageState extends State<MainPage> {
  void initState() {
    super.initState();

-    _updateHeader();
-
    _refreshBadges();

    _initMessages();
@@ -144,7 +102,8 @@ class _MainPageState extends State<MainPage> {
                          'Zugewiesene Aufträge',
                          image: Image.asset('assets/zugewiesene_auftraege.png', width: 30, height: 30),
                          () async => {
-                                await MessageService().publish<ContentViewWidget>(Constants.messageTopicPushContentView, arguments: const AssignedJobsPage())
+                                await MessageService()
+                                    .publish<ContentViewWidget>(Constants.messageTopicPushContentView, arguments: const AssignedJobsPage())
                              }),
                    );
                  },
@@ -177,7 +136,8 @@ class _MainPageState extends State<MainPage> {
                            'Angenommene Aufträge',
                            image: Image.asset('assets/angenommene_auftraege.png', width: 30, height: 30),
                            () async => {
-                                  await MessageService().publish<ContentViewWidget>(Constants.messageTopicPushContentView, arguments: const AcceptedJobsPage())
+                                  await MessageService()
+                                      .publish<ContentViewWidget>(Constants.messageTopicPushContentView, arguments: const AcceptedJobsPage())
                                }));
                  },
                ),
@@ -188,7 +148,10 @@ class _MainPageState extends State<MainPage> {
                child: getDefaultButton(
                    'Erledigte Aufträge',
                    image: Image.asset('assets/erledigte_auftraege.png', width: 30, height: 30),
-                    () async => {await MessageService().publish<ContentViewWidget>(Constants.messageTopicPushContentView, arguments: const FinishedJobsPage())}),
+                    () async => {
+                          await MessageService()
+                              .publish<ContentViewWidget>(Constants.messageTopicPushContentView, arguments: const FinishedJobsPage())
+                        }),
              ),
              SizedBox(height: _loggedOut == true ? 0 : 20),
              Visibility(
@@ -216,8 +179,10 @@ class _MainPageState extends State<MainPage> {
                        child: getDefaultButton(
                            'Nachrichten',
                            image: Image.asset('assets/nachrichten.png', width: 30, height: 30),
-                            () async =>
-                                {await MessageService().publish<ContentViewWidget>(Constants.messageTopicPushContentView, arguments: const MessagesPage())}));
+                            () async => {
+                                  await MessageService()
+                                      .publish<ContentViewWidget>(Constants.messageTopicPushContentView, arguments: const MessagesPage())
+                                }));
                  },
                ),
              ),
@@ -227,15 +192,16 @@ class _MainPageState extends State<MainPage> {
                child: getDefaultButton(
                    'Anfahrtsbereich',
                    image: Image.asset('assets/anfahrtsbereich.png', width: 30, height: 30),
-                    () async => {await MessageService().publish<ContentViewWidget>(Constants.messageTopicPushContentView, arguments: const ApproachAreaPage())}),
+                    () async => {
+                          await MessageService()
+                              .publish<ContentViewWidget>(Constants.messageTopicPushContentView, arguments: const ApproachAreaPage())
+                        }),
              ),
              SizedBox(height: _loggedOut == true ? 0 : 20),
-              getDefaultButton(
-                  _loggedOut ? 'Anmelden' : 'Abmelden',
-                  image: Image.asset(_loggedOut ? 'assets/anmelden.png' : 'assets/abmelden.png', width: 30, height: 30),
-                  () async {
-                    _logout(context);
-                  }),
+              getDefaultButton(_loggedOut ? 'Anmelden' : 'Abmelden',
+                  image: Image.asset(_loggedOut ? 'assets/anmelden.png' : 'assets/abmelden.png', width: 30, height: 30), () async {
+                _logout(context);
+              }),
              Expanded(
                child: Container(
                  decoration: BoxDecoration(
@@ -260,14 +226,6 @@ class _MainPageState extends State<MainPage> {
  }

  _initMessages() {
-    MessageService().subscribe<SessionStatusInfoUpdate>(Constants.messageTopicSessionStatusInfoUpdate, this, (sessionStatusInfoUpdateMessage) {
-      widget.sidValueNotifier.value = sessionStatusInfoUpdateMessage.status.sid;
-    });
-
-    MessageService().subscribe<LocationStatusUpdate>(Constants.messageTopicLocationStatusUpdated, this, (statusInfoUpdateMessage) {
-      _updateHeader();
-    });
-
    MessageService().subscribe<JobReceivedMessage>(Constants.messageTopicJobReceived, this, (JobReceivedMessage jobReceivedMessage) {
      _jobReceived(jobReceivedMessage.job);
    });
@@ -286,9 +244,7 @@ class _MainPageState extends State<MainPage> {
  }

  void _exitMessages() {
-    MessageService().unsubscribe<SessionStatusInfoUpdate>(Constants.messageTopicSessionStatusInfoUpdate, this);
-
-    MessageService().unsubscribe<SessionStatusInfoUpdate>(Constants.messageTopicJobReceived, this);
+    MessageService().unsubscribeAll(this);
  }

  void _refreshBadges() async {
@@ -301,19 +257,6 @@ class _MainPageState extends State<MainPage> {
    _refreshBadges();
  }

-  void _updateHeader() async {
-    var status = await MyApp.isarInstance.locationStatus.where().findFirst();
-    var sessionStatus = await MyApp.isarInstance.sessionStatus.where().findFirst();
-
-    if (status != null) {
-      widget._zipValueNotifier.value = '${status.zip} (${status.zipReal})';
-    } else if (sessionStatus != null) {
-      widget._zipValueNotifier.value = sessionStatus.locZip;
-    } else {
-      widget._zipValueNotifier.value = "---";
-    }
-  }
-
  _logout(context) async {
    if (!_loggedOut) {
      showLogoutAlertDialog(context);
@@ -341,7 +284,6 @@ class _MainPageState extends State<MainPage> {
        await MessageService().publish<DisconnectClientMessage>(Constants.messageTopicDisconnectClient, arguments: DisconnectClientMessage());

        Future.delayed(const Duration(seconds: 5), () async {
-
          Navigator.of(context).pop();

          setState(() {});
@@ -361,7 +303,8 @@ class _MainPageState extends State<MainPage> {
      title: const Text("Warnung"),
      content: const Text("Wollen Sie sich wirklich abmelden?"),
      actions: [
-        yesButton, noButton,
+        yesButton,
+        noButton,
      ],
    );

@@ -386,6 +329,207 @@ class _MainPageState extends State<MainPage> {
      logoutMessage.pos!.acc = position.accuracy.toInt();
    }

-    await MessageService().publish<PublishPayloadMessage>(Constants.messageTopicPublishPayload, arguments: PublishPayloadMessage(topic: "logout", message: logoutMessage.toJson(), qos: MqttQos.exactlyOnce));
+    await MessageService().publish<PublishPayloadMessage>(Constants.messageTopicPublishPayload,
+        arguments: PublishPayloadMessage(topic: "logout", message: logoutMessage.toJson(), qos: MqttQos.exactlyOnce));
+  }
+}
+
+class _HeaderWidget extends StatefulWidget {
+  @override
+  State<_HeaderWidget> createState() => _HeaderWidgetState();
+}
+
+class _HeaderWidgetState extends State<_HeaderWidget> {
+  final ValueNotifier<String> _zipValueNotifier = ValueNotifier("-----");
+  final ValueNotifier<String> _zipRealValueNotifier = ValueNotifier("-----");
+  final ValueNotifier<String> _sidValueNotifier = ValueNotifier("-----");
+
+  @override
+  void initState() {
+    super.initState();
+
+    _updateHeader();
+
+    _initMessages();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    var cellWidth = (MediaQuery.of(context).size.width - 60 - 60 - 25) / 2;
+
+    return Padding(
+      padding: const EdgeInsets.all(8),
+      child: Stack(
+        alignment: Alignment.center,
+        children: [
+          Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              Visibility(
+                visible: false,
+                child: Container(
+                  width: 60,
+                  height: 60,
+                  decoration: const BoxDecoration(
+                    shape: BoxShape.circle,
+                    color: Colors.white,
+                  ),
+                  child: FittedBox(
+                    child: GestureDetector(
+                      onTap: () async {
+                      },
+                      child: const CircleAvatar(
+                        radius: 10,
+                        backgroundColor: Constants.colorPrimary,
+                        child: Padding(padding: EdgeInsets.all(1.0), child: Icon(Icons.info_outline, size: 20.0, color: Colors.white)),
+                      ),
+                    ),
+                  ),
+                ),
+              ),
+              Visibility(
+                visible: true,
+                child: Container(
+                  width: 60,
+                  height: 60,
+                  decoration: const BoxDecoration(
+                    shape: BoxShape.circle,
+                    color: Colors.red,
+                  ),
+                  child: FittedBox(
+                    child: GestureDetector(
+                      onTap: () async {
+                        var sessionStatus = await MyApp.isarInstance.sessionStatus.where().findFirst();
+
+                        showInfosPopup(sessionStatus);
+                      },
+                      child: const CircleAvatar(
+                        backgroundColor: Constants.colorPrimary,
+                        radius: 10,
+                        child: Padding(padding: EdgeInsets.all(1.0), child: Icon(Icons.info_outline, size: 20.0, color: Colors.white))),
+                      ),
+                    ),
+                  ),
+                ),
+            ],
+          ),
+          SizedBox(
+            height: 100,
+            width: cellWidth * 2,
+            child: Column(
+              children: [
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween, // Verteilt die Texte gleichmäßig in der Zeile
+                  children: <Widget>[
+                    SizedBox(
+                      width: cellWidth,
+                      child: const Text(
+                        'Meldung',
+                        textAlign: TextAlign.center,
+                        style: TextStyle(fontSize: 11, color: Colors.white),
+                      ),
+                    ),
+                    SizedBox(
+                      width: cellWidth,
+                      child: const Text(
+                        'Ortung',
+                        textAlign: TextAlign.center,
+                        style: TextStyle(fontSize: 11, color: Colors.white),
+                      ),
+                    ),
+                  ],
+                ),
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween, // Verteilt die Texte gleichmäßig in der Zeile
+                  children: <Widget>[
+                    SizedBox(
+                      width: cellWidth,
+                      child: ValueListenableBuilder<String>(
+                        valueListenable: _zipValueNotifier,
+                        builder: (context, value, child) {
+                          return Text(
+                            textAlign: TextAlign.center,
+                            value,
+                            style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 18, color: Colors.white),
+                          );
+                        },
+                      )
+                    ),
+                    SizedBox(
+                      width: cellWidth,
+                      child: ValueListenableBuilder<String>(
+                        valueListenable: _zipRealValueNotifier,
+                        builder: (context, value, child) {
+                          return Text(
+                            textAlign: TextAlign.center,
+                            value,
+                            style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 18, color: Colors.white),
+                          );
+                        },
+                      ),
+                    ),
+                  ],
+                ),
+                Column(
+                  children: [
+                    const Text(
+                      'Kurierkennung',
+                      textAlign: TextAlign.center,
+                      style: TextStyle(fontSize: 11, color: Colors.white),
+                    ),
+                    ValueListenableBuilder<String>(
+                      valueListenable: _sidValueNotifier,
+                      builder: (context, value, child) {
+                        return Text(
+                          textAlign: TextAlign.center,
+                          value,
+                          style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 18, color: Colors.white),
+                        );
+                      },
+                    ),
+                  ],
+                )
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  _initMessages() {
+    MessageService().subscribe<SessionStatusInfoUpdate>(Constants.messageTopicSessionStatusInfoUpdate, this, (sessionStatusInfoUpdateMessage) {
+      _updateHeader();
+    });
+
+    MessageService().subscribe<LocationStatusUpdate>(Constants.messageTopicLocationStatusUpdated, this, (statusInfoUpdateMessage) {
+      _updateHeader();
+    });
+  }
+
+  _updateHeader() async {
+    var status = await MyApp.isarInstance.locationStatus.where().findFirst();
+    var sessionStatus = await MyApp.isarInstance.sessionStatus.where().findFirst();
+
+    if (status != null) {
+      _zipValueNotifier.value = status.zip;
+      _zipRealValueNotifier.value = status.zipReal;
+    } else if (sessionStatus != null) {
+      _zipValueNotifier.value = sessionStatus.locZip;
+      _zipRealValueNotifier.value = '---';
+    } else {
+      _zipValueNotifier.value = '---';
+      _zipRealValueNotifier.value = '---';
+    }
+    if (sessionStatus != null) {
+      _sidValueNotifier.value = sessionStatus.sid;
+    }
+
+    /*
+    rightButtonImage: Util.fetchFutureIcon(const Icon(Icons.info_outline, size: 20.0, color: Colors.white)),
+        rightButtonOnPressed: () async {
+          showInfosPopup(await MyApp.isarInstance.sessionStatus.where().findFirst());
+        });
+     */
  }
 }