From 52415e0759d2a9ab7578bb2e93c8be11f3ea981c Mon Sep 17 00:00:00 2001 From: Sven Carstensen Date: Wed, 20 Aug 2025 10:56:41 +0200 Subject: [PATCH] Fehlerkorrekturen und Erweiterungen --- .../arm64-v8a/configure_fingerprint.bin | 24 ++++++++--------- .../armeabi-v7a/configure_fingerprint.bin | 24 ++++++++--------- .../2a1172u2/x86/configure_fingerprint.bin | 24 ++++++++--------- .../2a1172u2/x86_64/configure_fingerprint.bin | 24 ++++++++--------- .../arm64-v8a/configure_fingerprint.bin | 24 ++++++++--------- .../armeabi-v7a/configure_fingerprint.bin | 24 ++++++++--------- .../6l395w5m/x86/configure_fingerprint.bin | 24 ++++++++--------- .../6l395w5m/x86_64/configure_fingerprint.bin | 24 ++++++++--------- devtools_options.yaml | 3 +++ lib/content_views/main_page.dart | 26 ++++++++++--------- lib/main.dart | 14 +++++----- lib/model/chat_message.dart | 2 +- lib/model/task_info.dart | 2 +- lib/popups/accept_jobs_popup.dart | 8 +----- lib/tools/constants.dart | 1 + ...er.dart => extended_stateful_builder.dart} | 0 lib/tools/messages/bwv_message.dart | 5 ++++ lib/tools/mqtt_core.dart | 11 +++++--- 18 files changed, 136 insertions(+), 128 deletions(-) create mode 100644 devtools_options.yaml rename lib/tools/{ExtendedStatefulBuilder.dart => extended_stateful_builder.dart} (100%) create mode 100644 lib/tools/messages/bwv_message.dart diff --git a/android/app/.cxx/Debug/2a1172u2/arm64-v8a/configure_fingerprint.bin b/android/app/.cxx/Debug/2a1172u2/arm64-v8a/configure_fingerprint.bin index 4d873cd..cb1ba69 100644 --- a/android/app/.cxx/Debug/2a1172u2/arm64-v8a/configure_fingerprint.bin +++ b/android/app/.cxx/Debug/2a1172u2/arm64-v8a/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Log  /Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/arm64-v8a/additional_project_files.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  ˋ2 +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  Ӱ3  ˋ2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/arm64-v8a/android_gradle_build.json  2 ͋2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/arm64-v8a/android_gradle_build.json  Ӱ3 ͋2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/arm64-v8a/android_gradle_build_mini.json  2 ΋2~ +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/arm64-v8a/android_gradle_build_mini.json  Ӱ3 ΋2~ | -z/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/arm64-v8a/build.ninja  2 2 +z/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/arm64-v8a/build.ninja  Ӱ3 2  -~/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/arm64-v8a/build.ninja.txt  2 +~/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/arm64-v8a/build.ninja.txt  Ӱ3  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/arm64-v8a/build_file_index.txt  2 f ϋ2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/arm64-v8a/build_file_index.txt  Ӱ3 f ϋ2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/arm64-v8a/compile_commands.json  2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/arm64-v8a/compile_commands.json  Ӱ3  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/arm64-v8a/compile_commands.json.bin  2  +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/arm64-v8a/compile_commands.json.bin  Ӱ3   -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/arm64-v8a/metadata_generation_command.txt  2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/arm64-v8a/metadata_generation_command.txt  Ӱ3  ϋ2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/arm64-v8a/prefab_config.json  2  ( ϋ2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/arm64-v8a/prefab_config.json  Ӱ3  ( ϋ2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/arm64-v8a/symbol_folder_index.txt  2  } ϋ2j +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/arm64-v8a/symbol_folder_index.txt  Ӱ3  } ϋ2j h -f/Users/svencarstensen/Entwicklung/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  2  2 \ No newline at end of file +f/Users/svencarstensen/Entwicklung/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  Ӱ3  2 \ No newline at end of file diff --git a/android/app/.cxx/Debug/2a1172u2/armeabi-v7a/configure_fingerprint.bin b/android/app/.cxx/Debug/2a1172u2/armeabi-v7a/configure_fingerprint.bin index c89606e..fd028bc 100644 --- a/android/app/.cxx/Debug/2a1172u2/armeabi-v7a/configure_fingerprint.bin +++ b/android/app/.cxx/Debug/2a1172u2/armeabi-v7a/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Log  /Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/armeabi-v7a/additional_project_files.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  2 +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ݰ3  2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/armeabi-v7a/android_gradle_build.json  2 2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/armeabi-v7a/android_gradle_build.json  ݰ3 2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/armeabi-v7a/android_gradle_build_mini.json  2 2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/armeabi-v7a/android_gradle_build_mini.json  ݰ3 2 ~ -|/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/armeabi-v7a/build.ninja  2 2 +|/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/armeabi-v7a/build.ninja  ݰ3 2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/armeabi-v7a/build.ninja.txt  2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/armeabi-v7a/build.ninja.txt  ݰ3  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/armeabi-v7a/build_file_index.txt  2 f 2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/armeabi-v7a/build_file_index.txt  ݰ3 f 2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/armeabi-v7a/compile_commands.json  2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/armeabi-v7a/compile_commands.json  ݰ3  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/armeabi-v7a/compile_commands.json.bin  2  +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/armeabi-v7a/compile_commands.json.bin  ݰ3   -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/armeabi-v7a/metadata_generation_command.txt  2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/armeabi-v7a/metadata_generation_command.txt  ݰ3  2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/armeabi-v7a/prefab_config.json  2  ( 2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/armeabi-v7a/prefab_config.json  ݰ3  ( 2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/armeabi-v7a/symbol_folder_index.txt  2   2j +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/armeabi-v7a/symbol_folder_index.txt  ݰ3   2j h -f/Users/svencarstensen/Entwicklung/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  2  2 \ No newline at end of file +f/Users/svencarstensen/Entwicklung/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  ݰ3  2 \ No newline at end of file diff --git a/android/app/.cxx/Debug/2a1172u2/x86/configure_fingerprint.bin b/android/app/.cxx/Debug/2a1172u2/x86/configure_fingerprint.bin index 7a048ff..fc25647 100644 --- a/android/app/.cxx/Debug/2a1172u2/x86/configure_fingerprint.bin +++ b/android/app/.cxx/Debug/2a1172u2/x86/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Log  /Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86/additional_project_files.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  2 +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  䰫3  2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86/android_gradle_build.json  2 2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86/android_gradle_build.json  䰫3 2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86/android_gradle_build_mini.json  2 2x +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86/android_gradle_build_mini.json  䰫3 2x v -t/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86/build.ninja  2 2| +t/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86/build.ninja  䰫3 2| z -x/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86/build.ninja.txt  2 +x/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86/build.ninja.txt  䰫3  -}/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86/build_file_index.txt  2 f 2 +}/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86/build_file_index.txt  䰫3 f 2  -~/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86/compile_commands.json  2 +~/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86/compile_commands.json  䰫3  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86/compile_commands.json.bin  2  +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86/compile_commands.json.bin  䰫3   -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86/metadata_generation_command.txt  2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86/metadata_generation_command.txt  䰫3  2 } -{/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86/prefab_config.json  2  ( 2 +{/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86/prefab_config.json  䰫3  ( 2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86/symbol_folder_index.txt  2  w 2j +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86/symbol_folder_index.txt  䰫3  w 2j h -f/Users/svencarstensen/Entwicklung/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  2  2 \ No newline at end of file +f/Users/svencarstensen/Entwicklung/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  䰫3  2 \ No newline at end of file diff --git a/android/app/.cxx/Debug/2a1172u2/x86_64/configure_fingerprint.bin b/android/app/.cxx/Debug/2a1172u2/x86_64/configure_fingerprint.bin index ce330dc..a678a90 100644 --- a/android/app/.cxx/Debug/2a1172u2/x86_64/configure_fingerprint.bin +++ b/android/app/.cxx/Debug/2a1172u2/x86_64/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Log  /Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86_64/additional_project_files.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  2 +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  갫3  2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86_64/android_gradle_build.json  2 2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86_64/android_gradle_build.json  갫3 2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86_64/android_gradle_build_mini.json  2 2{ +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86_64/android_gradle_build_mini.json  갫3 2{ y -w/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86_64/build.ninja  2 2 +w/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86_64/build.ninja  갫3 2 } -{/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86_64/build.ninja.txt  2 +{/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86_64/build.ninja.txt  갫3  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86_64/build_file_index.txt  2 f 2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86_64/build_file_index.txt  갫3 f 2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86_64/compile_commands.json  2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86_64/compile_commands.json  갫3  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86_64/compile_commands.json.bin  2  +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86_64/compile_commands.json.bin  갫3   -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86_64/metadata_generation_command.txt  2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86_64/metadata_generation_command.txt  갫3  2  -~/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86_64/prefab_config.json  2  ( 2 +~/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86_64/prefab_config.json  갫3  ( 2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86_64/symbol_folder_index.txt  2  z 2j +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/Debug/2a1172u2/x86_64/symbol_folder_index.txt  갫3  z 2j h -f/Users/svencarstensen/Entwicklung/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  2  2 \ No newline at end of file +f/Users/svencarstensen/Entwicklung/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  갫3  2 \ No newline at end of file diff --git a/android/app/.cxx/RelWithDebInfo/6l395w5m/arm64-v8a/configure_fingerprint.bin b/android/app/.cxx/RelWithDebInfo/6l395w5m/arm64-v8a/configure_fingerprint.bin index 6199d23..7cca732 100644 --- a/android/app/.cxx/RelWithDebInfo/6l395w5m/arm64-v8a/configure_fingerprint.bin +++ b/android/app/.cxx/RelWithDebInfo/6l395w5m/arm64-v8a/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Log  /Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/arm64-v8a/additional_project_files.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  2 +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/arm64-v8a/android_gradle_build.json  2 2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/arm64-v8a/android_gradle_build.json  2 2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/arm64-v8a/android_gradle_build_mini.json  2 2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/arm64-v8a/android_gradle_build_mini.json  2 2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/arm64-v8a/build.ninja  2 2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/arm64-v8a/build.ninja  2 2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/arm64-v8a/build.ninja.txt  2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/arm64-v8a/build.ninja.txt  2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/arm64-v8a/build_file_index.txt  2 f 2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/arm64-v8a/build_file_index.txt  2 f 2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/arm64-v8a/compile_commands.json  2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/arm64-v8a/compile_commands.json  2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/arm64-v8a/compile_commands.json.bin  2  +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/arm64-v8a/compile_commands.json.bin  2   -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/arm64-v8a/metadata_generation_command.txt  2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/arm64-v8a/metadata_generation_command.txt  2  2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/arm64-v8a/prefab_config.json  2  ( 2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/arm64-v8a/prefab_config.json  2  ( 2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/arm64-v8a/symbol_folder_index.txt  2  2j +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/arm64-v8a/symbol_folder_index.txt  2  2j h -f/Users/svencarstensen/Entwicklung/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  2  2 \ No newline at end of file +f/Users/svencarstensen/Entwicklung/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  2  2 \ No newline at end of file diff --git a/android/app/.cxx/RelWithDebInfo/6l395w5m/armeabi-v7a/configure_fingerprint.bin b/android/app/.cxx/RelWithDebInfo/6l395w5m/armeabi-v7a/configure_fingerprint.bin index 58c16fd..53f4f43 100644 --- a/android/app/.cxx/RelWithDebInfo/6l395w5m/armeabi-v7a/configure_fingerprint.bin +++ b/android/app/.cxx/RelWithDebInfo/6l395w5m/armeabi-v7a/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Log  /Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/armeabi-v7a/additional_project_files.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  2 +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/armeabi-v7a/android_gradle_build.json  2 2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/armeabi-v7a/android_gradle_build.json  2 2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/armeabi-v7a/android_gradle_build_mini.json  2 2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/armeabi-v7a/android_gradle_build_mini.json  2 2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/armeabi-v7a/build.ninja  2 2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/armeabi-v7a/build.ninja  2 2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/armeabi-v7a/build.ninja.txt  2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/armeabi-v7a/build.ninja.txt  2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/armeabi-v7a/build_file_index.txt  2 f 2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/armeabi-v7a/build_file_index.txt  2 f 2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/armeabi-v7a/compile_commands.json  2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/armeabi-v7a/compile_commands.json  2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/armeabi-v7a/compile_commands.json.bin  2  +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/armeabi-v7a/compile_commands.json.bin  2   -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/armeabi-v7a/metadata_generation_command.txt  2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/armeabi-v7a/metadata_generation_command.txt  2  2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/armeabi-v7a/prefab_config.json  2  ( 2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/armeabi-v7a/prefab_config.json  2  ( 2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/armeabi-v7a/symbol_folder_index.txt  2  2j +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/armeabi-v7a/symbol_folder_index.txt  2  2j h -f/Users/svencarstensen/Entwicklung/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  2  2 \ No newline at end of file +f/Users/svencarstensen/Entwicklung/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  2  2 \ No newline at end of file diff --git a/android/app/.cxx/RelWithDebInfo/6l395w5m/x86/configure_fingerprint.bin b/android/app/.cxx/RelWithDebInfo/6l395w5m/x86/configure_fingerprint.bin index 8f0c7aa..5e56f9c 100644 --- a/android/app/.cxx/RelWithDebInfo/6l395w5m/x86/configure_fingerprint.bin +++ b/android/app/.cxx/RelWithDebInfo/6l395w5m/x86/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Log  /Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86/additional_project_files.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  2 +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86/android_gradle_build.json  2 2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86/android_gradle_build.json  2 2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86/android_gradle_build_mini.json  2 2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86/android_gradle_build_mini.json  2 2  -}/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86/build.ninja  2 2 +}/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86/build.ninja  2 2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86/build.ninja.txt  2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86/build.ninja.txt  2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86/build_file_index.txt  2 f 2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86/build_file_index.txt  2 f 2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86/compile_commands.json  2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86/compile_commands.json  2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86/compile_commands.json.bin  2  +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86/compile_commands.json.bin  2   -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86/metadata_generation_command.txt  2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86/metadata_generation_command.txt  2  2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86/prefab_config.json  2  ( 2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86/prefab_config.json  2  ( 2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86/symbol_folder_index.txt  2  2j +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86/symbol_folder_index.txt  2  2j h -f/Users/svencarstensen/Entwicklung/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  2  2 \ No newline at end of file +f/Users/svencarstensen/Entwicklung/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  2  2 \ No newline at end of file diff --git a/android/app/.cxx/RelWithDebInfo/6l395w5m/x86_64/configure_fingerprint.bin b/android/app/.cxx/RelWithDebInfo/6l395w5m/x86_64/configure_fingerprint.bin index c381358..7fd83d6 100644 --- a/android/app/.cxx/RelWithDebInfo/6l395w5m/x86_64/configure_fingerprint.bin +++ b/android/app/.cxx/RelWithDebInfo/6l395w5m/x86_64/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Log  /Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86_64/additional_project_files.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  2 +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86_64/android_gradle_build.json  2 2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86_64/android_gradle_build.json  2 2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86_64/android_gradle_build_mini.json  2 2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86_64/android_gradle_build_mini.json  2 2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86_64/build.ninja  2 2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86_64/build.ninja  2 2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86_64/build.ninja.txt  2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86_64/build.ninja.txt  2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86_64/build_file_index.txt  2 f 2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86_64/build_file_index.txt  2 f 2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86_64/compile_commands.json  2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86_64/compile_commands.json  2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86_64/compile_commands.json.bin  2  +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86_64/compile_commands.json.bin  2   -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86_64/metadata_generation_command.txt  2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86_64/metadata_generation_command.txt  2  2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86_64/prefab_config.json  2  ( 2 +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86_64/prefab_config.json  2  ( 2  -/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86_64/symbol_folder_index.txt  2  2j +/Users/svencarstensen/Entwicklung/Source/flutter/Assecutor/stadtbote/android/app/.cxx/RelWithDebInfo/6l395w5m/x86_64/symbol_folder_index.txt  2  2j h -f/Users/svencarstensen/Entwicklung/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  2  2 \ No newline at end of file +f/Users/svencarstensen/Entwicklung/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  2  2 \ No newline at end of file diff --git a/devtools_options.yaml b/devtools_options.yaml new file mode 100644 index 0000000..fa0b357 --- /dev/null +++ b/devtools_options.yaml @@ -0,0 +1,3 @@ +description: This file stores settings for Dart & Flutter DevTools. +documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states +extensions: diff --git a/lib/content_views/main_page.dart b/lib/content_views/main_page.dart index 0b7f9f4..995fa25 100644 --- a/lib/content_views/main_page.dart +++ b/lib/content_views/main_page.dart @@ -43,11 +43,14 @@ class _MainPageState extends State with ConsumerMixin, ProducerMixin { final ValueNotifier _messagesValueNotifier = ValueNotifier(0); late bool _loggedOut = false; + late bool _showBWVButton = false; @override void initState() { super.initState(); + _showBWVButton = Util.preferencesGetBool(Constants.prefsBWVEnabled, false); + _refreshBadges(); _initMessages(); @@ -212,17 +215,15 @@ class _MainPageState extends State with ConsumerMixin, ProducerMixin { 'Anfahrtsbereich', image: Image.asset('assets/anfahrtsbereich.png', width: 30, height: 30), () async => { - // TODO MESSAGING sendMessage( routingKey: Constants.messageTopicPushContentView, payload: const ApproachAreaPage(), ) - //await MessageService().publish(Constants.messageTopicPushContentView, arguments: const ApproachAreaPage()) }), ), SizedBox(height: _loggedOut == true ? 0 : 20), Visibility( - visible: !_loggedOut && Util.preferencesGetBool(Constants.prefsBWVEnabled, false), + visible: !_loggedOut && _showBWVButton, child: getDefaultButton( 'Wunschziel für heute', image: Image.asset('assets/wunsch_plz.png', width: 30, height: 30), @@ -296,6 +297,15 @@ class _MainPageState extends State with ConsumerMixin, ProducerMixin { _refreshBadges(); }, ); + + subscribe( + queueId: Constants.messageTopicBWVEnabled, + callback: (message) { + setState(() { + _showBWVButton = Util.preferencesGetBool(Constants.prefsBWVEnabled, false); + }); + } + ); } void _refreshBadges() async { @@ -319,7 +329,7 @@ class _MainPageState extends State with ConsumerMixin, ProducerMixin { _loggedOut = false; - setState(() {}); + setState(() { }); } } @@ -577,20 +587,12 @@ class _HeaderWidgetState extends State<_HeaderWidget> with ConsumerMixin { }, ); - /*MessageService().subscribe(Constants.messageTopicSessionStatusInfoUpdate, this, (sessionStatusInfoUpdateMessage) { - _updateHeader(); - });*/ - subscribe( queueId: Constants.messageTopicLocationStatusUpdated, callback: (message) { _updateHeader(); }, ); - - /*MessageService().subscribe(Constants.messageTopicLocationStatusUpdated, this, (statusInfoUpdateMessage) { - _updateHeader(); - });*/ } _updateHeader() async { diff --git a/lib/main.dart b/lib/main.dart index 9471b9e..e4934e1 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -57,6 +57,7 @@ Future main() async { MQClient.instance.declareQueue(Constants.messageTopicMessageReceived); MQClient.instance.declareQueue(Constants.messageTopicUpdateBadges); MQClient.instance.declareQueue(Constants.messageTopicRemoveState0JobFromMap); + MQClient.instance.declareQueue(Constants.messageTopicBWVEnabled); final dir = await getApplicationDocumentsDirectory(); MyApp.isarInstance = await Isar.open([ @@ -244,14 +245,13 @@ class _MainState extends State
with SingleTickerProviderStateMixin, Produc return ColoredSafeArea( key: GlobalKey(), - child: WillPopScope( - onWillPop: () async { - if (contentStack.isNotEmpty) { - _popContentView(1); + child: PopScope( + canPop: contentStack.isNotEmpty, + onPopInvokedWithResult: (didPop, result) async { + if (didPop) return; - return false; - } else { - return true; + if (contentStack.isNotEmpty) { + _popContentView(1); // alten Inhalt entfernen } }, child: Scaffold( diff --git a/lib/model/chat_message.dart b/lib/model/chat_message.dart index 85518c0..2ff8483 100644 --- a/lib/model/chat_message.dart +++ b/lib/model/chat_message.dart @@ -46,7 +46,7 @@ class ChatMessage { } static Future getNextId() async { - int currentExport500Id = await Util.preferencesGetInt('next_message_id', 0) as int; + int currentExport500Id = Util.preferencesGetInt('next_message_id', 0) as int; currentExport500Id += 1; diff --git a/lib/model/task_info.dart b/lib/model/task_info.dart index c4f9bce..d051af9 100644 --- a/lib/model/task_info.dart +++ b/lib/model/task_info.dart @@ -23,7 +23,7 @@ class TaskInfo { TaskInfo(); static Future getNextId() async { - int taskInfoId = await Util.preferencesGetInt('task_info_id', 0) as int; + int taskInfoId = Util.preferencesGetInt('task_info_id', 0) as int; taskInfoId += 1; diff --git a/lib/popups/accept_jobs_popup.dart b/lib/popups/accept_jobs_popup.dart index 5581554..1d876da 100644 --- a/lib/popups/accept_jobs_popup.dart +++ b/lib/popups/accept_jobs_popup.dart @@ -7,24 +7,19 @@ import 'package:stadtbote/main.dart'; import 'package:stadtbote/model/job.dart'; import 'package:stadtbote/network_messages/accept_job_message.dart'; import 'package:stadtbote/network_messages/fin_task_message.dart'; -import 'package:stadtbote/tools/ExtendedStatefulBuilder.dart'; +import 'package:stadtbote/tools/extended_stateful_builder.dart'; import 'package:stadtbote/tools/constants.dart'; import 'package:stadtbote/tools/messages/job_deleted_message.dart'; import 'package:stadtbote/tools/messages/job_received_message.dart'; import 'package:stadtbote/tools/messages/refresh_badges_message.dart'; import 'package:stadtbote/tools/messages/remove_job_message.dart'; import 'package:stadtbote/tools/util.dart'; -import 'package:badges/badges.dart' as badges; import '../tools/messages/publish_payload_message.dart'; -late Map _infoExpandedMap; - final ScrollController _scrollController = ScrollController(); Future showAcceptJobsPopup(SharedMapReference mapReference, Function() onFinished) async { - _infoExpandedMap = {}; - ExtendendStatefulBuilder extendedStatefulBuilder; return showDialog( @@ -367,7 +362,6 @@ Future> _fetchJobWidgets(StateSetter dialogState, Function() onFini ), ); }))*/ - ; } return widgets; diff --git a/lib/tools/constants.dart b/lib/tools/constants.dart index 5803c76..7d25e73 100644 --- a/lib/tools/constants.dart +++ b/lib/tools/constants.dart @@ -24,6 +24,7 @@ class Constants { static const String messageTopicDisconnectClient = "disconnect_client"; static const String messageTopicRequestConnectionStatus = "request_connection_status"; static const String messageTopicCurrentConnectionStatus = "current_connection_status"; + static const String messageTopicBWVEnabled = "bwv_enabled"; static const String messageShowPopup = "show_popup"; diff --git a/lib/tools/ExtendedStatefulBuilder.dart b/lib/tools/extended_stateful_builder.dart similarity index 100% rename from lib/tools/ExtendedStatefulBuilder.dart rename to lib/tools/extended_stateful_builder.dart diff --git a/lib/tools/messages/bwv_message.dart b/lib/tools/messages/bwv_message.dart new file mode 100644 index 0000000..8e2e168 --- /dev/null +++ b/lib/tools/messages/bwv_message.dart @@ -0,0 +1,5 @@ +class BWVMessage { + final bool bwvEnabled; + + BWVMessage({ required this.bwvEnabled}); +} \ No newline at end of file diff --git a/lib/tools/mqtt_core.dart b/lib/tools/mqtt_core.dart index 298421f..9936ca1 100644 --- a/lib/tools/mqtt_core.dart +++ b/lib/tools/mqtt_core.dart @@ -49,6 +49,7 @@ import 'package:uuid/uuid.dart'; import '../main.dart'; import '../model/session_status.dart'; import 'constants.dart'; +import 'messages/bwv_message.dart'; import 'util.dart'; enum ConnectionStateEnum { notConnected, connected } @@ -301,13 +302,10 @@ class MqttCore with ProducerMixin, ConsumerMixin { Util.logInfo('subscribed to topic: $fromServerTopic'); - // TODO MESSAGING sendMessage( routingKey: Constants.messageTopicConnectionStatusChanged, payload: ConnectionStatus(status: ConnectionStatusEnum.connected), ); - - //await MessageService().publish(Constants.messageTopicConnectionStatusChanged, arguments: ConnectionStatus(status: ConnectionStatusEnum.connected)); } void _sessionMessageReceived(payloadData) async { @@ -324,7 +322,12 @@ class MqttCore with ProducerMixin, ConsumerMixin { await MyApp.isarInstance.sessionStatus.put(sessionStatusMessage); }); - Util.preferencesSaveBool(Constants.prefsBWVEnabled, sessionStatusMessage.bwvEnabled); + var bwvEnabled = sessionStatusMessage.bwvEnabled; + Util.preferencesSaveBool(Constants.prefsBWVEnabled, bwvEnabled); + sendMessage( + routingKey: Constants.messageTopicBWVEnabled, + payload: BWVMessage(bwvEnabled: bwvEnabled), + ); sendMessage( routingKey: Constants.messageTopicSessionStatusInfoUpdate,