diff --git a/.gitignore b/.gitignore index 24476c5..6c31954 100644 --- a/.gitignore +++ b/.gitignore @@ -5,9 +5,11 @@ *.swp .DS_Store .atom/ +.build/ .buildlog/ .history .svn/ +.swiftpm/ migrate_working_dir/ # IntelliJ related diff --git a/README.md b/README.md index fb5bc28..f6a49a7 100644 --- a/README.md +++ b/README.md @@ -1,16 +1 @@ -# stadtbote - -Stadtbote - -## Getting Started - -This project is a starting point for a Flutter application. - -A few resources to get you started if this is your first Flutter project: - -- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab) -- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook) - -For help getting started with Flutter development, view the -[online documentation](https://docs.flutter.dev/), which offers tutorials, -samples, guidance on mobile development, and a full API reference. +dart run build_runner build 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 e2fa44f..4d873cd 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  2  ˋ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  2 ͋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  2 ΋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  2 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  2  -/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  2 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  2  -/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  2   -/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  2  ϋ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  2  ( ϋ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  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/Debug/2a1172u2/armeabi-v7a/configure_fingerprint.bin b/android/app/.cxx/Debug/2a1172u2/armeabi-v7a/configure_fingerprint.bin index 3c8488b..c89606e 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  2  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  2 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  2 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  2 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  2  -/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  2 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  2  -/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  2   -/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  2  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  2  ( 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  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/Debug/2a1172u2/x86/configure_fingerprint.bin b/android/app/.cxx/Debug/2a1172u2/x86/configure_fingerprint.bin index f4f8d26..7a048ff 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  2  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  2 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  2 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  2 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  2  -}/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  2 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  2  -/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  2   -/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  2  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  2  ( 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  2  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  2  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 0427fa9..ce330dc 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  2  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  2 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  2 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  2 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  2  -/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  2 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  2  -/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  2   -/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  2  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  2  ( 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  2  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  2  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 a7dbd92..6199d23 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 2761953..58c16fd 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 d1fcba2..8f0c7aa 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 41375df..c381358 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/lib/content_views/approach_area_page.dart b/lib/content_views/approach_area_page.dart index 9d84d9a..1dee685 100644 --- a/lib/content_views/approach_area_page.dart +++ b/lib/content_views/approach_area_page.dart @@ -192,13 +192,10 @@ class _ApproachAreaPageState extends State with ProducerMixin, setPosMessage.track!.pos!.acc = position.accuracy.toInt(); } - // TODO MESSAGING sendMessage( routingKey: Constants.messageTopicPublishPayload, payload: PublishPayloadMessage(topic: "set_zip", message: setPosMessage.toJson(), acknowledgeRequired: false), ); - - //await MessageService().publish(Constants.messageTopicPublishPayload, arguments: PublishPayloadMessage(topic: "set_zip", message: setPosMessage.toJson(), qos: MqttQos.exactlyOnce)); } _initMessages() { @@ -210,11 +207,6 @@ class _ApproachAreaPageState extends State with ProducerMixin, setState(() {}); }, ); - /*MessageService().subscribe(Constants.messageTopicRankingUpdated, this, (rankingUpdateMessage) async { - _ranking = await MyApp.isarInstance.rankings.where().findFirst(); - - setState(() {}); - });*/ } } @@ -253,13 +245,10 @@ class _HeaderWidgetState extends State<_HeaderWidget> with ProducerMixin { child: FittedBox( child: GestureDetector( onTap: () async { - // TODO MESSAGING sendMessage( routingKey: Constants.messageTopicPopContentView, payload: PopContentViewMessage(count: 1), ); - - //await MessageService().publish(Constants.messageTopicPopContentView, arguments: PopContentViewMessage(count: 1)); }, child: const CircleAvatar( radius: 10, @@ -282,13 +271,10 @@ class _HeaderWidgetState extends State<_HeaderWidget> with ProducerMixin { child: FittedBox( child: GestureDetector( onTap: () async { - // TODO MESSAGING sendMessage( routingKey: Constants.messageTopicPopContentView, payload: PopContentViewMessage(count: 1), ); - - //await MessageService().publish(Constants.messageTopicPopContentView, arguments: PopContentViewMessage(count: 1)); }, child: const CircleAvatar( backgroundColor: Constants.colorPrimary, diff --git a/lib/content_views/finished_jobs_page.dart b/lib/content_views/finished_jobs_page.dart index 2c4cca0..74b15aa 100644 --- a/lib/content_views/finished_jobs_page.dart +++ b/lib/content_views/finished_jobs_page.dart @@ -66,6 +66,11 @@ class _FinishedJobsPageState extends State with ProducerMixin List jobWidgets = []; for (var job in _jobs) { + var bottomText = "${job.id}\n${job.tours[0].comp}\n${job.tours[0].street}\n${job.tours[0].city}"; + if (job.rem.trim().isNotEmpty) { + bottomText += "\n\n${job.rem.trim()}"; + } + jobWidgets.add( ListTile( onTap: () { @@ -100,19 +105,7 @@ class _FinishedJobsPageState extends State with ProducerMixin ], ), Text( - job.id.toString(), - textAlign: TextAlign.left, - ), - Text( - job.tours[0].comp, - textAlign: TextAlign.left, - ), - Text( - job.tours[0].street, - textAlign: TextAlign.left, - ), - Text( - job.tours[0].city, + bottomText, textAlign: TextAlign.left, ), ], diff --git a/lib/content_views/main_page.dart b/lib/content_views/main_page.dart index 62f4351..0b7f9f4 100644 --- a/lib/content_views/main_page.dart +++ b/lib/content_views/main_page.dart @@ -222,7 +222,7 @@ class _MainPageState extends State with ConsumerMixin, ProducerMixin { ), SizedBox(height: _loggedOut == true ? 0 : 20), Visibility( - visible: !_loggedOut, + visible: !_loggedOut && Util.preferencesGetBool(Constants.prefsBWVEnabled, false), child: getDefaultButton( 'Wunschziel für heute', image: Image.asset('assets/wunsch_plz.png', width: 30, height: 30), diff --git a/lib/content_views/task_list_page.dart b/lib/content_views/task_list_page.dart index 1525b8e..eb36f54 100644 --- a/lib/content_views/task_list_page.dart +++ b/lib/content_views/task_list_page.dart @@ -420,13 +420,10 @@ class _TaskListPageState extends State with ProducerMixin { _finishTaskProcessing(taskInfo); - // TODO MESSAGING sendMessage( routingKey: Constants.messageTopicPopContentView, payload: PopContentViewMessage(count: 2), ); - - //await MessageService().publish(Constants.messageTopicPopContentView, arguments: PopContentViewMessage(count: 2)); } }); }); @@ -524,14 +521,11 @@ class _TaskListPageState extends State with ProducerMixin { } } - // TODO MESSAGING sendMessage( routingKey: Constants.messageTopicPublishPayload, payload: PublishPayloadMessage(topic: "fin_tour", message: finTourMessage.toJson(), acknowledgeRequired: true), ); - //await MessageService().publish(Constants.messageTopicPublishPayload, arguments: PublishPayloadMessage(topic: "fin_tour", message: finTourMessage.toJson(), qos: MqttQos.exactlyOnce)); - widget.tour.state = Constants.stateFinishedNotConfirmed; await MyApp.isarInstance.writeTxn(() async { @@ -555,14 +549,11 @@ class _TaskListPageState extends State with ProducerMixin { message.time = DateTime.now().millisecondsSinceEpoch; message.data = picture.data; - // TODO MESSAGING sendMessage( routingKey: Constants.messageTopicPublishPayload, payload: PublishPayloadMessage(topic: "pic", message: message.toJson(), acknowledgeRequired: true), ); - //await MessageService().publish(Constants.messageTopicPublishPayload, arguments: PublishPayloadMessage(topic: "pic", message: message.toJson(), qos: MqttQos.exactlyOnce)); - await MyApp.isarInstance.writeTxn(() async { await MyApp.isarInstance.pictures.delete(picture.id); }); @@ -626,13 +617,10 @@ class _HeaderWidgetState extends State<_HeaderWidget> with ProducerMixin { child: FittedBox( child: GestureDetector( onTap: () async { - // TODO MESSAGING sendMessage( routingKey: Constants.messageTopicPopContentView, payload: PopContentViewMessage(count: 1), ); - - //await MessageService().publish(Constants.messageTopicPopContentView, arguments: PopContentViewMessage(count: 1)); }, child: const CircleAvatar( radius: 10, @@ -655,13 +643,10 @@ class _HeaderWidgetState extends State<_HeaderWidget> with ProducerMixin { child: FittedBox( child: GestureDetector( onTap: () async { - // TODO MESSAGING sendMessage( routingKey: Constants.messageTopicPopContentView, payload: PopContentViewMessage(count: 1), ); - - //await MessageService().publish(Constants.messageTopicPopContentView, arguments: PopContentViewMessage(count: 1)); }, child: const CircleAvatar( backgroundColor: Constants.colorPrimary, diff --git a/lib/content_views/tour_list_page.dart b/lib/content_views/tour_list_page.dart index ad6c1e6..553898f 100644 --- a/lib/content_views/tour_list_page.dart +++ b/lib/content_views/tour_list_page.dart @@ -91,14 +91,14 @@ class _TourListPageState extends State with ProducerMixin { visible: widget.job.tours[0].pos != null, child: ElevatedButton( style: ButtonStyle( - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular(8.0), side: const BorderSide(color: Colors.grey), ), ), - backgroundColor: MaterialStateProperty.all(Colors.lightGreen), - foregroundColor: MaterialStateProperty.all(Colors.black), + backgroundColor: WidgetStateProperty.all(Colors.lightGreen), + foregroundColor: WidgetStateProperty.all(Colors.black), ), onPressed: () => {showMapPopup(context, widget.job.tours[0], widget.job.tours)}, child: const Text("Karte")), @@ -198,13 +198,10 @@ class _TourListPageState extends State with ProducerMixin { } Future _clicked(JobTour tour, bool readOnly) async { - // TODO MESSAGING sendMessage( routingKey: Constants.messageTopicPushContentView, payload: TourDetailsPage(job: widget.job, tour: tour, readOnly: readOnly), ); - - //await MessageService().publish(Constants.messageTopicPushContentView, arguments: TourDetailsPage(job: widget.job, tour: tour, readOnly: readOnly)); } } @@ -243,13 +240,10 @@ class _HeaderWidgetState extends State<_HeaderWidget> with ProducerMixin { child: FittedBox( child: GestureDetector( onTap: () async { - // TODO MESSAGING sendMessage( routingKey: Constants.messageTopicPopContentView, payload: PopContentViewMessage(count: 1), ); - - //await MessageService().publish(Constants.messageTopicPopContentView, arguments: PopContentViewMessage(count: 1)); }, child: const CircleAvatar( radius: 10, @@ -272,13 +266,10 @@ class _HeaderWidgetState extends State<_HeaderWidget> with ProducerMixin { child: FittedBox( child: GestureDetector( onTap: () async { - // TODO MESSAGING sendMessage( routingKey: Constants.messageTopicPopContentView, payload: PopContentViewMessage(count: 1), ); - - //await MessageService().publish(Constants.messageTopicPopContentView, arguments: PopContentViewMessage(count: 1)); }, child: const CircleAvatar( backgroundColor: Constants.colorPrimary, diff --git a/lib/model/session_status.dart b/lib/model/session_status.dart index 00abc11..36219b7 100644 --- a/lib/model/session_status.dart +++ b/lib/model/session_status.dart @@ -26,6 +26,8 @@ class SessionStatus { late String serverVersion; @JsonKey(name: 'server_instance') late String serverInstance; + @JsonKey(name: 'bwv', defaultValue: false, required: false) + late bool bwvEnabled; SessionStatus(); diff --git a/lib/model/session_status.g.dart b/lib/model/session_status.g.dart index acac984..adba675 100644 --- a/lib/model/session_status.g.dart +++ b/lib/model/session_status.g.dart @@ -17,48 +17,53 @@ const SessionStatusSchema = CollectionSchema( name: r'SessionStatus', id: -8915225926978838405, properties: { - r'crId': PropertySchema( + r'bwvEnabled': PropertySchema( id: 0, + name: r'bwvEnabled', + type: IsarType.bool, + ), + r'crId': PropertySchema( + id: 1, name: r'crId', type: IsarType.long, ), r'custId': PropertySchema( - id: 1, + id: 2, name: r'custId', type: IsarType.long, ), r'hqId': PropertySchema( - id: 2, + id: 3, name: r'hqId', type: IsarType.long, ), r'locZip': PropertySchema( - id: 3, + id: 4, name: r'locZip', type: IsarType.string, ), r'serverInstance': PropertySchema( - id: 4, + id: 5, name: r'serverInstance', type: IsarType.string, ), r'serverVersion': PropertySchema( - id: 5, + id: 6, name: r'serverVersion', type: IsarType.string, ), r'sid': PropertySchema( - id: 6, + id: 7, name: r'sid', type: IsarType.string, ), r'usrId': PropertySchema( - id: 7, + id: 8, name: r'usrId', type: IsarType.long, ), r'vhtId': PropertySchema( - id: 8, + id: 9, name: r'vhtId', type: IsarType.long, ) @@ -96,15 +101,16 @@ void _sessionStatusSerialize( List offsets, Map> allOffsets, ) { - writer.writeLong(offsets[0], object.crId); - writer.writeLong(offsets[1], object.custId); - writer.writeLong(offsets[2], object.hqId); - writer.writeString(offsets[3], object.locZip); - writer.writeString(offsets[4], object.serverInstance); - writer.writeString(offsets[5], object.serverVersion); - writer.writeString(offsets[6], object.sid); - writer.writeLong(offsets[7], object.usrId); - writer.writeLong(offsets[8], object.vhtId); + writer.writeBool(offsets[0], object.bwvEnabled); + writer.writeLong(offsets[1], object.crId); + writer.writeLong(offsets[2], object.custId); + writer.writeLong(offsets[3], object.hqId); + writer.writeString(offsets[4], object.locZip); + writer.writeString(offsets[5], object.serverInstance); + writer.writeString(offsets[6], object.serverVersion); + writer.writeString(offsets[7], object.sid); + writer.writeLong(offsets[8], object.usrId); + writer.writeLong(offsets[9], object.vhtId); } SessionStatus _sessionStatusDeserialize( @@ -114,15 +120,16 @@ SessionStatus _sessionStatusDeserialize( Map> allOffsets, ) { final object = SessionStatus(); - object.crId = reader.readLong(offsets[0]); - object.custId = reader.readLong(offsets[1]); - object.hqId = reader.readLong(offsets[2]); - object.locZip = reader.readString(offsets[3]); - object.serverInstance = reader.readString(offsets[4]); - object.serverVersion = reader.readString(offsets[5]); - object.sid = reader.readString(offsets[6]); - object.usrId = reader.readLong(offsets[7]); - object.vhtId = reader.readLong(offsets[8]); + object.bwvEnabled = reader.readBool(offsets[0]); + object.crId = reader.readLong(offsets[1]); + object.custId = reader.readLong(offsets[2]); + object.hqId = reader.readLong(offsets[3]); + object.locZip = reader.readString(offsets[4]); + object.serverInstance = reader.readString(offsets[5]); + object.serverVersion = reader.readString(offsets[6]); + object.sid = reader.readString(offsets[7]); + object.usrId = reader.readLong(offsets[8]); + object.vhtId = reader.readLong(offsets[9]); return object; } @@ -134,13 +141,13 @@ P _sessionStatusDeserializeProp

( ) { switch (propertyId) { case 0: - return (reader.readLong(offset)) as P; + return (reader.readBool(offset)) as P; case 1: return (reader.readLong(offset)) as P; case 2: return (reader.readLong(offset)) as P; case 3: - return (reader.readString(offset)) as P; + return (reader.readLong(offset)) as P; case 4: return (reader.readString(offset)) as P; case 5: @@ -148,9 +155,11 @@ P _sessionStatusDeserializeProp

( case 6: return (reader.readString(offset)) as P; case 7: - return (reader.readLong(offset)) as P; + return (reader.readString(offset)) as P; case 8: return (reader.readLong(offset)) as P; + case 9: + return (reader.readLong(offset)) as P; default: throw IsarError('Unknown property with id $propertyId'); } @@ -250,6 +259,16 @@ extension SessionStatusQueryWhere extension SessionStatusQueryFilter on QueryBuilder { + QueryBuilder + bwvEnabledEqualTo(bool value) { + return QueryBuilder.apply(this, (query) { + return query.addFilterCondition(FilterCondition.equalTo( + property: r'bwvEnabled', + value: value, + )); + }); + } + QueryBuilder crIdEqualTo( int value) { return QueryBuilder.apply(this, (query) { @@ -1133,6 +1152,19 @@ extension SessionStatusQueryLinks extension SessionStatusQuerySortBy on QueryBuilder { + QueryBuilder sortByBwvEnabled() { + return QueryBuilder.apply(this, (query) { + return query.addSortBy(r'bwvEnabled', Sort.asc); + }); + } + + QueryBuilder + sortByBwvEnabledDesc() { + return QueryBuilder.apply(this, (query) { + return query.addSortBy(r'bwvEnabled', Sort.desc); + }); + } + QueryBuilder sortByCrId() { return QueryBuilder.apply(this, (query) { return query.addSortBy(r'crId', Sort.asc); @@ -1248,6 +1280,19 @@ extension SessionStatusQuerySortBy extension SessionStatusQuerySortThenBy on QueryBuilder { + QueryBuilder thenByBwvEnabled() { + return QueryBuilder.apply(this, (query) { + return query.addSortBy(r'bwvEnabled', Sort.asc); + }); + } + + QueryBuilder + thenByBwvEnabledDesc() { + return QueryBuilder.apply(this, (query) { + return query.addSortBy(r'bwvEnabled', Sort.desc); + }); + } + QueryBuilder thenByCrId() { return QueryBuilder.apply(this, (query) { return query.addSortBy(r'crId', Sort.asc); @@ -1375,6 +1420,12 @@ extension SessionStatusQuerySortThenBy extension SessionStatusQueryWhereDistinct on QueryBuilder { + QueryBuilder distinctByBwvEnabled() { + return QueryBuilder.apply(this, (query) { + return query.addDistinctBy(r'bwvEnabled'); + }); + } + QueryBuilder distinctByCrId() { return QueryBuilder.apply(this, (query) { return query.addDistinctBy(r'crId'); @@ -1444,6 +1495,12 @@ extension SessionStatusQueryProperty }); } + QueryBuilder bwvEnabledProperty() { + return QueryBuilder.apply(this, (query) { + return query.addPropertyName(r'bwvEnabled'); + }); + } + QueryBuilder crIdProperty() { return QueryBuilder.apply(this, (query) { return query.addPropertyName(r'crId'); @@ -1515,7 +1572,8 @@ SessionStatus _$SessionStatusFromJson(Map json) => ..vhtId = (json['vht_id'] as num).toInt() ..locZip = json['loc_zip'] as String ..serverVersion = json['server_version'] as String - ..serverInstance = json['server_instance'] as String; + ..serverInstance = json['server_instance'] as String + ..bwvEnabled = json['bwv'] as bool? ?? false; Map _$SessionStatusToJson(SessionStatus instance) => { @@ -1528,4 +1586,5 @@ Map _$SessionStatusToJson(SessionStatus instance) => 'loc_zip': instance.locZip, 'server_version': instance.serverVersion, 'server_instance': instance.serverInstance, + 'bwv': instance.bwvEnabled, }; diff --git a/lib/network_messages/sync_jobs_message.dart b/lib/network_messages/sync_jobs_message.dart index c7dbd77..d87145b 100644 --- a/lib/network_messages/sync_jobs_message.dart +++ b/lib/network_messages/sync_jobs_message.dart @@ -7,6 +7,8 @@ class SyncJobsMessage { @JsonKey(name: 'utc_unix_time') late int utcUnixTime; + late SyncMessagePos? pos; + late SyncJobMessageSync sync; SyncJobsMessage(); @@ -42,3 +44,17 @@ class SyncJobMessageJob { Map toJson() => _$SyncJobMessageJobToJson(this); } +@JsonSerializable() +class SyncMessagePos { + late double lat; + + late double long; + + late int acc = 0; + + SyncMessagePos(); + + factory SyncMessagePos.fromJson(Map json) => _$SyncMessagePosFromJson(json); + + Map toJson() => _$SyncMessagePosToJson(this); +} diff --git a/lib/network_messages/sync_jobs_message.g.dart b/lib/network_messages/sync_jobs_message.g.dart index cc68893..6ecc957 100644 --- a/lib/network_messages/sync_jobs_message.g.dart +++ b/lib/network_messages/sync_jobs_message.g.dart @@ -9,12 +9,16 @@ part of 'sync_jobs_message.dart'; SyncJobsMessage _$SyncJobsMessageFromJson(Map json) => SyncJobsMessage() ..utcUnixTime = (json['utc_unix_time'] as num).toInt() + ..pos = json['pos'] == null + ? null + : SyncMessagePos.fromJson(json['pos'] as Map) ..sync = SyncJobMessageSync.fromJson(json['sync'] as Map); Map _$SyncJobsMessageToJson(SyncJobsMessage instance) => { 'utc_unix_time': instance.utcUnixTime, + 'pos': instance.pos, 'sync': instance.sync, }; @@ -41,3 +45,16 @@ Map _$SyncJobMessageJobToJson(SyncJobMessageJob instance) => 'ver': instance.ver, 'state': instance.state, }; + +SyncMessagePos _$SyncMessagePosFromJson(Map json) => + SyncMessagePos() + ..lat = (json['lat'] as num).toDouble() + ..long = (json['long'] as num).toDouble() + ..acc = (json['acc'] as num).toInt(); + +Map _$SyncMessagePosToJson(SyncMessagePos instance) => + { + 'lat': instance.lat, + 'long': instance.long, + 'acc': instance.acc, + }; diff --git a/lib/popups/accept_jobs_popup.dart b/lib/popups/accept_jobs_popup.dart index 92725d0..5581554 100644 --- a/lib/popups/accept_jobs_popup.dart +++ b/lib/popups/accept_jobs_popup.dart @@ -184,12 +184,6 @@ Future> _fetchJobWidgets(StateSetter dialogState, Function() onFini ), const SizedBox(height: 10), SizedBox(width: double.infinity, child: Text(job.rem, textAlign: TextAlign.left)), - SizedBox(width: double.infinity, child: Text(job.rem, textAlign: TextAlign.left)), - SizedBox(width: double.infinity, child: Text(job.rem, textAlign: TextAlign.left)), - SizedBox(width: double.infinity, child: Text(job.rem, textAlign: TextAlign.left)), - SizedBox(width: double.infinity, child: Text(job.rem, textAlign: TextAlign.left)), - SizedBox(width: double.infinity, child: Text(job.rem, textAlign: TextAlign.left)), - SizedBox(width: double.infinity, child: Text(job.rem, textAlign: TextAlign.left)), ], ), ), diff --git a/lib/popups/map_popup.dart b/lib/popups/map_popup.dart index fa4b3eb..e1e72d9 100644 --- a/lib/popups/map_popup.dart +++ b/lib/popups/map_popup.dart @@ -175,8 +175,8 @@ showMapPopup(BuildContext context, JobTour currentTour, List tourList) child: FlutterMap( mapController: mapController, options: MapOptions( - //center: LatLng(currentTour.pos!.lat, currentTour.pos!.long), - //zoom: 14, + initialCenter: LatLng(currentTour.pos!.lat, currentTour.pos!.long), + initialZoom: 14, ), children: [ TileLayer( diff --git a/lib/tools/constants.dart b/lib/tools/constants.dart index 822c3c6..5803c76 100644 --- a/lib/tools/constants.dart +++ b/lib/tools/constants.dart @@ -28,6 +28,7 @@ class Constants { static const String messageShowPopup = "show_popup"; static const String prefsPreviousMqttSubscription = "previous_mqtt_subscription"; + static const String prefsBWVEnabled = "bwv_enabled"; static const String prefsDesiredZip = "desired_zip"; static const int stateAssigned = 0; diff --git a/lib/tools/mqtt_core.dart b/lib/tools/mqtt_core.dart index 2b6142d..298421f 100644 --- a/lib/tools/mqtt_core.dart +++ b/lib/tools/mqtt_core.dart @@ -136,6 +136,10 @@ class MqttCore with ProducerMixin, ConsumerMixin { connectionLostMessage.connectionLost = true; var connectionLostEncapsulatedMessage = _encapsulateMessage(const Uuid().v4(), false, connectionLostMessage.toJson()); + var willMessageUtf8 = utf8.encode(connectionLostEncapsulatedMessage); + Uint8Buffer uint8Buffer = Uint8Buffer(); + uint8Buffer.addAll(willMessageUtf8); + _mqttClient!.connectionMessage = MqttConnectMessage() .withClientIdentifier(Util.getAppUuid()) .authenticateAs("app", "apppwd") @@ -144,7 +148,7 @@ class MqttCore with ProducerMixin, ConsumerMixin { .withWillTopic("$_toServerTopic$_clientId/connection_lost") .withWillQos(MqttQos.atMostOnce) .keepAliveFor(60) - .withWillPayload(MqttUtf8Encoding().toUtf8(connectionLostEncapsulatedMessage)) + .withWillPayload(uint8Buffer) .will(); } @@ -320,14 +324,13 @@ class MqttCore with ProducerMixin, ConsumerMixin { await MyApp.isarInstance.sessionStatus.put(sessionStatusMessage); }); - // TODO MESSAGING + Util.preferencesSaveBool(Constants.prefsBWVEnabled, sessionStatusMessage.bwvEnabled); + sendMessage( routingKey: Constants.messageTopicSessionStatusInfoUpdate, payload: SessionStatusInfoUpdate(status: sessionStatusMessage), ); - //await MessageService().publish(Constants.messageTopicSessionStatusInfoUpdate, arguments: SessionStatusInfoUpdate(status: sessionStatusMessage)); - _startTrackTimer(); } @@ -585,10 +588,18 @@ class MqttCore with ProducerMixin, ConsumerMixin { } _sendSyncMessage() async { + var currentPosition = MyApp.currentPosition; + var jobs = await MyApp.isarInstance.jobs.filter().stateGreaterThan(-1).findAll(); var answer = SyncJobsMessage(); answer.utcUnixTime = DateTime.now().toUtc().millisecondsSinceEpoch ~/ 1000; + + answer.pos = SyncMessagePos(); + answer.pos!.lat = currentPosition != null ? currentPosition.latitude : 0.0; + answer.pos!.long = currentPosition != null ? currentPosition.longitude : 0.0; + answer.pos!.acc = currentPosition != null ? currentPosition.accuracy.toInt() : 0; + answer.sync = SyncJobMessageSync(); answer.sync.jobs = []; for (var job in jobs) { diff --git a/macos/Podfile.lock b/macos/Podfile.lock new file mode 100644 index 0000000..fef6e86 --- /dev/null +++ b/macos/Podfile.lock @@ -0,0 +1,72 @@ +PODS: + - audioplayers_darwin (0.0.1): + - FlutterMacOS + - device_info_plus (0.0.1): + - FlutterMacOS + - file_selector_macos (0.0.1): + - FlutterMacOS + - FlutterMacOS (1.0.0) + - geolocator_apple (1.2.0): + - FlutterMacOS + - isar_flutter_libs (1.0.0): + - FlutterMacOS + - package_info_plus (0.0.1): + - FlutterMacOS + - path_provider_foundation (0.0.1): + - Flutter + - FlutterMacOS + - shared_preferences_foundation (0.0.1): + - Flutter + - FlutterMacOS + - url_launcher_macos (0.0.1): + - FlutterMacOS + +DEPENDENCIES: + - audioplayers_darwin (from `Flutter/ephemeral/.symlinks/plugins/audioplayers_darwin/macos`) + - device_info_plus (from `Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos`) + - file_selector_macos (from `Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos`) + - FlutterMacOS (from `Flutter/ephemeral`) + - geolocator_apple (from `Flutter/ephemeral/.symlinks/plugins/geolocator_apple/macos`) + - isar_flutter_libs (from `Flutter/ephemeral/.symlinks/plugins/isar_flutter_libs/macos`) + - package_info_plus (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos`) + - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`) + - shared_preferences_foundation (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin`) + - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`) + +EXTERNAL SOURCES: + audioplayers_darwin: + :path: Flutter/ephemeral/.symlinks/plugins/audioplayers_darwin/macos + device_info_plus: + :path: Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos + file_selector_macos: + :path: Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos + FlutterMacOS: + :path: Flutter/ephemeral + geolocator_apple: + :path: Flutter/ephemeral/.symlinks/plugins/geolocator_apple/macos + isar_flutter_libs: + :path: Flutter/ephemeral/.symlinks/plugins/isar_flutter_libs/macos + package_info_plus: + :path: Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos + path_provider_foundation: + :path: Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin + shared_preferences_foundation: + :path: Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin + url_launcher_macos: + :path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos + +SPEC CHECKSUMS: + audioplayers_darwin: 761f2948df701d05b5db603220c384fb55720012 + device_info_plus: 4fb280989f669696856f8b129e4a5e3cd6c48f76 + file_selector_macos: 6280b52b459ae6c590af5d78fc35c7267a3c4b31 + FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 + geolocator_apple: ccfb79d5250de3a295f5093cd03e76aa8836a416 + isar_flutter_libs: a65381780401f81ad6bf3f2e7cd0de5698fb98c4 + package_info_plus: f0052d280d17aa382b932f399edf32507174e870 + path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564 + shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7 + url_launcher_macos: 0fba8ddabfc33ce0a9afe7c5fef5aab3d8d2d673 + +PODFILE CHECKSUM: 236401fc2c932af29a9fcf0e97baeeb2d750d367 + +COCOAPODS: 1.16.2 diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 51c48f2..c00db98 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -27,6 +27,8 @@ 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; + 4C397C52CDAEA38D2E10558C /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6BF966C6FF2A288360C67F06 /* Pods_RunnerTests.framework */; }; + 7F4D69D05A6486021CA99820 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2617608F597189E78A97A9EB /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -60,11 +62,13 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 1FD13FD4A1FCE9E8E721DBF7 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + 2617608F597189E78A97A9EB /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; - 33CC10ED2044A3C60003C045 /* stadtbote.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "stadtbote.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 33CC10ED2044A3C60003C045 /* stadtbote.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = stadtbote.app; sourceTree = BUILT_PRODUCTS_DIR; }; 33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = ""; }; 33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; @@ -76,8 +80,14 @@ 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; + 6BF966C6FF2A288360C67F06 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; + 8177D176A7CC5542C6C6607F /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + 8677BC09CE7D948E8BA669BD /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; + D1DE3C2A9AD992CB02FD6914 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + E955652F5C7B5A8E88569728 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + FB9E8541378770D5C54E63AF /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -85,6 +95,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 4C397C52CDAEA38D2E10558C /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -92,6 +103,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 7F4D69D05A6486021CA99820 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -125,6 +137,7 @@ 331C80D6294CF71000263BE5 /* RunnerTests */, 33CC10EE2044A3C60003C045 /* Products */, D73912EC22F37F3D000D13A0 /* Frameworks */, + C6A626145EA5E91B4D6738DF /* Pods */, ); sourceTree = ""; }; @@ -172,9 +185,25 @@ path = Runner; sourceTree = ""; }; + C6A626145EA5E91B4D6738DF /* Pods */ = { + isa = PBXGroup; + children = ( + D1DE3C2A9AD992CB02FD6914 /* Pods-Runner.debug.xcconfig */, + 8177D176A7CC5542C6C6607F /* Pods-Runner.release.xcconfig */, + 1FD13FD4A1FCE9E8E721DBF7 /* Pods-Runner.profile.xcconfig */, + FB9E8541378770D5C54E63AF /* Pods-RunnerTests.debug.xcconfig */, + E955652F5C7B5A8E88569728 /* Pods-RunnerTests.release.xcconfig */, + 8677BC09CE7D948E8BA669BD /* Pods-RunnerTests.profile.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; D73912EC22F37F3D000D13A0 /* Frameworks */ = { isa = PBXGroup; children = ( + 2617608F597189E78A97A9EB /* Pods_Runner.framework */, + 6BF966C6FF2A288360C67F06 /* Pods_RunnerTests.framework */, ); name = Frameworks; sourceTree = ""; @@ -186,6 +215,7 @@ isa = PBXNativeTarget; buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( + BAC4DF81728A6CFE2DFD3382 /* [CP] Check Pods Manifest.lock */, 331C80D1294CF70F00263BE5 /* Sources */, 331C80D2294CF70F00263BE5 /* Frameworks */, 331C80D3294CF70F00263BE5 /* Resources */, @@ -204,11 +234,13 @@ isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( + DA5AD73D313A974944C2BDBF /* [CP] Check Pods Manifest.lock */, 33CC10E92044A3C60003C045 /* Sources */, 33CC10EA2044A3C60003C045 /* Frameworks */, 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, + 427C50390F6335B85D78EF5E /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -329,6 +361,67 @@ shellPath = /bin/sh; shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; }; + 427C50390F6335B85D78EF5E /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + BAC4DF81728A6CFE2DFD3382 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + DA5AD73D313A974944C2BDBF /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -380,6 +473,7 @@ /* Begin XCBuildConfiguration section */ 331C80DB294CF71000263BE5 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = FB9E8541378770D5C54E63AF /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -394,6 +488,7 @@ }; 331C80DC294CF71000263BE5 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = E955652F5C7B5A8E88569728 /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -408,6 +503,7 @@ }; 331C80DD294CF71000263BE5 /* Profile */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 8677BC09CE7D948E8BA669BD /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; diff --git a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 8bd41d6..018fb44 100644 --- a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -59,6 +59,7 @@ ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "YES" debugServiceExtension = "internal" + enableGPUValidationMode = "1" allowLocationSimulation = "YES"> diff --git a/macos/Runner.xcworkspace/contents.xcworkspacedata b/macos/Runner.xcworkspace/contents.xcworkspacedata index 1d526a1..21a3cc1 100644 --- a/macos/Runner.xcworkspace/contents.xcworkspacedata +++ b/macos/Runner.xcworkspace/contents.xcworkspacedata @@ -4,4 +4,7 @@ + + diff --git a/macos/Runner/AppDelegate.swift b/macos/Runner/AppDelegate.swift index 8e02df2..b3c1761 100644 --- a/macos/Runner/AppDelegate.swift +++ b/macos/Runner/AppDelegate.swift @@ -6,4 +6,8 @@ class AppDelegate: FlutterAppDelegate { override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool { return true } + + override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool { + return true + } } diff --git a/pubspec.yaml b/pubspec.yaml index 697d691..c89c3d0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # In Windows, build-name is used as the major, minor, and patch parts # of the product and file versions while build-number is used as the build suffix. -version: 336.0.0+336 +version: 338.0.0+338 environment: sdk: '>=2.19.6 <3.0.0'