From e7a5b9e20938977bc8d93b870e044098ab4ab2c6 Mon Sep 17 00:00:00 2001 From: zach Date: Fri, 26 Dec 2025 11:42:02 -0700 Subject: [PATCH] Initial commit: MeshCore Open Flutter client MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Open-source Flutter client for MeshCore LoRa mesh networking devices. Features: - BLE device scanning and connection - Nordic UART Service (NUS) integration - Material 3 design with system theme support - Provider-based state management - Placeholder screens for chat, contacts, and settings 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 --- .gitignore | 82 + .metadata | 45 + AGENTS.md | 34 + CLAUDE.md | 136 ++ README.md | 16 + analysis_options.yaml | 28 + android/.gitignore | 14 + android/app/build.gradle.kts | 49 + android/app/src/debug/AndroidManifest.xml | 7 + android/app/src/main/AndroidManifest.xml | 59 + .../meshcore/meshcore_open/MainActivity.kt | 5 + .../res/drawable-v21/launch_background.xml | 12 + .../main/res/drawable/launch_background.xml | 12 + .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 544 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 442 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 721 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 1031 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 1443 bytes .../app/src/main/res/values-night/styles.xml | 18 + android/app/src/main/res/values/styles.xml | 18 + android/app/src/profile/AndroidManifest.xml | 7 + android/build.gradle.kts | 24 + android/gradle.properties | 3 + .../gradle/wrapper/gradle-wrapper.properties | 5 + android/settings.gradle.kts | 26 + ios/.gitignore | 34 + ios/Flutter/AppFrameworkInfo.plist | 26 + ios/Flutter/Debug.xcconfig | 1 + ios/Flutter/Release.xcconfig | 1 + ios/Runner.xcodeproj/project.pbxproj | 616 +++++++ .../contents.xcworkspacedata | 7 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../xcshareddata/WorkspaceSettings.xcsettings | 8 + .../xcshareddata/xcschemes/Runner.xcscheme | 101 ++ .../contents.xcworkspacedata | 7 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../xcshareddata/WorkspaceSettings.xcsettings | 8 + ios/Runner/AppDelegate.swift | 13 + .../AppIcon.appiconset/Contents.json | 122 ++ .../Icon-App-1024x1024@1x.png | Bin 0 -> 10932 bytes .../AppIcon.appiconset/Icon-App-20x20@1x.png | Bin 0 -> 295 bytes .../AppIcon.appiconset/Icon-App-20x20@2x.png | Bin 0 -> 406 bytes .../AppIcon.appiconset/Icon-App-20x20@3x.png | Bin 0 -> 450 bytes .../AppIcon.appiconset/Icon-App-29x29@1x.png | Bin 0 -> 282 bytes .../AppIcon.appiconset/Icon-App-29x29@2x.png | Bin 0 -> 462 bytes .../AppIcon.appiconset/Icon-App-29x29@3x.png | Bin 0 -> 704 bytes .../AppIcon.appiconset/Icon-App-40x40@1x.png | Bin 0 -> 406 bytes .../AppIcon.appiconset/Icon-App-40x40@2x.png | Bin 0 -> 586 bytes .../AppIcon.appiconset/Icon-App-40x40@3x.png | Bin 0 -> 862 bytes .../AppIcon.appiconset/Icon-App-60x60@2x.png | Bin 0 -> 862 bytes .../AppIcon.appiconset/Icon-App-60x60@3x.png | Bin 0 -> 1674 bytes .../AppIcon.appiconset/Icon-App-76x76@1x.png | Bin 0 -> 762 bytes .../AppIcon.appiconset/Icon-App-76x76@2x.png | Bin 0 -> 1226 bytes .../Icon-App-83.5x83.5@2x.png | Bin 0 -> 1418 bytes .../LaunchImage.imageset/Contents.json | 23 + .../LaunchImage.imageset/LaunchImage.png | Bin 0 -> 68 bytes .../LaunchImage.imageset/LaunchImage@2x.png | Bin 0 -> 68 bytes .../LaunchImage.imageset/LaunchImage@3x.png | Bin 0 -> 68 bytes .../LaunchImage.imageset/README.md | 5 + ios/Runner/Base.lproj/LaunchScreen.storyboard | 37 + ios/Runner/Base.lproj/Main.storyboard | 26 + ios/Runner/Info.plist | 53 + ios/Runner/Runner-Bridging-Header.h | 1 + ios/RunnerTests/RunnerTests.swift | 12 + lib/connector/meshcore_connector.dart | 1595 +++++++++++++++++ lib/connector/meshcore_protocol.dart | 534 ++++++ lib/helpers/smaz.dart | 411 +++++ lib/main.dart | 118 ++ lib/models/app_settings.dart | 108 ++ lib/models/channel.dart | 57 + lib/models/channel_message.dart | 170 ++ lib/models/contact.dart | 110 ++ lib/models/contact_group.dart | 37 + lib/models/message.dart | 125 ++ lib/models/path_history.dart | 85 + lib/models/path_selection.dart | 11 + lib/models/radio_settings.dart | 107 ++ lib/screens/app_settings_screen.dart | 484 +++++ lib/screens/ble_debug_log_screen.dart | 384 ++++ lib/screens/channel_chat_screen.dart | 555 ++++++ lib/screens/channels_screen.dart | 439 +++++ lib/screens/chat_screen.dart | 1272 +++++++++++++ lib/screens/contacts_screen.dart | 791 ++++++++ lib/screens/device_screen.dart | 292 +++ lib/screens/map_screen.dart | 1109 ++++++++++++ lib/screens/repeater_cli_screen.dart | 528 ++++++ lib/screens/repeater_hub_screen.dart | 204 +++ lib/screens/repeater_settings_screen.dart | 1039 +++++++++++ lib/screens/repeater_status_screen.dart | 508 ++++++ lib/screens/scanner_screen.dart | 176 ++ lib/screens/settings_screen.dart | 693 +++++++ lib/services/app_settings_service.dart | 101 ++ lib/services/ble_debug_log_service.dart | 220 +++ lib/services/map_marker_service.dart | 16 + lib/services/message_retry_service.dart | 348 ++++ lib/services/notification_service.dart | 158 ++ lib/services/path_history_service.dart | 324 ++++ lib/services/repeater_command_service.dart | 133 ++ lib/services/storage_service.dart | 120 ++ lib/storage/channel_message_store.dart | 119 ++ lib/storage/channel_order_store.dart | 30 + lib/storage/channel_settings_store.dart | 17 + lib/storage/contact_group_store.dart | 32 + lib/storage/contact_store.dart | 57 + lib/storage/message_store.dart | 85 + lib/utils/emoji_utils.dart | 33 + lib/widgets/debug_frame_viewer.dart | 68 + lib/widgets/device_tile.dart | 68 + lib/widgets/gif_message.dart | 185 ++ lib/widgets/gif_picker.dart | 283 +++ lib/widgets/repeater_login_dialog.dart | 286 +++ linux/.gitignore | 1 + linux/CMakeLists.txt | 128 ++ linux/flutter/CMakeLists.txt | 88 + linux/flutter/generated_plugin_registrant.cc | 11 + linux/flutter/generated_plugin_registrant.h | 15 + linux/flutter/generated_plugins.cmake | 23 + linux/runner/CMakeLists.txt | 26 + linux/runner/main.cc | 6 + linux/runner/my_application.cc | 144 ++ linux/runner/my_application.h | 18 + macos/.gitignore | 7 + macos/Flutter/Flutter-Debug.xcconfig | 1 + macos/Flutter/Flutter-Release.xcconfig | 1 + macos/Flutter/GeneratedPluginRegistrant.swift | 16 + macos/Runner.xcodeproj/project.pbxproj | 705 ++++++++ .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../xcshareddata/xcschemes/Runner.xcscheme | 99 + .../contents.xcworkspacedata | 7 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + macos/Runner/AppDelegate.swift | 13 + .../AppIcon.appiconset/Contents.json | 68 + .../AppIcon.appiconset/app_icon_1024.png | Bin 0 -> 102994 bytes .../AppIcon.appiconset/app_icon_128.png | Bin 0 -> 5680 bytes .../AppIcon.appiconset/app_icon_16.png | Bin 0 -> 520 bytes .../AppIcon.appiconset/app_icon_256.png | Bin 0 -> 14142 bytes .../AppIcon.appiconset/app_icon_32.png | Bin 0 -> 1066 bytes .../AppIcon.appiconset/app_icon_512.png | Bin 0 -> 36406 bytes .../AppIcon.appiconset/app_icon_64.png | Bin 0 -> 2218 bytes macos/Runner/Base.lproj/MainMenu.xib | 343 ++++ macos/Runner/Configs/AppInfo.xcconfig | 14 + macos/Runner/Configs/Debug.xcconfig | 2 + macos/Runner/Configs/Release.xcconfig | 2 + macos/Runner/Configs/Warnings.xcconfig | 13 + macos/Runner/DebugProfile.entitlements | 12 + macos/Runner/Info.plist | 32 + macos/Runner/MainFlutterWindow.swift | 15 + macos/Runner/Release.entitlements | 8 + macos/RunnerTests/RunnerTests.swift | 12 + pubspec.lock | 658 +++++++ pubspec.yaml | 99 + test/widget_test.dart | 12 + web/favicon.png | Bin 0 -> 917 bytes web/icons/Icon-192.png | Bin 0 -> 5292 bytes web/icons/Icon-512.png | Bin 0 -> 8252 bytes web/icons/Icon-maskable-192.png | Bin 0 -> 5594 bytes web/icons/Icon-maskable-512.png | Bin 0 -> 20998 bytes web/index.html | 38 + web/manifest.json | 35 + windows/.gitignore | 17 + windows/CMakeLists.txt | 108 ++ windows/flutter/CMakeLists.txt | 109 ++ .../flutter/generated_plugin_registrant.cc | 14 + windows/flutter/generated_plugin_registrant.h | 15 + windows/flutter/generated_plugins.cmake | 24 + windows/runner/CMakeLists.txt | 40 + windows/runner/Runner.rc | 121 ++ windows/runner/flutter_window.cpp | 71 + windows/runner/flutter_window.h | 33 + windows/runner/main.cpp | 43 + windows/runner/resource.h | 16 + windows/runner/resources/app_icon.ico | Bin 0 -> 33772 bytes windows/runner/runner.exe.manifest | 14 + windows/runner/utils.cpp | 65 + windows/runner/utils.h | 19 + windows/runner/win32_window.cpp | 288 +++ windows/runner/win32_window.h | 102 ++ 177 files changed, 20129 insertions(+) create mode 100644 .gitignore create mode 100644 .metadata create mode 100644 AGENTS.md create mode 100644 CLAUDE.md create mode 100644 README.md create mode 100644 analysis_options.yaml create mode 100644 android/.gitignore create mode 100644 android/app/build.gradle.kts create mode 100644 android/app/src/debug/AndroidManifest.xml create mode 100644 android/app/src/main/AndroidManifest.xml create mode 100644 android/app/src/main/kotlin/com/meshcore/meshcore_open/MainActivity.kt create mode 100644 android/app/src/main/res/drawable-v21/launch_background.xml create mode 100644 android/app/src/main/res/drawable/launch_background.xml create mode 100644 android/app/src/main/res/mipmap-hdpi/ic_launcher.png create mode 100644 android/app/src/main/res/mipmap-mdpi/ic_launcher.png create mode 100644 android/app/src/main/res/mipmap-xhdpi/ic_launcher.png create mode 100644 android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 android/app/src/main/res/values-night/styles.xml create mode 100644 android/app/src/main/res/values/styles.xml create mode 100644 android/app/src/profile/AndroidManifest.xml create mode 100644 android/build.gradle.kts create mode 100644 android/gradle.properties create mode 100644 android/gradle/wrapper/gradle-wrapper.properties create mode 100644 android/settings.gradle.kts create mode 100644 ios/.gitignore create mode 100644 ios/Flutter/AppFrameworkInfo.plist create mode 100644 ios/Flutter/Debug.xcconfig create mode 100644 ios/Flutter/Release.xcconfig create mode 100644 ios/Runner.xcodeproj/project.pbxproj create mode 100644 ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings create mode 100644 ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme create mode 100644 ios/Runner.xcworkspace/contents.xcworkspacedata create mode 100644 ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings create mode 100644 ios/Runner/AppDelegate.swift create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png create mode 100644 ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json create mode 100644 ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png create mode 100644 ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png create mode 100644 ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png create mode 100644 ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md create mode 100644 ios/Runner/Base.lproj/LaunchScreen.storyboard create mode 100644 ios/Runner/Base.lproj/Main.storyboard create mode 100644 ios/Runner/Info.plist create mode 100644 ios/Runner/Runner-Bridging-Header.h create mode 100644 ios/RunnerTests/RunnerTests.swift create mode 100644 lib/connector/meshcore_connector.dart create mode 100644 lib/connector/meshcore_protocol.dart create mode 100644 lib/helpers/smaz.dart create mode 100644 lib/main.dart create mode 100644 lib/models/app_settings.dart create mode 100644 lib/models/channel.dart create mode 100644 lib/models/channel_message.dart create mode 100644 lib/models/contact.dart create mode 100644 lib/models/contact_group.dart create mode 100644 lib/models/message.dart create mode 100644 lib/models/path_history.dart create mode 100644 lib/models/path_selection.dart create mode 100644 lib/models/radio_settings.dart create mode 100644 lib/screens/app_settings_screen.dart create mode 100644 lib/screens/ble_debug_log_screen.dart create mode 100644 lib/screens/channel_chat_screen.dart create mode 100644 lib/screens/channels_screen.dart create mode 100644 lib/screens/chat_screen.dart create mode 100644 lib/screens/contacts_screen.dart create mode 100644 lib/screens/device_screen.dart create mode 100644 lib/screens/map_screen.dart create mode 100644 lib/screens/repeater_cli_screen.dart create mode 100644 lib/screens/repeater_hub_screen.dart create mode 100644 lib/screens/repeater_settings_screen.dart create mode 100644 lib/screens/repeater_status_screen.dart create mode 100644 lib/screens/scanner_screen.dart create mode 100644 lib/screens/settings_screen.dart create mode 100644 lib/services/app_settings_service.dart create mode 100644 lib/services/ble_debug_log_service.dart create mode 100644 lib/services/map_marker_service.dart create mode 100644 lib/services/message_retry_service.dart create mode 100644 lib/services/notification_service.dart create mode 100644 lib/services/path_history_service.dart create mode 100644 lib/services/repeater_command_service.dart create mode 100644 lib/services/storage_service.dart create mode 100644 lib/storage/channel_message_store.dart create mode 100644 lib/storage/channel_order_store.dart create mode 100644 lib/storage/channel_settings_store.dart create mode 100644 lib/storage/contact_group_store.dart create mode 100644 lib/storage/contact_store.dart create mode 100644 lib/storage/message_store.dart create mode 100644 lib/utils/emoji_utils.dart create mode 100644 lib/widgets/debug_frame_viewer.dart create mode 100644 lib/widgets/device_tile.dart create mode 100644 lib/widgets/gif_message.dart create mode 100644 lib/widgets/gif_picker.dart create mode 100644 lib/widgets/repeater_login_dialog.dart create mode 100644 linux/.gitignore create mode 100644 linux/CMakeLists.txt create mode 100644 linux/flutter/CMakeLists.txt create mode 100644 linux/flutter/generated_plugin_registrant.cc create mode 100644 linux/flutter/generated_plugin_registrant.h create mode 100644 linux/flutter/generated_plugins.cmake create mode 100644 linux/runner/CMakeLists.txt create mode 100644 linux/runner/main.cc create mode 100644 linux/runner/my_application.cc create mode 100644 linux/runner/my_application.h create mode 100644 macos/.gitignore create mode 100644 macos/Flutter/Flutter-Debug.xcconfig create mode 100644 macos/Flutter/Flutter-Release.xcconfig create mode 100644 macos/Flutter/GeneratedPluginRegistrant.swift create mode 100644 macos/Runner.xcodeproj/project.pbxproj create mode 100644 macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme create mode 100644 macos/Runner.xcworkspace/contents.xcworkspacedata create mode 100644 macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 macos/Runner/AppDelegate.swift create mode 100644 macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png create mode 100644 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png create mode 100644 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png create mode 100644 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png create mode 100644 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png create mode 100644 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png create mode 100644 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png create mode 100644 macos/Runner/Base.lproj/MainMenu.xib create mode 100644 macos/Runner/Configs/AppInfo.xcconfig create mode 100644 macos/Runner/Configs/Debug.xcconfig create mode 100644 macos/Runner/Configs/Release.xcconfig create mode 100644 macos/Runner/Configs/Warnings.xcconfig create mode 100644 macos/Runner/DebugProfile.entitlements create mode 100644 macos/Runner/Info.plist create mode 100644 macos/Runner/MainFlutterWindow.swift create mode 100644 macos/Runner/Release.entitlements create mode 100644 macos/RunnerTests/RunnerTests.swift create mode 100644 pubspec.lock create mode 100644 pubspec.yaml create mode 100644 test/widget_test.dart create mode 100644 web/favicon.png create mode 100644 web/icons/Icon-192.png create mode 100644 web/icons/Icon-512.png create mode 100644 web/icons/Icon-maskable-192.png create mode 100644 web/icons/Icon-maskable-512.png create mode 100644 web/index.html create mode 100644 web/manifest.json create mode 100644 windows/.gitignore create mode 100644 windows/CMakeLists.txt create mode 100644 windows/flutter/CMakeLists.txt create mode 100644 windows/flutter/generated_plugin_registrant.cc create mode 100644 windows/flutter/generated_plugin_registrant.h create mode 100644 windows/flutter/generated_plugins.cmake create mode 100644 windows/runner/CMakeLists.txt create mode 100644 windows/runner/Runner.rc create mode 100644 windows/runner/flutter_window.cpp create mode 100644 windows/runner/flutter_window.h create mode 100644 windows/runner/main.cpp create mode 100644 windows/runner/resource.h create mode 100644 windows/runner/resources/app_icon.ico create mode 100644 windows/runner/runner.exe.manifest create mode 100644 windows/runner/utils.cpp create mode 100644 windows/runner/utils.h create mode 100644 windows/runner/win32_window.cpp create mode 100644 windows/runner/win32_window.h diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..97cafdb7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,82 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.build/ +.buildlog/ +.history +.svn/ +.swiftpm/ +migrate_working_dir/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# The .vscode folder contains launch configuration and tasks you configure in +# VS Code which you may wish to be included in version control, so this line +# is commented out by default. +#.vscode/ + +# Flutter/Dart/Pub related +**/doc/api/ +**/ios/Flutter/.last_build_id +.dart_tool/ +.flutter-plugins-dependencies +.pub-cache/ +.pub/ +/build/ +/coverage/ + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release + +# Flutter plugin generated files +.flutter-plugins +.flutter-plugins-dependencies + +# Environment and secrets +.env +*.env +secrets.dart + +# macOS +.DS_Store +.AppleDouble +.LSOverride + +# iOS +**/ios/Pods/ +**/ios/.symlinks/ +**/ios/Flutter/Flutter.framework +**/ios/Flutter/Flutter.podspec + +# Android +**/android/.gradle/ +**/android/captures/ +**/android/local.properties +**/android/.externalNativeBuild/ +*.jks +keystore.properties + +# Generated files +*.g.dart +*.freezed.dart +*.mocks.dart + +# IDE +.vscode/launch.json +.vscode/settings.json diff --git a/.metadata b/.metadata new file mode 100644 index 00000000..5f4336f9 --- /dev/null +++ b/.metadata @@ -0,0 +1,45 @@ +# This file tracks properties of this Flutter project. +# Used by Flutter tool to assess capabilities and perform upgrades etc. +# +# This file should be version controlled and should not be manually edited. + +version: + revision: "adc901062556672b4138e18a4dc62a4be8f4b3c2" + channel: "stable" + +project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2 + base_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2 + - platform: android + create_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2 + base_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2 + - platform: ios + create_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2 + base_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2 + - platform: linux + create_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2 + base_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2 + - platform: macos + create_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2 + base_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2 + - platform: web + create_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2 + base_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2 + - platform: windows + create_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2 + base_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2 + + # User provided section + + # List of Local paths (relative to this file) that should be + # ignored by the migrate tool. + # + # Files that are not part of the templates will be ignored by default. + unmanaged_files: + - 'lib/main.dart' + - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/AGENTS.md b/AGENTS.md new file mode 100644 index 00000000..bac981d4 --- /dev/null +++ b/AGENTS.md @@ -0,0 +1,34 @@ +# Repository Guidelines + +## Project Structure & Module Organization +- Core Flutter code is in `lib/`, with BLE protocol definitions in `lib/connector/meshcore_protocol.dart` and BLE transport/state in `lib/connector/meshcore_connector.dart`. +- UI lives in `lib/screens/` and `lib/widgets/`, models in `lib/models/`, tests in `test/`, and platform runners in `android/`, `ios/`, `macos/`, `linux/`, `windows/`, `web/`. + +## BLE Frames & Protocol Notes +- Nordic UART Service (NUS) UUIDs: Service `6e400001-b5a3-f393-e0a9-e50e24dcca9e`, RX `6e400002-b5a3-f393-e0a9-e50e24dcca9e`, TX `6e400003-b5a3-f393-e0a9-e50e24dcca9e`. +- Discovery: scans for device name prefix `MeshCore-` and filters by `platformName`/`advertisementData.advName`. +- Frames are capped at `maxFrameSize = 172` bytes; byte 0 is the command/response/push code. I/O is `MeshCoreConnector.sendFrame` and `MeshCoreConnector.receivedFrames`. +- Command codes (to device): `cmdAppStart`=1, `cmdSendTxtMsg`=2, `cmdSendChannelTxtMsg`=3, `cmdGetContacts`=4, `cmdGetDeviceTime`=5, `cmdSetDeviceTime`=6, `cmdSendSelfAdvert`=7, `cmdSetAdvertName`=8, `cmdAddUpdateContact`=9, `cmdSyncNextMessage`=10, `cmdSetRadioParams`=11, `cmdSetRadioTxPower`=12, `cmdResetPath`=13, `cmdSetAdvertLatLon`=14, `cmdRemoveContact`=15, `cmdShareContact`=16, `cmdExportContact`=17, `cmdImportContact`=18, `cmdReboot`=19, `cmdSendLogin`=26, `cmdGetChannel`=31, `cmdSetChannel`=32, `cmdGetRadioSettings`=57. +- Response codes (from device): `respCodeOk`=0, `respCodeErr`=1, `respCodeContactsStart`=2, `respCodeContact`=3, `respCodeEndOfContacts`=4, `respCodeSelfInfo`=5, `respCodeSent`=6, `respCodeContactMsgRecv`=7, `respCodeChannelMsgRecv`=8, `respCodeCurrTime`=9, `respCodeNoMoreMessages`=10, `respCodeContactMsgRecvV3`=16, `respCodeChannelMsgRecvV3`=17, `respCodeChannelInfo`=18, `respCodeRadioSettings`=25. +- Push codes (async): `pushCodeAdvert`=0x80, `pushCodePathUpdated`=0x81, `pushCodeSendConfirmed`=0x82, `pushCodeMsgWaiting`=0x83, `pushCodeLoginSuccess`=0x85, `pushCodeLoginFail`=0x86, `pushCodeLogRxData`=0x88, `pushCodeNewAdvert`=0x8A. +- Device info: `cmdAppStart` triggers `respCodeSelfInfo` with tx power, pubkey, lat/lon, telemetry flags, radio params, and node name (see offsets in `lib/connector/meshcore_connector.dart`). +- Radio/time helpers: `cmdGetRadioSettings` → `respCodeRadioSettings`; `cmdGetDeviceTime` → `respCodeCurrTime`; `cmdSetDeviceTime` updates device time. +- Reboot: the UI sends `sendCliCommand('reboot')` (the raw `cmdReboot` code exists but no frame builder is wired in yet). +- Companion radio format: `cmdSendTxtMsg` expects `[cmd][txt_type][attempt][timestamp x4][pub_key_prefix x6][text...]` (no flags/full pubkey). CLI commands use `txtTypeCliData` in the same format, and the app maps `forceFlood` to attempt `3` when sending. +- Group text packets (`PAYLOAD_TYPE_GRP_TXT`): payload is `[channel_hash (1)][MAC (2)][encrypted data...]`. Decrypted data layout is `[timestamp x4][txt_type][text...]` where text is `"sender: message"` (see MeshCore `BaseChatMesh::sendGroupMessage`). Sender identity is not in the payload; use `PUSH_CODE_LOG_RX_DATA` raw packet path bytes for origin hash when available. +- Identity hash: `PATH_HASH_SIZE` is 1 byte; it is the prefix of the public key (see `Identity::copyHashTo`). Flooded packets append this hash to the path as they traverse hops. Self-identification via log data should compare sender name and presence of self pubkey prefix within the path bytes. + +## Build, Test, and Development Commands +- `~/flutter/bin/flutter pub get` installs dependencies (or `flutter pub get` if Flutter is on PATH). +- `~/flutter/bin/flutter run` launches the app; `~/flutter/bin/flutter build apk|ios` produces release builds. +- `~/flutter/bin/flutter analyze` and `~/flutter/bin/flutter test` run linting and tests. + +## Coding Style & Naming Conventions +- Follow `flutter_lints`, use `lowerCamelCase`/`UpperCamelCase`/`snake_case`, prefer `StatelessWidget` + `Consumer`, and use `const` constructors. +- Material widgets only; keep screens simple, handle disconnects by returning to the scanner, and avoid premature abstractions. + +## Testing Guidelines +- Tests use `flutter_test`; add `*_test.dart` under `test/` and run `flutter test` before UI/protocol changes. + +## Commit & Pull Request Guidelines +- Keep commit subjects short and action-focused; PRs should describe behavior changes, link issues, include screenshots for UI changes, and call out BLE protocol changes explicitly. diff --git a/CLAUDE.md b/CLAUDE.md new file mode 100644 index 00000000..08ef342f --- /dev/null +++ b/CLAUDE.md @@ -0,0 +1,136 @@ +# MeshCore Open - Flutter Client + +Open-source Flutter client for MeshCore LoRa mesh networking devices. + +## Build Commands + +```bash +# Install dependencies +~/flutter/bin/flutter pub get + +# Run in debug mode +~/flutter/bin/flutter run + +# Build Android APK +~/flutter/bin/flutter build apk + +# Build iOS +~/flutter/bin/flutter build ios + +# Run static analysis +~/flutter/bin/flutter analyze + +# Run tests +~/flutter/bin/flutter test +``` + +## Project Structure + +``` +lib/ +├── main.dart # App entry point, MaterialApp setup with Provider +├── connector/ +│ └── meshcore_connector.dart # BLE communication layer (MeshCoreConnector) +├── screens/ +│ ├── scanner_screen.dart # BLE device scanning (home screen) +│ ├── device_screen.dart # Connected device hub with navigation +│ ├── chat_screen.dart # Chat interface (placeholder) +│ ├── contacts_screen.dart # Contacts list (placeholder) +│ └── settings_screen.dart # Device info and app settings +└── widgets/ + └── device_tile.dart # Device list item with signal strength +``` + +## Architecture + +### State Management +- **Provider** with `ChangeNotifier` pattern +- `MeshCoreConnector` is the central state holder for BLE connection +- Screens use `Consumer` for reactive UI updates + +### Theming +- Material 3 design (`useMaterial3: true`) +- System-based dark/light mode (`ThemeMode.system`) +- Blue color scheme seed + +## BLE Protocol + +### Nordic UART Service (NUS) +- **Service UUID**: `6e400001-b5a3-f393-e0a9-e50e24dcca9e` +- **RX Characteristic**: `6e400002-b5a3-f393-e0a9-e50e24dcca9e` (Write to device) +- **TX Characteristic**: `6e400003-b5a3-f393-e0a9-e50e24dcca9e` (Notify from device) + +### Device Discovery +- Scans for devices with name prefix `MeshCore-` +- Filters by `platformName` or `advertisementData.advName` + +### Connection States +```dart +enum MeshCoreConnectionState { + disconnected, + scanning, + connecting, + connected, + disconnecting, +} +``` + +### Frame I/O +- **Send**: `MeshCoreConnector.sendFrame(Uint8List data)` +- **Receive**: `MeshCoreConnector.receivedFrames` stream of `Uint8List` + +## Dependencies + +| Package | Version | Purpose | +|---------|---------|---------| +| flutter_blue_plus | ^2.1.0 | BLE communication | +| provider | ^6.1.5+1 | State management | +| cupertino_icons | ^1.0.8 | iOS-style icons | + +## Platform Configuration + +### Android (`android/app/src/main/AndroidManifest.xml`) +- `BLUETOOTH`, `BLUETOOTH_ADMIN` (API 30 and below) +- `BLUETOOTH_SCAN`, `BLUETOOTH_CONNECT`, `BLUETOOTH_ADVERTISE` (API 31+) +- `ACCESS_FINE_LOCATION`, `ACCESS_COARSE_LOCATION` (for BLE scanning) + +### iOS (`ios/Runner/Info.plist`) +- `NSBluetoothAlwaysUsageDescription` +- `NSBluetoothPeripheralUsageDescription` + +## Coding Conventions + +### Code Philosophy +- **Minimal**: Only write code that is necessary. Avoid over-engineering. +- **Organized**: Keep related code together. One responsibility per file. +- **Maintainable**: Favor readability over cleverness. Simple is better. + +### Style +- Use `StatelessWidget` with `Consumer` for state-dependent UI +- Use `const` constructors where possible +- Prefix private methods/fields with `_` +- Center app bar titles (`centerTitle: true`) +- **Material widgets only** - no Cupertino or custom widgets +- Handle disconnection gracefully (auto-navigate back to scanner) + +### Avoid +- Premature abstractions - don't create helpers until needed in 3+ places +- Unnecessary comments - code should be self-explanatory +- Feature flags or backwards-compatibility shims +- Over-engineered error handling for impossible scenarios + +## Key Files + +| File | Purpose | +|------|---------| +| `lib/connector/meshcore_connector.dart` | All BLE logic - scanning, connecting, data transfer | +| `lib/screens/scanner_screen.dart` | Entry point UI, device list | +| `lib/main.dart` | App configuration, theme, Provider setup | +| `pubspec.yaml` | Dependencies and project metadata | + +## Placeholder Screens + +The following screens are implemented as placeholders and need full implementation: +- `chat_screen.dart` - Mesh chat functionality +- `contacts_screen.dart` - Contact management +- `settings_screen.dart` - Radio settings, node identity, location (partially implemented) diff --git a/README.md b/README.md new file mode 100644 index 00000000..8c9e5bce --- /dev/null +++ b/README.md @@ -0,0 +1,16 @@ +# meshcore_open + +A new Flutter project. + +## 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. diff --git a/analysis_options.yaml b/analysis_options.yaml new file mode 100644 index 00000000..0d290213 --- /dev/null +++ b/analysis_options.yaml @@ -0,0 +1,28 @@ +# This file configures the analyzer, which statically analyzes Dart code to +# check for errors, warnings, and lints. +# +# The issues identified by the analyzer are surfaced in the UI of Dart-enabled +# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be +# invoked from the command line by running `flutter analyze`. + +# The following line activates a set of recommended lints for Flutter apps, +# packages, and plugins designed to encourage good coding practices. +include: package:flutter_lints/flutter.yaml + +linter: + # The lint rules applied to this project can be customized in the + # section below to disable rules from the `package:flutter_lints/flutter.yaml` + # included above or to enable additional rules. A list of all available lints + # and their documentation is published at https://dart.dev/lints. + # + # Instead of disabling a lint rule for the entire project in the + # section below, it can also be suppressed for a single line of code + # or a specific dart file by using the `// ignore: name_of_lint` and + # `// ignore_for_file: name_of_lint` syntax on the line or in the file + # producing the lint. + rules: + # avoid_print: false # Uncomment to disable the `avoid_print` rule + # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule + +# Additional information about this file can be found at +# https://dart.dev/guides/language/analysis-options diff --git a/android/.gitignore b/android/.gitignore new file mode 100644 index 00000000..be3943c9 --- /dev/null +++ b/android/.gitignore @@ -0,0 +1,14 @@ +gradle-wrapper.jar +/.gradle +/captures/ +/gradlew +/gradlew.bat +/local.properties +GeneratedPluginRegistrant.java +.cxx/ + +# Remember to never publicly share your keystore. +# See https://flutter.dev/to/reference-keystore +key.properties +**/*.keystore +**/*.jks diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts new file mode 100644 index 00000000..d9723d2e --- /dev/null +++ b/android/app/build.gradle.kts @@ -0,0 +1,49 @@ +plugins { + id("com.android.application") + id("kotlin-android") + // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + id("dev.flutter.flutter-gradle-plugin") +} + +android { + namespace = "com.meshcore.meshcore_open" + compileSdk = flutter.compileSdkVersion + ndkVersion = flutter.ndkVersion + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + isCoreLibraryDesugaringEnabled = true + } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_11.toString() + } + + defaultConfig { + // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). + applicationId = "com.meshcore.meshcore_open" + // You can update the following values to match your application needs. + // For more information, see: https://flutter.dev/to/review-gradle-config. + minSdk = flutter.minSdkVersion + targetSdk = flutter.targetSdkVersion + versionCode = flutter.versionCode + versionName = flutter.versionName + } + + buildTypes { + release { + // TODO: Add your own signing config for the release build. + // Signing with the debug keys for now, so `flutter run --release` works. + signingConfig = signingConfigs.getByName("debug") + } + } +} + +flutter { + source = "../.." +} + +dependencies { + coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4") +} diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml new file mode 100644 index 00000000..399f6981 --- /dev/null +++ b/android/app/src/debug/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml new file mode 100644 index 00000000..1f6da2dc --- /dev/null +++ b/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/app/src/main/kotlin/com/meshcore/meshcore_open/MainActivity.kt b/android/app/src/main/kotlin/com/meshcore/meshcore_open/MainActivity.kt new file mode 100644 index 00000000..4350b1e1 --- /dev/null +++ b/android/app/src/main/kotlin/com/meshcore/meshcore_open/MainActivity.kt @@ -0,0 +1,5 @@ +package com.meshcore.meshcore_open + +import io.flutter.embedding.android.FlutterActivity + +class MainActivity : FlutterActivity() diff --git a/android/app/src/main/res/drawable-v21/launch_background.xml b/android/app/src/main/res/drawable-v21/launch_background.xml new file mode 100644 index 00000000..f74085f3 --- /dev/null +++ b/android/app/src/main/res/drawable-v21/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/android/app/src/main/res/drawable/launch_background.xml b/android/app/src/main/res/drawable/launch_background.xml new file mode 100644 index 00000000..304732f8 --- /dev/null +++ b/android/app/src/main/res/drawable/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..db77bb4b7b0906d62b1847e87f15cdcacf6a4f29 GIT binary patch literal 544 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAj~WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!h8bpbvhu0Wd6uZuB!w&u2PAxD2eNXD>P5D~Wn-+_Wa#27Xc zC?Zj|6r#X(-D3u$NCt}(Ms06KgJ4FxJVv{GM)!I~&n8Bnc94O7-Hd)cjDZswgC;Qs zO=b+9!WcT8F?0rF7!Uys2bs@gozCP?z~o%U|N3vA*22NaGQG zlg@K`O_XuxvZ&Ks^m&R!`&1=spLvfx7oGDKDwpwW`#iqdw@AL`7MR}m`rwr|mZgU`8P7SBkL78fFf!WnuYWm$5Z0 zNXhDbCv&49sM544K|?c)WrFfiZvCi9h0O)B3Pgg&ebxsLQ05GG~ AQ2+n{ literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..17987b79bb8a35cc66c3c1fd44f5a5526c1b78be GIT binary patch literal 442 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5Xx&nMcT!A!W`0S9QKQy;}1Cl^CgaH=;G9cpY;r$Q>i*pfB zP2drbID<_#qf;rPZx^FqH)F_D#*k@@q03KywUtLX8Ua?`H+NMzkczFPK3lFz@i_kW%1NOn0|D2I9n9wzH8m|-tHjsw|9>@K=iMBhxvkv6m8Y-l zytQ?X=U+MF$@3 zt`~i=@j|6y)RWMK--}M|=T`o&^Ni>IoWKHEbBXz7?A@mgWoL>!*SXo`SZH-*HSdS+ yn*9;$7;m`l>wYBC5bq;=U}IMqLzqbYCidGC!)_gkIk_C@Uy!y&wkt5C($~2D>~)O*cj@FGjOCM)M>_ixfudOh)?xMu#Fs z#}Y=@YDTwOM)x{K_j*Q;dPdJ?Mz0n|pLRx{4n|)f>SXlmV)XB04CrSJn#dS5nK2lM zrZ9#~WelCp7&e13Y$jvaEXHskn$2V!!DN-nWS__6T*l;H&Fopn?A6HZ-6WRLFP=R` zqG+CE#d4|IbyAI+rJJ`&x9*T`+a=p|0O(+s{UBcyZdkhj=yS1>AirP+0R;mf2uMgM zC}@~JfByORAh4SyRgi&!(cja>F(l*O+nd+@4m$|6K6KDn_&uvCpV23&>G9HJp{xgg zoq1^2_p9@|WEo z*X_Uko@K)qYYv~>43eQGMdbiGbo>E~Q& zrYBH{QP^@Sti!`2)uG{irBBq@y*$B zi#&(U-*=fp74j)RyIw49+0MRPMRU)+a2r*PJ$L5roHt2$UjExCTZSbq%V!HeS7J$N zdG@vOZB4v_lF7Plrx+hxo7(fCV&}fHq)$ literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..d5f1c8d34e7a88e3f88bea192c3a370d44689c3c GIT binary patch literal 1031 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=BuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFa`(sgt!6~Yi|1%a`XoT0ojZ}lNrNjb9xjc(B0U1_% zz5^97Xt*%oq$rQy4?0GKNfJ44uvxI)gC`h-NZ|&0-7(qS@?b!5r36oQ}zyZrNO3 zMO=Or+<~>+A&uN&E!^Sl+>xE!QC-|oJv`ApDhqC^EWD|@=#J`=d#Xzxs4ah}w&Jnc z$|q_opQ^2TrnVZ0o~wh<3t%W&flvYGe#$xqda2bR_R zvPYgMcHgjZ5nSA^lJr%;<&0do;O^tDDh~=pIxA#coaCY>&N%M2^tq^U%3DB@ynvKo}b?yu-bFc-u0JHzced$sg7S3zqI(2 z#Km{dPr7I=pQ5>FuK#)QwK?Y`E`B?nP+}U)I#c1+FM*1kNvWG|a(TpksZQ3B@sD~b zpQ2)*V*TdwjFOtHvV|;OsiDqHi=6%)o4b!)x$)%9pGTsE z-JL={-Ffv+T87W(Xpooq<`r*VzWQcgBN$$`u}f>-ZQI1BB8ykN*=e4rIsJx9>z}*o zo~|9I;xof literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..4d6372eebdb28e45604e46eeda8dd24651419bc0 GIT binary patch literal 1443 zcmb`G{WsKk6vsdJTdFg%tJav9_E4vzrOaqkWF|A724Nly!y+?N9`YV6wZ}5(X(D_N(?!*n3`|_r0Hc?=PQw&*vnU?QTFY zB_MsH|!j$PP;I}?dppoE_gA(4uc!jV&0!l7_;&p2^pxNo>PEcNJv za5_RT$o2Mf!<+r?&EbHH6nMoTsDOa;mN(wv8RNsHpG)`^ymG-S5By8=l9iVXzN_eG%Xg2@Xeq76tTZ*dGh~Lo9vl;Zfs+W#BydUw zCkZ$o1LqWQO$FC9aKlLl*7x9^0q%0}$OMlp@Kk_jHXOjofdePND+j!A{q!8~Jn+s3 z?~~w@4?egS02}8NuulUA=L~QQfm;MzCGd)XhiftT;+zFO&JVyp2mBww?;QByS_1w! zrQlx%{^cMj0|Bo1FjwY@Q8?Hx0cIPF*@-ZRFpPc#bBw{5@tD(5%sClzIfl8WU~V#u zm5Q;_F!wa$BSpqhN>W@2De?TKWR*!ujY;Yylk_X5#~V!L*Gw~;$%4Q8~Mad z@`-kG?yb$a9cHIApZDVZ^U6Xkp<*4rU82O7%}0jjHlK{id@?-wpN*fCHXyXh(bLt* zPc}H-x0e4E&nQ>y%B-(EL=9}RyC%MyX=upHuFhAk&MLbsF0LP-q`XnH78@fT+pKPW zu72MW`|?8ht^tz$iC}ZwLp4tB;Q49K!QCF3@!iB1qOI=?w z7In!}F~ij(18UYUjnbmC!qKhPo%24?8U1x{7o(+?^Zu0Hx81|FuS?bJ0jgBhEMzf< zCgUq7r2OCB(`XkKcN-TL>u5y#dD6D!)5W?`O5)V^>jb)P)GBdy%t$uUMpf$SNV31$ zb||OojAbvMP?T@$h_ZiFLFVHDmbyMhJF|-_)HX3%m=CDI+ID$0^C>kzxprBW)hw(v zr!Gmda);ICoQyhV_oP5+C%?jcG8v+D@9f?Dk*!BxY}dazmrT@64UrP3hlslANK)bq z$67n83eh}OeW&SV@HG95P|bjfqJ7gw$e+`Hxo!4cx`jdK1bJ>YDSpGKLPZ^1cv$ek zIB?0S<#tX?SJCLWdMd{-ME?$hc7A$zBOdIJ)4!KcAwb=VMov)nK;9z>x~rfT1>dS+ zZ6#`2v@`jgbqq)P22H)Tx2CpmM^o1$B+xT6`(v%5xJ(?j#>Q$+rx_R|7TzDZe{J6q zG1*EcU%tE?!kO%^M;3aM6JN*LAKUVb^xz8-Pxo#jR5(-KBeLJvA@-gxNHx0M-ZJLl z;#JwQoh~9V?`UVo#}{6ka@II>++D@%KqGpMdlQ}?9E*wFcf5(#XQnP$Dk5~%iX^>f z%$y;?M0BLp{O3a(-4A?ewryHrrD%cx#Q^%KY1H zNre$ve+vceSLZcNY4U(RBX&)oZn*Py()h)XkE?PL$!bNb{N5FVI2Y%LKEm%yvpyTP z(1P?z~7YxD~Rf<(a@_y` literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml new file mode 100644 index 00000000..06952be7 --- /dev/null +++ b/android/app/src/main/res/values-night/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml new file mode 100644 index 00000000..cb1ef880 --- /dev/null +++ b/android/app/src/main/res/values/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml new file mode 100644 index 00000000..399f6981 --- /dev/null +++ b/android/app/src/profile/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/android/build.gradle.kts b/android/build.gradle.kts new file mode 100644 index 00000000..dbee657b --- /dev/null +++ b/android/build.gradle.kts @@ -0,0 +1,24 @@ +allprojects { + repositories { + google() + mavenCentral() + } +} + +val newBuildDir: Directory = + rootProject.layout.buildDirectory + .dir("../../build") + .get() +rootProject.layout.buildDirectory.value(newBuildDir) + +subprojects { + val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name) + project.layout.buildDirectory.value(newSubprojectBuildDir) +} +subprojects { + project.evaluationDependsOn(":app") +} + +tasks.register("clean") { + delete(rootProject.layout.buildDirectory) +} diff --git a/android/gradle.properties b/android/gradle.properties new file mode 100644 index 00000000..f018a618 --- /dev/null +++ b/android/gradle.properties @@ -0,0 +1,3 @@ +org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError +android.useAndroidX=true +android.enableJetifier=true diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..ac3b4792 --- /dev/null +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts new file mode 100644 index 00000000..fb605bc8 --- /dev/null +++ b/android/settings.gradle.kts @@ -0,0 +1,26 @@ +pluginManagement { + val flutterSdkPath = + run { + val properties = java.util.Properties() + file("local.properties").inputStream().use { properties.load(it) } + val flutterSdkPath = properties.getProperty("flutter.sdk") + require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" } + flutterSdkPath + } + + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") + + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} + +plugins { + id("dev.flutter.flutter-plugin-loader") version "1.0.0" + id("com.android.application") version "8.9.1" apply false + id("org.jetbrains.kotlin.android") version "2.1.0" apply false +} + +include(":app") diff --git a/ios/.gitignore b/ios/.gitignore new file mode 100644 index 00000000..7a7f9873 --- /dev/null +++ b/ios/.gitignore @@ -0,0 +1,34 @@ +**/dgph +*.mode1v3 +*.mode2v3 +*.moved-aside +*.pbxuser +*.perspectivev3 +**/*sync/ +.sconsign.dblite +.tags* +**/.vagrant/ +**/DerivedData/ +Icon? +**/Pods/ +**/.symlinks/ +profile +xcuserdata +**/.generated/ +Flutter/App.framework +Flutter/Flutter.framework +Flutter/Flutter.podspec +Flutter/Generated.xcconfig +Flutter/ephemeral/ +Flutter/app.flx +Flutter/app.zip +Flutter/flutter_assets/ +Flutter/flutter_export_environment.sh +ServiceDefinitions.json +Runner/GeneratedPluginRegistrant.* + +# Exceptions to above rules. +!default.mode1v3 +!default.mode2v3 +!default.pbxuser +!default.perspectivev3 diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist new file mode 100644 index 00000000..1dc6cf76 --- /dev/null +++ b/ios/Flutter/AppFrameworkInfo.plist @@ -0,0 +1,26 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + App + CFBundleIdentifier + io.flutter.flutter.app + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + App + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1.0 + MinimumOSVersion + 13.0 + + diff --git a/ios/Flutter/Debug.xcconfig b/ios/Flutter/Debug.xcconfig new file mode 100644 index 00000000..592ceee8 --- /dev/null +++ b/ios/Flutter/Debug.xcconfig @@ -0,0 +1 @@ +#include "Generated.xcconfig" diff --git a/ios/Flutter/Release.xcconfig b/ios/Flutter/Release.xcconfig new file mode 100644 index 00000000..592ceee8 --- /dev/null +++ b/ios/Flutter/Release.xcconfig @@ -0,0 +1 @@ +#include "Generated.xcconfig" diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj new file mode 100644 index 00000000..1cf3a4aa --- /dev/null +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,616 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 54; + objects = { + +/* Begin PBXBuildFile section */ + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; + 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; + 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; + 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 331C8085294A63A400263BE5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 97C146E61CF9000F007C117D /* Project object */; + proxyType = 1; + remoteGlobalIDString = 97C146ED1CF9000F007C117D; + remoteInfo = Runner; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 9705A1C41CF9048500538489 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; + 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; + 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; + 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; + 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 97C146EB1CF9000F007C117D /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 331C8082294A63A400263BE5 /* RunnerTests */ = { + isa = PBXGroup; + children = ( + 331C807B294A618700263BE5 /* RunnerTests.swift */, + ); + path = RunnerTests; + sourceTree = ""; + }; + 9740EEB11CF90186004384FC /* Flutter */ = { + isa = PBXGroup; + children = ( + 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, + 9740EEB21CF90195004384FC /* Debug.xcconfig */, + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, + 9740EEB31CF90195004384FC /* Generated.xcconfig */, + ); + name = Flutter; + sourceTree = ""; + }; + 97C146E51CF9000F007C117D = { + isa = PBXGroup; + children = ( + 9740EEB11CF90186004384FC /* Flutter */, + 97C146F01CF9000F007C117D /* Runner */, + 97C146EF1CF9000F007C117D /* Products */, + 331C8082294A63A400263BE5 /* RunnerTests */, + ); + sourceTree = ""; + }; + 97C146EF1CF9000F007C117D /* Products */ = { + isa = PBXGroup; + children = ( + 97C146EE1CF9000F007C117D /* Runner.app */, + 331C8081294A63A400263BE5 /* RunnerTests.xctest */, + ); + name = Products; + sourceTree = ""; + }; + 97C146F01CF9000F007C117D /* Runner */ = { + isa = PBXGroup; + children = ( + 97C146FA1CF9000F007C117D /* Main.storyboard */, + 97C146FD1CF9000F007C117D /* Assets.xcassets */, + 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, + 97C147021CF9000F007C117D /* Info.plist */, + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */, + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */, + ); + path = Runner; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 331C8080294A63A400263BE5 /* RunnerTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; + buildPhases = ( + 331C807D294A63A400263BE5 /* Sources */, + 331C807F294A63A400263BE5 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 331C8086294A63A400263BE5 /* PBXTargetDependency */, + ); + name = RunnerTests; + productName = RunnerTests; + productReference = 331C8081294A63A400263BE5 /* RunnerTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; + 97C146ED1CF9000F007C117D /* Runner */ = { + isa = PBXNativeTarget; + buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; + buildPhases = ( + 9740EEB61CF901F6004384FC /* Run Script */, + 97C146EA1CF9000F007C117D /* Sources */, + 97C146EB1CF9000F007C117D /* Frameworks */, + 97C146EC1CF9000F007C117D /* Resources */, + 9705A1C41CF9048500538489 /* Embed Frameworks */, + 3B06AD1E1E4923F5004D2608 /* Thin Binary */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = Runner; + productName = Runner; + productReference = 97C146EE1CF9000F007C117D /* Runner.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 97C146E61CF9000F007C117D /* Project object */ = { + isa = PBXProject; + attributes = { + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 1510; + ORGANIZATIONNAME = ""; + TargetAttributes = { + 331C8080294A63A400263BE5 = { + CreatedOnToolsVersion = 14.0; + TestTargetID = 97C146ED1CF9000F007C117D; + }; + 97C146ED1CF9000F007C117D = { + CreatedOnToolsVersion = 7.3.1; + LastSwiftMigration = 1100; + }; + }; + }; + buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 97C146E51CF9000F007C117D; + productRefGroup = 97C146EF1CF9000F007C117D /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 97C146ED1CF9000F007C117D /* Runner */, + 331C8080294A63A400263BE5 /* RunnerTests */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 331C807F294A63A400263BE5 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 97C146EC1CF9000F007C117D /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, + 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, + 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", + ); + name = "Thin Binary"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; + }; + 9740EEB61CF901F6004384FC /* Run Script */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Run Script"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 331C807D294A63A400263BE5 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 97C146EA1CF9000F007C117D /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */, + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 331C8086294A63A400263BE5 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 97C146ED1CF9000F007C117D /* Runner */; + targetProxy = 331C8085294A63A400263BE5 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 97C146FA1CF9000F007C117D /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 97C146FB1CF9000F007C117D /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 97C147001CF9000F007C117D /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 249021D3217E4FDB00AE95B9 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Profile; + }; + 249021D4217E4FDB00AE95B9 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.meshcore.meshcoreOpen; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Profile; + }; + 331C8088294A63A400263BE5 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.meshcore.meshcoreOpen.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Debug; + }; + 331C8089294A63A400263BE5 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.meshcore.meshcoreOpen.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Release; + }; + 331C808A294A63A400263BE5 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.meshcore.meshcoreOpen.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Profile; + }; + 97C147031CF9000F007C117D /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 97C147041CF9000F007C117D /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 97C147061CF9000F007C117D /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.meshcore.meshcoreOpen; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Debug; + }; + 97C147071CF9000F007C117D /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.meshcore.meshcoreOpen; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 331C8088294A63A400263BE5 /* Debug */, + 331C8089294A63A400263BE5 /* Release */, + 331C808A294A63A400263BE5 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 97C147031CF9000F007C117D /* Debug */, + 97C147041CF9000F007C117D /* Release */, + 249021D3217E4FDB00AE95B9 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 97C147061CF9000F007C117D /* Debug */, + 97C147071CF9000F007C117D /* Release */, + 249021D4217E4FDB00AE95B9 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 97C146E61CF9000F007C117D /* Project object */; +} diff --git a/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..919434a6 --- /dev/null +++ b/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /dev/null +++ b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 00000000..f9b0d7c5 --- /dev/null +++ b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme new file mode 100644 index 00000000..e3773d42 --- /dev/null +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ios/Runner.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..1d526a16 --- /dev/null +++ b/ios/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /dev/null +++ b/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 00000000..f9b0d7c5 --- /dev/null +++ b/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift new file mode 100644 index 00000000..62666446 --- /dev/null +++ b/ios/Runner/AppDelegate.swift @@ -0,0 +1,13 @@ +import Flutter +import UIKit + +@main +@objc class AppDelegate: FlutterAppDelegate { + override func application( + _ application: UIApplication, + didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? + ) -> Bool { + GeneratedPluginRegistrant.register(with: self) + return super.application(application, didFinishLaunchingWithOptions: launchOptions) + } +} diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 00000000..d36b1fab --- /dev/null +++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,122 @@ +{ + "images" : [ + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-App-20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-App-20x20@3x.png", + "scale" : "3x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@3x.png", + "scale" : "3x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@3x.png", + "scale" : "3x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@2x.png", + "scale" : "2x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@3x.png", + "scale" : "3x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-App-20x20@1x.png", + "scale" : "1x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-App-20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@1x.png", + "scale" : "1x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@1x.png", + "scale" : "1x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@2x.png", + "scale" : "2x" + }, + { + "size" : "83.5x83.5", + "idiom" : "ipad", + "filename" : "Icon-App-83.5x83.5@2x.png", + "scale" : "2x" + }, + { + "size" : "1024x1024", + "idiom" : "ios-marketing", + "filename" : "Icon-App-1024x1024@1x.png", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..dc9ada4725e9b0ddb1deab583e5b5102493aa332 GIT binary patch literal 10932 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 literal 0 HcmV?d00001 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..797d452e458972bab9d994556c8305db4c827017 GIT binary patch literal 406 zcmV;H0crk;P))>cdjpWt&rLJgVp-t?DREyuq1A%0Z4)6_WsQ7{nzjN zo!X zGXV)2i3kcZIL~_j>uIKPK_zib+3T+Nt3Mb&Br)s)UIaA}@p{wDda>7=Q|mGRp7pqY zkJ!7E{MNz$9nOwoVqpFb)}$IP24Wn2JJ=Cw(!`OXJBr45rP>>AQr$6c7slJWvbpNW z@KTwna6d?PP>hvXCcp=4F;=GR@R4E7{4VU^0p4F>v^#A|>07*qoM6N<$f*5nx ACIA2c literal 0 HcmV?d00001 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..6ed2d933e1120817fe9182483a228007b18ab6ae GIT binary patch literal 450 zcmV;z0X_bSP)iGWQ_5NJQ_~rNh*z)}eT%KUb z`7gNk0#AwF^#0T0?hIa^`~Ck;!}#m+_uT050aTR(J!bU#|IzRL%^UsMS#KsYnTF*!YeDOytlP4VhV?b} z%rz_<=#CPc)tU1MZTq~*2=8~iZ!lSa<{9b@2Jl;?IEV8)=fG217*|@)CCYgFze-x? zIFODUIA>nWKpE+bn~n7;-89sa>#DR>TSlqWk*!2hSN6D~Qb#VqbP~4Fk&m`@1$JGr zXPIdeRE&b2Thd#{MtDK$px*d3-Wx``>!oimf%|A-&-q*6KAH)e$3|6JV%HX{Hig)k suLT-RhftRq8b9;(V=235Wa|I=027H2wCDra;{X5v07*qoM6N<$f;9x^2LJ#7 literal 0 HcmV?d00001 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..4cd7b0099ca80c806f8fe495613e8d6c69460d76 GIT binary patch literal 282 zcmV+#0p(^bcu7P-R4C8Q z&e;xxFbF_Vrezo%_kH*OKhshZ6BFpG-Y1e10`QXJKbND7AMQ&cMj60B5TNObaZxYybcN07*qoM6N<$g3m;S%K!iX literal 0 HcmV?d00001 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..fe730945a01f64a61e2235dbe3f45b08f7729182 GIT binary patch literal 462 zcmV;<0WtoGP)-}iV`2<;=$?g5M=KQbZ{F&YRNy7Nn@%_*5{gvDM0aKI4?ESmw z{NnZg)A0R`+4?NF_RZexyVB&^^ZvN!{I28tr{Vje;QNTz`dG&Jz0~Ek&f2;*Z7>B|cg}xYpxEFY+0YrKLF;^Q+-HreN0P{&i zK~zY`?b7ECf-n?@;d<&orQ*Q7KoR%4|C>{W^h6@&01>0SKS`dn{Q}GT%Qj_{PLZ_& zs`MFI#j-(>?bvdZ!8^xTwlY{qA)T4QLbY@j(!YJ7aXJervHy6HaG_2SB`6CC{He}f zHVw(fJWApwPq!6VY7r1w-Fs)@ox~N+q|w~e;JI~C4Vf^@d>Wvj=fl`^u9x9wd9 zR%3*Q+)t%S!MU_`id^@&Y{y7-r98lZX0?YrHlfmwb?#}^1b{8g&KzmkE(L>Z&)179 zp<)v6Y}pRl100G2FL_t(o!|l{-Q-VMg#&MKg7c{O0 z2wJImOS3Gy*Z2Qifdv~JYOp;v+U)a|nLoc7hNH;I$;lzDt$}rkaFw1mYK5_0Q(Sut zvbEloxON7$+HSOgC9Z8ltuC&0OSF!-mXv5caV>#bc3@hBPX@I$58-z}(ZZE!t-aOG zpjNkbau@>yEzH(5Yj4kZiMH32XI!4~gVXNnjAvRx;Sdg^`>2DpUEwoMhTs_st8pKG z(%SHyHdU&v%f36~uERh!bd`!T2dw;z6PrOTQ7Vt*#9F2uHlUVnb#ev_o^fh}Dzmq} zWtlk35}k=?xj28uO|5>>$yXadTUE@@IPpgH`gJ~Ro4>jd1IF|(+IX>8M4Ps{PNvmI zNj4D+XgN83gPt_Gm}`Ybv{;+&yu-C(Grdiahmo~BjG-l&mWM+{e5M1sm&=xduwgM9 z`8OEh`=F3r`^E{n_;%9weN{cf2%7=VzC@cYj+lg>+3|D|_1C@{hcU(DyQG_BvBWe? zvTv``=%b1zrol#=R`JB)>cdjpWt&rLJgVp-t?DREyuq1A%0Z4)6_WsQ7{nzjN zo!X zGXV)2i3kcZIL~_j>uIKPK_zib+3T+Nt3Mb&Br)s)UIaA}@p{wDda>7=Q|mGRp7pqY zkJ!7E{MNz$9nOwoVqpFb)}$IP24Wn2JJ=Cw(!`OXJBr45rP>>AQr$6c7slJWvbpNW z@KTwna6d?PP>hvXCcp=4F;=GR@R4E7{4VU^0p4F>v^#A|>07*qoM6N<$f*5nx ACIA2c literal 0 HcmV?d00001 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..502f463a9bc882b461c96aadf492d1729e49e725 GIT binary patch literal 586 zcmV-Q0=4~#P)+}#`wDE{8-2Mebf5<{{PqV{TgVcv*r8?UZ3{-|G?_}T*&y;@cqf{ z{Q*~+qr%%p!1pS*_Uicl#q9lc(D`!D`LN62sNwq{oYw(Wmhk)k<@f$!$@ng~_5)Ru z0Z)trIA5^j{DIW^c+vT2%lW+2<(RtE2wR;4O@)Tm`Xr*?A(qYoM}7i5Yxw>D(&6ou zxz!_Xr~yNF+waPe00049Nkl*;a!v6h%{rlvIH#gW3s8p;bFr=l}mRqpW2h zw=OA%hdyL~z+UHOzl0eKhEr$YYOL-c-%Y<)=j?(bzDweB7{b+%_ypvm_cG{SvM=DK zhv{K@m>#Bw>2W$eUI#iU)Wdgs8Y3U+A$Gd&{+j)d)BmGKx+43U_!tik_YlN)>$7G! zhkE!s;%oku3;IwG3U^2kw?z+HM)jB{@zFhK8P#KMSytSthr+4!c(5c%+^UBn`0X*2 zy3(k600_CSZj?O$Qu%&$;|TGUJrptR(HzyIx>5E(2r{eA(<6t3e3I0B)7d6s7?Z5J zZ!rtKvA{MiEBm&KFtoifx>5P^Z=vl)95XJn()aS5%ad(s?4-=Tkis9IGu{`Fy8r+H07*qoM6N<$f20Z)wqMt%V?S?~D#06};F zA3KcL`Wb+>5ObvgQIG&ig8(;V04hz?@cqy3{mSh8o!|U|)cI!1_+!fWH@o*8vh^CU z^ws0;(c$gI+2~q^tO#GDHf@=;DncUw00J^eL_t(&-tE|HQ`%4vfZ;WsBqu-$0nu1R zq^Vj;p$clf^?twn|KHO+IGt^q#a3X?w9dXC@*yxhv&l}F322(8Y1&=P&I}~G@#h6; z1CV9ecD9ZEe87{{NtI*)_aJ<`kJa z?5=RBtFF50s;jQLFil-`)m2wrb=6h(&brpj%nG_U&ut~$?8Rokzxi8zJoWr#2dto5 zOX_URcc<1`Iky+jc;A%Vzx}1QU{2$|cKPom2Vf1{8m`vja4{F>HS?^Nc^rp}xo+Nh zxd}eOm`fm3@MQC1< zIk&aCjb~Yh%5+Yq0`)D;q{#-Uqlv*o+Oor zE!I71Z@ASH3grl8&P^L0WpavHoP|UX4e?!igT`4?AZk$hu*@%6WJ;zDOGlw7kj@ zY5!B-0ft0f?Lgb>C;$Ke07*qoM6N<$f~t1N9smFU literal 0 HcmV?d00001 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..0ec303439225b78712f49115768196d8d76f6790 GIT binary patch literal 862 zcmV-k1EKthP)20Z)wqMt%V?S?~D#06};F zA3KcL`Wb+>5ObvgQIG&ig8(;V04hz?@cqy3{mSh8o!|U|)cI!1_+!fWH@o*8vh^CU z^ws0;(c$gI+2~q^tO#GDHf@=;DncUw00J^eL_t(&-tE|HQ`%4vfZ;WsBqu-$0nu1R zq^Vj;p$clf^?twn|KHO+IGt^q#a3X?w9dXC@*yxhv&l}F322(8Y1&=P&I}~G@#h6; z1CV9ecD9ZEe87{{NtI*)_aJ<`kJa z?5=RBtFF50s;jQLFil-`)m2wrb=6h(&brpj%nG_U&ut~$?8Rokzxi8zJoWr#2dto5 zOX_URcc<1`Iky+jc;A%Vzx}1QU{2$|cKPom2Vf1{8m`vja4{F>HS?^Nc^rp}xo+Nh zxd}eOm`fm3@MQC1< zIk&aCjb~Yh%5+Yq0`)D;q{#-Uqlv*o+Oor zE!I71Z@ASH3grl8&P^L0WpavHoP|UX4e?!igT`4?AZk$hu*@%6WJ;zDOGlw7kj@ zY5!B-0ft0f?Lgb>C;$Ke07*qoM6N<$f~t1N9smFU literal 0 HcmV?d00001 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..e9f5fea27c705180eb716271f41b582e76dcbd90 GIT binary patch literal 1674 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 literal 0 HcmV?d00001 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..0467bf12aa4d28f374bb26596605a46dcbb3e7c8 GIT binary patch literal 1418 zcmV;51$Fv~P)q zKfU)WzW*n(@|xWGCA9ScMt*e9`2kdxPQ&&>|-UCa7_51w+ zLUsW@ZzZSW0y$)Hp~e9%PvP|a03ks1`~K?q{u;6NC8*{AOqIUq{CL&;p56Lf$oQGq z^={4hPQv)y=I|4n+?>7Fim=dxt1 z2H+Dm+1+fh+IF>G0SjJMkQQre1x4|G*Z==(Ot&kCnUrL4I(rf(ucITwmuHf^hXiJT zkdTm&kdTm&kdTm&kdP`esgWG0BcWCVkVZ&2dUwN`cgM8QJb`Z7Z~e<&Yj2(}>Tmf` zm1{eLgw!b{bXkjWbF%dTkTZEJWyWOb##Lfw4EK2}<0d6%>AGS{po>WCOy&f$Tay_> z?NBlkpo@s-O;0V%Y_Xa-G#_O08q5LR*~F%&)}{}r&L%Sbs8AS4t7Y0NEx*{soY=0MZExqA5XHQkqi#4gW3 zqODM^iyZl;dvf)-bOXtOru(s)Uc7~BFx{w-FK;2{`VA?(g&@3z&bfLFyctOH!cVsF z7IL=fo-qBndRUm;kAdXR4e6>k-z|21AaN%ubeVrHl*<|s&Ax@W-t?LR(P-24A5=>a z*R9#QvjzF8n%@1Nw@?CG@6(%>+-0ASK~jEmCV|&a*7-GKT72W<(TbSjf)&Eme6nGE z>Gkj4Sq&2e+-G%|+NM8OOm5zVl9{Z8Dd8A5z3y8mZ=4Bv4%>as_{9cN#bm~;h>62( zdqY93Zy}v&c4n($Vv!UybR8ocs7#zbfX1IY-*w~)p}XyZ-SFC~4w>BvMVr`dFbelV{lLL0bx7@*ZZdebr3`sP;? zVImji)kG)(6Juv0lz@q`F!k1FE;CQ(D0iG$wchPbKZQELlsZ#~rt8#90Y_Xh&3U-< z{s<&cCV_1`^TD^ia9!*mQDq& zn2{r`j};V|uV%_wsP!zB?m%;FeaRe+X47K0e+KE!8C{gAWF8)lCd1u1%~|M!XNRvw zvtqy3iz0WSpWdhn6$hP8PaRBmp)q`#PCA`Vd#Tc$@f1tAcM>f_I@bC)hkI9|o(Iqv zo}Piadq!j76}004RBio<`)70k^`K1NK)q>w?p^C6J2ZC!+UppiK6&y3Kmbv&O!oYF z34$0Z;QO!JOY#!`qyGH<3Pd}Pt@q*A0V=3SVtWKRR8d8Z&@)3qLPA19LPA19LPEUC YUoZo%k(ykuW&i*H07*qoM6N<$f+CH{y8r+H literal 0 HcmV?d00001 diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json new file mode 100644 index 00000000..0bedcf2f --- /dev/null +++ b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "LaunchImage.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "LaunchImage@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "LaunchImage@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png new file mode 100644 index 0000000000000000000000000000000000000000..9da19eacad3b03bb08bbddbbf4ac48dd78b3d838 GIT binary patch literal 68 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcv6Uzs@r-FtIZ-&5|)J Q1PU{Fy85}Sb4q9e0B4a5jsO4v literal 0 HcmV?d00001 diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..9da19eacad3b03bb08bbddbbf4ac48dd78b3d838 GIT binary patch literal 68 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcv6Uzs@r-FtIZ-&5|)J Q1PU{Fy85}Sb4q9e0B4a5jsO4v literal 0 HcmV?d00001 diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..9da19eacad3b03bb08bbddbbf4ac48dd78b3d838 GIT binary patch literal 68 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcv6Uzs@r-FtIZ-&5|)J Q1PU{Fy85}Sb4q9e0B4a5jsO4v literal 0 HcmV?d00001 diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md new file mode 100644 index 00000000..89c2725b --- /dev/null +++ b/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md @@ -0,0 +1,5 @@ +# Launch Screen Assets + +You can customize the launch screen with your own desired assets by replacing the image files in this directory. + +You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images. \ No newline at end of file diff --git a/ios/Runner/Base.lproj/LaunchScreen.storyboard b/ios/Runner/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 00000000..f2e259c7 --- /dev/null +++ b/ios/Runner/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ios/Runner/Base.lproj/Main.storyboard b/ios/Runner/Base.lproj/Main.storyboard new file mode 100644 index 00000000..f3c28516 --- /dev/null +++ b/ios/Runner/Base.lproj/Main.storyboard @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist new file mode 100644 index 00000000..2b505d0b --- /dev/null +++ b/ios/Runner/Info.plist @@ -0,0 +1,53 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + Meshcore Open + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + meshcore_open + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleSignature + ???? + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSRequiresIPhoneOS + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + CADisableMinimumFrameDurationOnPhone + + UIApplicationSupportsIndirectInputEvents + + NSBluetoothAlwaysUsageDescription + This app uses Bluetooth to communicate with MeshCore devices. + NSBluetoothPeripheralUsageDescription + This app uses Bluetooth to communicate with MeshCore devices. + + diff --git a/ios/Runner/Runner-Bridging-Header.h b/ios/Runner/Runner-Bridging-Header.h new file mode 100644 index 00000000..308a2a56 --- /dev/null +++ b/ios/Runner/Runner-Bridging-Header.h @@ -0,0 +1 @@ +#import "GeneratedPluginRegistrant.h" diff --git a/ios/RunnerTests/RunnerTests.swift b/ios/RunnerTests/RunnerTests.swift new file mode 100644 index 00000000..86a7c3b1 --- /dev/null +++ b/ios/RunnerTests/RunnerTests.swift @@ -0,0 +1,12 @@ +import Flutter +import UIKit +import XCTest + +class RunnerTests: XCTestCase { + + func testExample() { + // If you add code to the Runner application, consider adding tests here. + // See https://developer.apple.com/documentation/xctest for more information about using XCTest. + } + +} diff --git a/lib/connector/meshcore_connector.dart b/lib/connector/meshcore_connector.dart new file mode 100644 index 00000000..c756dfa9 --- /dev/null +++ b/lib/connector/meshcore_connector.dart @@ -0,0 +1,1595 @@ +import 'dart:async'; +import 'dart:convert'; +import 'dart:typed_data'; + +import 'package:crypto/crypto.dart' as crypto; +import 'package:pointycastle/export.dart'; +import 'package:flutter/foundation.dart'; +import 'package:flutter_blue_plus/flutter_blue_plus.dart'; + +import '../models/channel.dart'; +import '../models/channel_message.dart'; +import '../models/contact.dart'; +import '../models/message.dart'; +import '../models/path_selection.dart'; +import '../helpers/smaz.dart'; +import '../services/ble_debug_log_service.dart'; +import '../services/message_retry_service.dart'; +import '../services/path_history_service.dart'; +import '../services/app_settings_service.dart'; +import '../services/notification_service.dart'; +import '../storage/channel_message_store.dart'; +import '../storage/channel_order_store.dart'; +import '../storage/channel_settings_store.dart'; +import '../storage/contact_store.dart'; +import '../storage/message_store.dart'; +import 'meshcore_protocol.dart'; + +class MeshCoreUuids { + static const String service = "6e400001-b5a3-f393-e0a9-e50e24dcca9e"; + static const String rxCharacteristic = "6e400002-b5a3-f393-e0a9-e50e24dcca9e"; + static const String txCharacteristic = "6e400003-b5a3-f393-e0a9-e50e24dcca9e"; +} + +enum MeshCoreConnectionState { + disconnected, + scanning, + connecting, + connected, + disconnecting, +} + +class MeshCoreConnector extends ChangeNotifier { + MeshCoreConnectionState _state = MeshCoreConnectionState.disconnected; + BluetoothDevice? _device; + BluetoothCharacteristic? _rxCharacteristic; + BluetoothCharacteristic? _txCharacteristic; + + final List _scanResults = []; + final List _contacts = []; + final List _channels = []; + final Map> _conversations = {}; + final Map> _channelMessages = {}; + final Set _loadedConversationKeys = {}; + + StreamSubscription>? _scanSubscription; + StreamSubscription? _connectionSubscription; + StreamSubscription>? _notifySubscription; + Timer? _selfInfoRetryTimer; + + final StreamController _receivedFramesController = + StreamController.broadcast(); + + Uint8List? _selfPublicKey; + String? _selfName; + int? _currentTxPower; + int? _maxTxPower; + int? _currentFreqHz; + int? _currentBwHz; + int? _currentSf; + int? _currentCr; + int? _batteryMillivolts; + double? _selfLatitude; + double? _selfLongitude; + bool _isLoadingContacts = false; + bool _isLoadingChannels = false; + bool _batteryRequested = false; + bool _awaitingSelfInfo = false; + bool _preserveContactsOnRefresh = false; + static const int _defaultMaxContacts = 32; + static const int _defaultMaxChannels = 8; + int _maxContacts = _defaultMaxContacts; + int _maxChannels = _defaultMaxChannels; + bool _isSyncingQueuedMessages = false; + bool _queuedMessageSyncInFlight = false; + bool _didInitialQueueSync = false; + bool _pendingQueueSync = false; + + // Services + MessageRetryService? _retryService; + PathHistoryService? _pathHistoryService; + AppSettingsService? _appSettingsService; + final NotificationService _notificationService = NotificationService(); + BleDebugLogService? _bleDebugLogService; + final ChannelMessageStore _channelMessageStore = ChannelMessageStore(); + final MessageStore _messageStore = MessageStore(); + final ChannelOrderStore _channelOrderStore = ChannelOrderStore(); + final ChannelSettingsStore _channelSettingsStore = ChannelSettingsStore(); + final ContactStore _contactStore = ContactStore(); + final Map _channelSmazEnabled = {}; + final Set _knownContactKeys = {}; + List _channelOrder = []; + + // Getters + MeshCoreConnectionState get state => _state; + BluetoothDevice? get device => _device; + List get scanResults => List.unmodifiable(_scanResults); + List get contacts => List.unmodifiable(_contacts); + List get channels => List.unmodifiable(_channels); + bool get isConnected => _state == MeshCoreConnectionState.connected; + bool get isLoadingContacts => _isLoadingContacts; + bool get isLoadingChannels => _isLoadingChannels; + Stream get receivedFrames => _receivedFramesController.stream; + Uint8List? get selfPublicKey => _selfPublicKey; + String? get selfName => _selfName; + double? get selfLatitude => _selfLatitude; + double? get selfLongitude => _selfLongitude; + int? get currentTxPower => _currentTxPower; + int? get maxTxPower => _maxTxPower; + int? get currentFreqHz => _currentFreqHz; + int? get currentBwHz => _currentBwHz; + int? get currentSf => _currentSf; + int? get currentCr => _currentCr; + int? get batteryMillivolts => _batteryMillivolts; + int get maxContacts => _maxContacts; + int get maxChannels => _maxChannels; + bool get isSyncingQueuedMessages => _isSyncingQueuedMessages; + int? get batteryPercent => _batteryMillivolts == null + ? null + : _estimateBatteryPercent( + _batteryMillivolts!, + _batteryChemistryForDevice(), + ); + + String _batteryChemistryForDevice() { + final deviceId = _device?.remoteId.toString(); + if (deviceId == null || _appSettingsService == null) return 'nmc'; + return _appSettingsService!.batteryChemistryForDevice(deviceId); + } + + int _estimateBatteryPercent(int millivolts, String chemistry) { + final range = _batteryVoltageRange(chemistry); + final minMv = range.$1; + final maxMv = range.$2; + if (millivolts <= minMv) return 0; + if (millivolts >= maxMv) return 100; + return (((millivolts - minMv) * 100) / (maxMv - minMv)).round(); + } + + (int, int) _batteryVoltageRange(String chemistry) { + switch (chemistry) { + case 'lifepo4': + return (2600, 3650); + case 'lipo': + return (3000, 4200); + case 'nmc': + default: + return (3000, 4200); + } + } + + List getMessages(Contact contact) { + return _conversations[contact.publicKeyHex] ?? []; + } + + Future _loadMessagesForContact(String contactKeyHex) async { + if (_loadedConversationKeys.contains(contactKeyHex)) return; + _loadedConversationKeys.add(contactKeyHex); + + final messages = await _messageStore.loadMessages(contactKeyHex); + if (messages.isNotEmpty) { + _conversations[contactKeyHex] = messages; + notifyListeners(); + } + } + + List getChannelMessages(Channel channel) { + return _channelMessages[channel.index] ?? []; + } + + bool isChannelSmazEnabled(int channelIndex) { + return _channelSmazEnabled[channelIndex] ?? false; + } + + Future setChannelSmazEnabled(int channelIndex, bool enabled) async { + _channelSmazEnabled[channelIndex] = enabled; + await _channelSettingsStore.saveSmazEnabled(channelIndex, enabled); + notifyListeners(); + } + + Future _loadChannelOrder() async { + _channelOrder = await _channelOrderStore.loadChannelOrder(); + _applyChannelOrder(); + notifyListeners(); + } + + /// Load persisted channel messages for a specific channel + Future _loadChannelMessages(int channelIndex) async { + final messages = await _channelMessageStore.loadChannelMessages(channelIndex); + if (messages.isNotEmpty) { + _channelMessages[channelIndex] = messages; + notifyListeners(); + } + } + + /// Load all persisted channel messages on startup + Future loadAllChannelMessages({int? maxChannels}) async { + final channelCount = maxChannels ?? _maxChannels; + // Load messages for all known channels (0-7 by default) + for (int i = 0; i < channelCount; i++) { + await _loadChannelMessages(i); + } + } + + void initialize({ + required MessageRetryService retryService, + required PathHistoryService pathHistoryService, + AppSettingsService? appSettingsService, + BleDebugLogService? bleDebugLogService, + }) { + _retryService = retryService; + _pathHistoryService = pathHistoryService; + _appSettingsService = appSettingsService; + _bleDebugLogService = bleDebugLogService; + + // Initialize notification service + _notificationService.initialize(); + _loadChannelOrder(); + + // Initialize retry service callbacks + _retryService?.initialize( + sendMessageCallback: _sendMessageDirect, + addMessageCallback: _addMessage, + updateMessageCallback: _updateMessage, + clearContactPathCallback: clearContactPath, + calculateTimeoutCallback: (pathLength, messageBytes) => + calculateTimeout(pathLength: pathLength, messageBytes: messageBytes), + appSettingsService: appSettingsService, + recordPathResultCallback: _recordPathResult, + ); + } + + Future loadContactCache() async { + final cached = await _contactStore.loadContacts(); + _knownContactKeys + ..clear() + ..addAll(cached.map((c) => c.publicKeyHex)); + } + + Future loadChannelSettings({int? maxChannels}) async { + _channelSmazEnabled.clear(); + final channelCount = maxChannels ?? _maxChannels; + for (int i = 0; i < channelCount; i++) { + _channelSmazEnabled[i] = await _channelSettingsStore.loadSmazEnabled(i); + } + } + + void _sendMessageDirect( + Contact contact, + String text, + bool forceFlood, + int attempt, + int timestampSeconds, + ) async { + if (!isConnected || text.isEmpty) return; + await sendFrame( + buildSendTextMsgFrame( + contact.publicKey, + text, + forceFlood: forceFlood, + attempt: attempt, + timestampSeconds: timestampSeconds, + ), + ); + } + + void _updateMessage(Message message) { + final contactKey = pubKeyToHex(message.senderKey); + final messages = _conversations[contactKey]; + if (messages != null) { + final index = messages.indexWhere((m) => m.messageId == message.messageId); + if (index != -1) { + messages[index] = message; + _messageStore.saveMessages(contactKey, messages); + notifyListeners(); + } + } + } + + void _recordPathResult( + String contactPubKeyHex, + PathSelection selection, + bool success, + int? tripTimeMs, + ) { + if (_pathHistoryService == null) return; + _pathHistoryService!.recordPathResult( + contactPubKeyHex, + selection, + success: success, + tripTimeMs: tripTimeMs, + ); + } + + Contact _applyAutoSelection(Contact contact, PathSelection? selection) { + if (selection == null || selection.useFlood || selection.pathBytes.isEmpty) { + return contact; + } + + return Contact( + publicKey: contact.publicKey, + name: contact.name, + type: contact.type, + pathLength: selection.hopCount >= 0 ? selection.hopCount : contact.pathLength, + path: Uint8List.fromList(selection.pathBytes), + latitude: contact.latitude, + longitude: contact.longitude, + lastSeen: contact.lastSeen, + ); + } + + Future startScan({Duration timeout = const Duration(seconds: 10)}) async { + if (_state == MeshCoreConnectionState.scanning) return; + + _scanResults.clear(); + _setState(MeshCoreConnectionState.scanning); + + _scanSubscription = FlutterBluePlus.scanResults.listen((results) { + _scanResults.clear(); + for (var result in results) { + if (result.device.platformName.startsWith("MeshCore-") || + result.advertisementData.advName.startsWith("MeshCore-")) { + _scanResults.add(result); + } + } + notifyListeners(); + }); + + await FlutterBluePlus.startScan( + timeout: timeout, + androidScanMode: AndroidScanMode.lowLatency, + ); + + await Future.delayed(timeout); + await stopScan(); + } + + Future stopScan() async { + await FlutterBluePlus.stopScan(); + await _scanSubscription?.cancel(); + _scanSubscription = null; + + if (_state == MeshCoreConnectionState.scanning) { + _setState(MeshCoreConnectionState.disconnected); + } + } + + Future connect(BluetoothDevice device) async { + if (_state == MeshCoreConnectionState.connecting || + _state == MeshCoreConnectionState.connected) { + return; + } + + await stopScan(); + _setState(MeshCoreConnectionState.connecting); + _device = device; + + try { + _connectionSubscription = device.connectionState.listen((state) { + if (state == BluetoothConnectionState.disconnected) { + _handleDisconnection(); + } + }); + + await device.connect( + timeout: const Duration(seconds: 15), + mtu: null, + license: License.free, + ); + + // Request larger MTU for sending larger frames + try { + final mtu = await device.requestMtu(185); + debugPrint('MTU set to: $mtu'); + } catch (e) { + debugPrint('MTU request failed: $e, using default'); + } + + List services = await device.discoverServices(); + + BluetoothService? uartService; + for (var service in services) { + if (service.uuid.toString().toLowerCase() == MeshCoreUuids.service) { + uartService = service; + break; + } + } + + if (uartService == null) { + throw Exception("MeshCore UART service not found"); + } + + for (var characteristic in uartService.characteristics) { + String uuid = characteristic.uuid.toString().toLowerCase(); + if (uuid == MeshCoreUuids.rxCharacteristic) { + _rxCharacteristic = characteristic; + } else if (uuid == MeshCoreUuids.txCharacteristic) { + _txCharacteristic = characteristic; + } + } + + if (_rxCharacteristic == null || _txCharacteristic == null) { + throw Exception("MeshCore characteristics not found"); + } + + await _txCharacteristic!.setNotifyValue(true); + _notifySubscription = _txCharacteristic!.onValueReceived.listen(_handleFrame); + + _setState(MeshCoreConnectionState.connected); + + await _requestDeviceInfo(); + + // Keep device clock aligned on every connection. + await syncTime(); + } catch (e) { + debugPrint("Connection error: $e"); + await disconnect(); + rethrow; + } + } + + Future disconnect() async { + if (_state == MeshCoreConnectionState.disconnecting) return; + + _setState(MeshCoreConnectionState.disconnecting); + + await _notifySubscription?.cancel(); + _notifySubscription = null; + + await _connectionSubscription?.cancel(); + _connectionSubscription = null; + _selfInfoRetryTimer?.cancel(); + _selfInfoRetryTimer = null; + + try { + await _device?.disconnect(); + } catch (e) { + debugPrint("Disconnect error: $e"); + } + + _device = null; + _rxCharacteristic = null; + _txCharacteristic = null; + _contacts.clear(); + _conversations.clear(); + _loadedConversationKeys.clear(); + _selfPublicKey = null; + _selfName = null; + _selfLatitude = null; + _selfLongitude = null; + _batteryMillivolts = null; + _batteryRequested = false; + _awaitingSelfInfo = false; + _maxContacts = _defaultMaxContacts; + _maxChannels = _defaultMaxChannels; + _isSyncingQueuedMessages = false; + _queuedMessageSyncInFlight = false; + _didInitialQueueSync = false; + _pendingQueueSync = false; + _pendingQueueSync = false; + _didInitialQueueSync = false; + + _setState(MeshCoreConnectionState.disconnected); + } + + Future sendFrame(Uint8List data) async { + if (!isConnected || _rxCharacteristic == null) { + throw Exception("Not connected to a MeshCore device"); + } + + _bleDebugLogService?.logFrame(data, outgoing: true); + + // Prefer write without response when supported; fall back to write with response. + final properties = _rxCharacteristic!.properties; + final canWriteWithoutResponse = properties.writeWithoutResponse; + final canWriteWithResponse = properties.write; + if (!canWriteWithoutResponse && !canWriteWithResponse) { + throw Exception("MeshCore RX characteristic does not support write"); + } + + await _rxCharacteristic!.write( + data.toList(), + withoutResponse: canWriteWithoutResponse, + ); + } + + Future requestBatteryStatus({bool force = false}) async { + if (!isConnected) return; + if (_batteryRequested && !force) return; + _batteryRequested = true; + await sendFrame(buildGetBattAndStorageFrame()); + } + + Future refreshDeviceInfo() async { + if (!isConnected) return; + _awaitingSelfInfo = true; + await sendFrame(buildDeviceQueryFrame()); + await sendFrame(buildAppStartFrame()); + await requestBatteryStatus(force: true); + await sendFrame(buildGetRadioSettingsFrame()); + } + + Future _requestDeviceInfo() async { + _awaitingSelfInfo = true; + await sendFrame(buildDeviceQueryFrame()); + await sendFrame(buildAppStartFrame()); + await requestBatteryStatus(); + + _selfInfoRetryTimer?.cancel(); + _selfInfoRetryTimer = Timer(const Duration(milliseconds: 3500), () { + if (!isConnected || !_awaitingSelfInfo) return; + sendFrame(buildAppStartFrame()); + }); + } + + Future getContacts({int? since, bool preserveExisting = false}) async { + if (!isConnected) return; + + _isLoadingContacts = true; + _preserveContactsOnRefresh = preserveExisting; + if (!preserveExisting) { + _contacts.clear(); + notifyListeners(); + } + + await sendFrame(buildGetContactsFrame(since: since)); + } + + Future refreshContacts() async { + await getContacts(preserveExisting: true); + } + + Future refreshContactsSinceLastmod() async { + await getContacts( + since: _latestContactLastmod(), + preserveExisting: true, + ); + } + + Future sendMessage( + Contact contact, + String text, { + bool forceFlood = false, + Uint8List? customPath, + int? customPathLen, + }) async { + if (!isConnected || text.isEmpty) return; + + // If custom path is provided, temporarily update the contact's path + if (customPath != null && customPathLen != null && customPathLen >= 0) { + await setContactPath(contact, customPath, customPathLen); + // Small delay to ensure the path update is processed + await Future.delayed(const Duration(milliseconds: 50)); + } + + PathSelection? autoSelection; + if (customPath == null && + _appSettingsService?.settings.autoRouteRotationEnabled == true && + !forceFlood) { + autoSelection = _pathHistoryService?.getNextAutoPathSelection(contact.publicKeyHex); + if (autoSelection != null) { + _pathHistoryService?.recordPathAttempt(contact.publicKeyHex, autoSelection); + if (!autoSelection.useFlood && autoSelection.pathBytes.isNotEmpty) { + await setContactPath( + contact, + Uint8List.fromList(autoSelection.pathBytes), + autoSelection.pathBytes.length, + ); + await Future.delayed(const Duration(milliseconds: 50)); + } + } + } + + if (_retryService != null) { + final pathBytes = + _resolveOutgoingPathBytes(contact, customPath, customPathLen, forceFlood, autoSelection); + final pathLength = + _resolveOutgoingPathLength(contact, customPathLen, forceFlood, autoSelection); + final selectedContact = _applyAutoSelection(contact, autoSelection); + await _retryService!.sendMessageWithRetry( + contact: selectedContact, + text: text, + forceFlood: forceFlood, + pathSelection: autoSelection, + pathBytes: pathBytes, + pathLength: pathLength, + ); + } else { + // Fallback to old behavior if retry service not initialized + final pathBytes = _resolveOutgoingPathBytes(contact, customPath, customPathLen, forceFlood, autoSelection); + final pathLength = _resolveOutgoingPathLength(contact, customPathLen, forceFlood, autoSelection); + final message = Message.outgoing( + contact.publicKey, + text, + pathLength: pathLength, + pathBytes: pathBytes, + ); + _addMessage(contact.publicKeyHex, message); + notifyListeners(); + await sendFrame(buildSendTextMsgFrame(contact.publicKey, text, forceFlood: forceFlood)); + } + } + + Future setContactPath(Contact contact, Uint8List customPath, int pathLen) async { + if (!isConnected) return; + + await sendFrame(buildUpdateContactPathFrame( + contact.publicKey, + customPath, + pathLen, + type: contact.type, + name: contact.name, + )); + } + + Future sendChannelMessage(Channel channel, String text) async { + if (!isConnected || text.isEmpty) return; + + final message = ChannelMessage.outgoing(text, _selfName ?? 'Me', channel.index); + _addChannelMessage(channel.index, message); + notifyListeners(); + + final trimmed = text.trim(); + final isStructuredPayload = trimmed.startsWith('g:') || trimmed.startsWith('m:'); + final outboundText = (isChannelSmazEnabled(channel.index) && !isStructuredPayload) + ? Smaz.encodeIfSmaller(text) + : text; + await sendFrame(buildSendChannelTextMsgFrame(channel.index, outboundText)); + } + + Future removeContact(Contact contact) async { + if (!isConnected) return; + + await sendFrame(buildRemoveContactFrame(contact.publicKey)); + _contacts.removeWhere((c) => c.publicKeyHex == contact.publicKeyHex); + _knownContactKeys.remove(contact.publicKeyHex); + unawaited(_persistContacts()); + _conversations.remove(contact.publicKeyHex); + _loadedConversationKeys.remove(contact.publicKeyHex); + _messageStore.clearMessages(contact.publicKeyHex); + notifyListeners(); + } + + Future clearContactPath(Contact contact) async { + if (!isConnected) return; + + await sendFrame(buildResetPathFrame(contact.publicKey)); + final existingIndex = + _contacts.indexWhere((c) => c.publicKeyHex == contact.publicKeyHex); + if (existingIndex >= 0) { + final existing = _contacts[existingIndex]; + _contacts[existingIndex] = Contact( + publicKey: existing.publicKey, + name: existing.name, + type: existing.type, + pathLength: -1, + path: Uint8List(0), + latitude: existing.latitude, + longitude: existing.longitude, + lastSeen: existing.lastSeen, + ); + notifyListeners(); + unawaited(_persistContacts()); + } + // The device will send updated contact info with path_len = -1 + } + + Future syncTime() async { + if (!isConnected) return; + + final now = DateTime.now().millisecondsSinceEpoch ~/ 1000; + await sendFrame(buildSetDeviceTimeFrame(now)); + } + + Future syncQueuedMessages({bool force = false}) async { + if (!isConnected) return; + if (!force && _isSyncingQueuedMessages) return; + if (_awaitingSelfInfo || _isLoadingContacts) { + _pendingQueueSync = true; + return; + } + _isSyncingQueuedMessages = true; + await _requestNextQueuedMessage(); + } + + Future _requestNextQueuedMessage() async { + if (!isConnected) { + _isSyncingQueuedMessages = false; + _queuedMessageSyncInFlight = false; + return; + } + if (_queuedMessageSyncInFlight) return; + _queuedMessageSyncInFlight = true; + try { + await sendFrame(buildSyncNextMessageFrame()); + } catch (e) { + _queuedMessageSyncInFlight = false; + _isSyncingQueuedMessages = false; + } + } + + Future sendCliCommand(String command) async { + if (!isConnected) return; + + // CLI commands are sent as UTF-8 text with a special prefix + final commandBytes = utf8.encode(command); + final bytes = Uint8List.fromList([0x01, ...commandBytes, 0x00]); + await sendFrame(bytes); + } + + Future getChannels({int? maxChannels}) async { + if (!isConnected) return; + + _isLoadingChannels = true; + _channels.clear(); + notifyListeners(); + + // Request each channel index + final channelCount = maxChannels ?? _maxChannels; + for (int i = 0; i < channelCount; i++) { + await sendFrame(buildGetChannelFrame(i)); + } + + _isLoadingChannels = false; + notifyListeners(); + } + + Future setChannel(int index, String name, Uint8List psk) async { + if (!isConnected) return; + + await sendFrame(buildSetChannelFrame(index, name, psk)); + // Refresh channels after setting + await getChannels(); + } + + Future deleteChannel(int index) async { + if (!isConnected) return; + + // Delete by setting empty name and zero PSK + await sendFrame(buildSetChannelFrame(index, '', Uint8List(16))); + // Refresh channels after deleting + await getChannels(); + } + + void _handleFrame(List data) { + if (data.isEmpty) return; + + final frame = Uint8List.fromList(data); + _receivedFramesController.add(frame); + _bleDebugLogService?.logFrame(frame, outgoing: false); + + final code = frame[0]; + debugPrint('RX frame: code=$code len=${frame.length}'); + + switch (code) { + case respCodeDeviceInfo: + _handleDeviceInfo(frame); + break; + case respCodeSelfInfo: + debugPrint('Got SELF_INFO'); + _handleSelfInfo(frame); + break; + case respCodeContactsStart: + debugPrint('Got CONTACTS_START'); + if (!_preserveContactsOnRefresh) { + _contacts.clear(); + } + _isLoadingContacts = true; + notifyListeners(); + break; + case respCodeContact: + debugPrint('Got CONTACT'); + _handleContact(frame); + break; + case respCodeEndOfContacts: + debugPrint('Got END_OF_CONTACTS'); + _isLoadingContacts = false; + _preserveContactsOnRefresh = false; + notifyListeners(); + unawaited(_persistContacts()); + if (!_didInitialQueueSync || _pendingQueueSync) { + _didInitialQueueSync = true; + _pendingQueueSync = false; + unawaited(syncQueuedMessages(force: true)); + } + break; + case respCodeContactMsgRecv: + case respCodeContactMsgRecvV3: + _handleIncomingMessage(frame); + break; + case respCodeChannelMsgRecv: + case respCodeChannelMsgRecvV3: + _handleIncomingChannelMessage(frame); + break; + case respCodeSent: + _handleMessageSent(frame); + break; + case respCodeNoMoreMessages: + _handleNoMoreMessages(); + break; + case pushCodeMsgWaiting: + unawaited(syncQueuedMessages(force: true)); + break; + case pushCodeSendConfirmed: + _handleSendConfirmed(frame); + break; + case pushCodePathUpdated: + _handlePathUpdated(frame); + break; + case pushCodeLoginSuccess: + case pushCodeLoginFail: + case pushCodeStatusResponse: + break; + case pushCodeLogRxData: + _handleLogRxData(frame); + break; + case respCodeChannelInfo: + _handleChannelInfo(frame); + break; + case respCodeRadioSettings: + _handleRadioSettings(frame); + break; + case respCodeBattAndStorage: + _handleBatteryAndStorage(frame); + break; + default: + debugPrint('Unknown frame code: $code'); + } + } + + void _handlePathUpdated(Uint8List frame) { + // Frame format: [0]=code, [1-32]=pub_key + if (frame.length >= 33 && _pathHistoryService != null) { + final pubKey = Uint8List.fromList(frame.sublist(1, 33)); + final contact = _contacts.cast().firstWhere( + (c) => c != null && listEquals(c.publicKey, pubKey), + orElse: () => null, + ); + + if (contact != null) { + _pathHistoryService!.handlePathUpdated(contact); + refreshContactsSinceLastmod(); + } + } + } + + void _handleSelfInfo(Uint8List frame) { + // SELF_INFO format: + // [0] = RESP_CODE_SELF_INFO + // [1] = ADV_TYPE + // [2] = tx_power_dbm + // [3] = MAX_LORA_TX_POWER + // [4-35] = pub_key (32 bytes) + // [36-39] = lat (int32 LE) + // [40-43] = lon (int32 LE) + // [44] = multi_acks + // [45] = advert_loc_policy + // [46] = telemetry modes + // [47] = manual_add_contacts + // [48-51] = freq (uint32 LE, in Hz) + // [52-55] = bw (uint32 LE, in Hz) + // [56] = sf + // [57] = cr + // [58+] = node_name + if (frame.length < 4 + pubKeySize) return; + + _currentTxPower = frame[2]; + _maxTxPower = frame[3]; + _selfPublicKey = Uint8List.fromList(frame.sublist(4, 4 + pubKeySize)); + _selfLatitude = readInt32LE(frame, 36) / 1000000.0; + _selfLongitude = readInt32LE(frame, 40) / 1000000.0; + + // Radio settings (if frame is long enough) + if (frame.length >= 58) { + _currentFreqHz = readUint32LE(frame, 48); + _currentBwHz = readUint32LE(frame, 52); + _currentSf = frame[56]; + _currentCr = frame[57]; + } + + // Node name starts at offset 58 if frame is long enough + if (frame.length > 58) { + _selfName = readCString(frame, 58, frame.length - 58); + } + _awaitingSelfInfo = false; + notifyListeners(); + + // Auto-fetch contacts after getting self info + getContacts(); + } + + void _handleDeviceInfo(Uint8List frame) { + if (frame.length < 4) return; + // Firmware reports MAX_CONTACTS / 2 for v3+ device info. + final reportedContacts = frame[2]; + final reportedChannels = frame[3]; + final nextMaxContacts = reportedContacts > 0 ? reportedContacts * 2 : _maxContacts; + final nextMaxChannels = reportedChannels > 0 ? reportedChannels : _maxChannels; + final previousMaxChannels = _maxChannels; + if (nextMaxContacts != _maxContacts || nextMaxChannels != _maxChannels) { + _maxContacts = nextMaxContacts; + _maxChannels = nextMaxChannels; + if (nextMaxChannels > previousMaxChannels) { + unawaited(loadChannelSettings(maxChannels: nextMaxChannels)); + unawaited(loadAllChannelMessages(maxChannels: nextMaxChannels)); + if (isConnected) { + unawaited(getChannels(maxChannels: nextMaxChannels)); + } + } + notifyListeners(); + } + } + + void _handleNoMoreMessages() { + _isSyncingQueuedMessages = false; + _queuedMessageSyncInFlight = false; + } + + void _handleQueuedMessageReceived() { + if (!_isSyncingQueuedMessages) return; + _queuedMessageSyncInFlight = false; + unawaited(_requestNextQueuedMessage()); + } + + void _handleRadioSettings(Uint8List frame) { + // Frame format from C++: + // [0] = RESP_CODE_RADIO_SETTINGS + // [1-4] = freq (uint32 LE, in Hz) + // [5-8] = bw (uint32 LE, in Hz) + // [9] = sf + // [10] = cr + if (frame.length >= 11) { + _currentFreqHz = readUint32LE(frame, 1); + _currentBwHz = readUint32LE(frame, 5); + _currentSf = frame[9]; + _currentCr = frame[10]; + debugPrint('Radio settings: freq=$_currentFreqHz bw=$_currentBwHz sf=$_currentSf cr=$_currentCr'); + notifyListeners(); + } + } + + void _handleBatteryAndStorage(Uint8List frame) { + // Frame format from C++: + // [0] = RESP_CODE_BATT_AND_STORAGE + // [1-2] = battery_mv (uint16 LE) + // [3-6] = storage_used_kb (uint32 LE) + // [7-10] = storage_total_kb (uint32 LE) + if (frame.length >= 3) { + _batteryMillivolts = readUint16LE(frame, 1); + notifyListeners(); + } + } + + /// Calculate timeout for a message based on radio settings and path length + /// Returns timeout in milliseconds, considering number of hops + int calculateTimeout({required int pathLength, int messageBytes = 100}) { + // If we have radio settings, use them for accurate calculation + if (_currentFreqHz != null && + _currentBwHz != null && + _currentSf != null && + _currentCr != null) { + final cr = _currentCr! <= 4 ? _currentCr! : _currentCr! - 4; + return calculateMessageTimeout( + freqHz: _currentFreqHz!, + bwHz: _currentBwHz!, + sf: _currentSf!, + cr: cr, + pathLength: pathLength, + messageBytes: messageBytes, + ); + } + + // Fallback: Conservative estimates based on typical settings + // Assume SF7, BW125, which gives ~50ms airtime for 100 bytes + const estimatedAirtime = 50; + + if (pathLength < 0) { + // Flood mode: Base delay + 16× airtime + return 500 + (16 * estimatedAirtime); + } else { + // Direct path: Base delay + ((airtime×6 + 250ms)×(hops+1)) + return 500 + ((estimatedAirtime * 6 + 250) * (pathLength + 1)); + } + } + + void _handleContact(Uint8List frame) { + final contact = Contact.fromFrame(frame); + if (contact != null) { + // Check if this is a new contact + final isNewContact = !_knownContactKeys.contains(contact.publicKeyHex); + final existingIndex = _contacts.indexWhere( + (c) => c.publicKeyHex == contact.publicKeyHex, + ); + + if (existingIndex >= 0) { + _contacts[existingIndex] = contact; + } else { + _contacts.add(contact); + } + _knownContactKeys.add(contact.publicKeyHex); + _loadMessagesForContact(contact.publicKeyHex); + notifyListeners(); + + // Show notification for new contact (advertisement) + if (isNewContact && _appSettingsService != null) { + final settings = _appSettingsService!.settings; + if (settings.notificationsEnabled && settings.notifyOnNewAdvert) { + _notificationService.showAdvertNotification( + contactName: contact.name, + contactType: contact.typeLabel, + contactId: contact.publicKeyHex, + ); + } + } + + if (!_isLoadingContacts) { + unawaited(_persistContacts()); + } + } + } + + Future _persistContacts() async { + await _contactStore.saveContacts(_contacts); + } + + int _latestContactLastmod() { + if (_contacts.isEmpty) return 0; + var latest = 0; + for (final contact in _contacts) { + final seconds = contact.lastSeen.millisecondsSinceEpoch ~/ 1000; + if (seconds > latest) { + latest = seconds; + } + } + return latest; + } + + void _handleIncomingMessage(Uint8List frame) { + if (_selfPublicKey == null) return; + + var message = _parseContactMessage(frame); + if (message != null) { + final contact = _contacts.cast().firstWhere( + (c) => c?.publicKeyHex == message!.senderKeyHex, + orElse: () => null, + ); + if (contact != null) { + message = message.copyWith( + pathLength: contact.pathLength < 0 ? -1 : contact.pathLength, + pathBytes: contact.pathLength < 0 ? Uint8List(0) : contact.path, + ); + } + if (!message.isOutgoing) { + final existing = _conversations[message.senderKeyHex]; + final incomingTimestamp = message.timestamp.millisecondsSinceEpoch; + if (existing != null && existing.isNotEmpty) { + final startIndex = existing.length > 10 ? existing.length - 10 : 0; + for (int i = existing.length - 1; i >= startIndex; i--) { + final recent = existing[i]; + if (!recent.isOutgoing && + recent.timestamp.millisecondsSinceEpoch == incomingTimestamp && + recent.text == message.text) { + return; + } + } + } + } + _addMessage(message.senderKeyHex, message); + notifyListeners(); + + // Show notification for new incoming message + if (!message.isOutgoing && !message.isCli && _appSettingsService != null) { + final settings = _appSettingsService!.settings; + if (settings.notificationsEnabled && settings.notifyOnNewMessage) { + // Find the contact name + _notificationService.showMessageNotification( + contactName: contact?.name ?? 'Unknown', + message: message.text, + contactId: message.senderKeyHex, + ); + } + } + _handleQueuedMessageReceived(); + } else if (_isSyncingQueuedMessages) { + _handleQueuedMessageReceived(); + } + } + + Message? _parseContactMessage(Uint8List frame) { + if (frame.isEmpty) return null; + final code = frame[0]; + if (code != respCodeContactMsgRecv && code != respCodeContactMsgRecvV3) { + return null; + } + + // Companion radio layout: + // [code][snr?][res?][res?][prefix x6][path_len][txt_type][timestamp x4][extra?][text...] + final prefixOffset = code == respCodeContactMsgRecvV3 ? 4 : 1; + const prefixLen = 6; + final pathLenOffset = prefixOffset + prefixLen; + final txtTypeOffset = pathLenOffset + 1; + final timestampOffset = txtTypeOffset + 1; + final baseTextOffset = timestampOffset + 4; + + if (frame.length <= baseTextOffset) return null; + + final senderPrefix = frame.sublist(prefixOffset, prefixOffset + prefixLen); + final flags = frame[txtTypeOffset]; + final shiftedType = flags >> 2; + final rawType = flags; + final isPlain = shiftedType == txtTypePlain || rawType == txtTypePlain; + final isCli = shiftedType == txtTypeCliData || rawType == txtTypeCliData; + if (!isPlain && !isCli) { + return null; + } + + // Try base text offset; if empty and there is room for the optional 4-byte extra + // (used by signed/plain variants), try again skipping those bytes. + var text = readCString(frame, baseTextOffset, frame.length - baseTextOffset); + if (text.isEmpty && frame.length > baseTextOffset + 4) { + text = readCString(frame, baseTextOffset + 4, frame.length - (baseTextOffset + 4)); + } + if (text.isEmpty) return null; + + final timestampRaw = readUint32LE(frame, timestampOffset); + final pathLenByte = frame[pathLenOffset]; + + final contact = _contacts.cast().firstWhere( + (c) => c != null && _matchesPrefix(c.publicKey, senderPrefix), + orElse: () => null, + ); + if (contact == null) return null; + + return Message( + senderKey: contact.publicKey, + text: text, + timestamp: DateTime.fromMillisecondsSinceEpoch(timestampRaw * 1000), + isOutgoing: false, + isCli: isCli, + status: MessageStatus.delivered, + pathLength: pathLenByte == 0xFF ? 0 : pathLenByte, + pathBytes: Uint8List(0), + ); + } + + bool _matchesPrefix(Uint8List fullKey, Uint8List prefix) { + if (fullKey.length < prefix.length) return false; + for (int i = 0; i < prefix.length; i++) { + if (fullKey[i] != prefix[i]) return false; + } + return true; + } + + void _handleIncomingChannelMessage(Uint8List frame) { + final message = ChannelMessage.fromFrame(frame); + if (message != null && message.channelIndex != null) { + if (_shouldDropSelfChannelMessage(message.senderName, message.pathBytes)) { + return; + } + _addChannelMessage(message.channelIndex!, message); + notifyListeners(); + _handleQueuedMessageReceived(); + } else if (_isSyncingQueuedMessages) { + _handleQueuedMessageReceived(); + } + } + + void _handleLogRxData(Uint8List frame) { + if (frame.length < 4) return; + final raw = Uint8List.fromList(frame.sublist(3)); + final packet = _parseRawPacket(raw); + if (packet == null || packet.payloadType != _payloadTypeGroupText) return; + + final payload = packet.payload; + if (payload.length <= _cipherMacSize) return; + final channelHash = payload[0]; + final encrypted = Uint8List.fromList(payload.sublist(1)); + + for (final channel in _channels) { + if (channel.isEmpty) continue; + final hash = _computeChannelHash(channel.psk); + if (hash != channelHash) continue; + + final decrypted = _decryptPayload(channel.psk, encrypted); + if (decrypted == null || decrypted.length < 6) return; + + final txtType = decrypted[4]; + if ((txtType >> 2) != 0) { + return; + } + + final timestampRaw = readUint32LE(decrypted, 0); + final text = readCString(decrypted, 5, decrypted.length - 5); + final parsed = _splitSenderText(text); + final decodedText = Smaz.tryDecodePrefixed(parsed.text) ?? parsed.text; + if (_shouldDropSelfChannelMessage(parsed.senderName, packet.pathBytes)) { + return; + } + + final message = ChannelMessage( + senderKey: null, + senderName: parsed.senderName, + text: decodedText, + timestamp: DateTime.fromMillisecondsSinceEpoch(timestampRaw * 1000), + isOutgoing: false, + status: ChannelMessageStatus.sent, + pathLength: packet.isFlood ? packet.pathBytes.length : 0, + pathBytes: packet.pathBytes, + channelIndex: channel.index, + ); + + _addChannelMessage(channel.index, message); + notifyListeners(); + return; + } + } + + void _handleMessageSent(Uint8List frame) { + // Frame format from C++: + // [0] = RESP_CODE_SENT + // [1] = is_flood (1 or 0) + // [2-5] = expected_ack_hash (uint32) + // [6-9] = estimated_timeout_ms (uint32) + + if (frame.length >= 10 && _retryService != null) { + final ackHash = Uint8List.fromList(frame.sublist(2, 6)); + final timeoutMs = readUint32LE(frame, 6); + + _retryService!.updateMessageFromSent(ackHash, timeoutMs); + } else { + // Fallback to old behavior + for (var messages in _conversations.values) { + for (int i = messages.length - 1; i >= 0; i--) { + if (messages[i].isOutgoing && messages[i].status == MessageStatus.pending) { + messages[i] = messages[i].copyWith(status: MessageStatus.sent); + notifyListeners(); + return; + } + } + } + } + } + + void _handleSendConfirmed(Uint8List frame) { + // Frame format from C++: + // [0] = PUSH_CODE_SEND_CONFIRMED + // [1-4] = ack_hash (uint32) + // [5-8] = trip_time_ms (uint32) + + if (frame.length >= 9) { + final ackHash = Uint8List.fromList(frame.sublist(1, 5)); + final tripTimeMs = readUint32LE(frame, 5); + + // Handle ACK in retry service + if (_retryService != null) { + _retryService!.handleAckReceived(ackHash, tripTimeMs); + } + } else { + // Fallback to old behavior + for (var messages in _conversations.values) { + for (int i = messages.length - 1; i >= 0; i--) { + if (messages[i].isOutgoing && messages[i].status == MessageStatus.sent) { + messages[i] = messages[i].copyWith(status: MessageStatus.delivered); + notifyListeners(); + return; + } + } + } + } + } + + void _handleChannelInfo(Uint8List frame) { + final channel = Channel.fromFrame(frame); + if (channel != null && !channel.isEmpty) { + _channels.add(channel); + _applyChannelOrder(); + notifyListeners(); + } + } + + void _applyChannelOrder() { + if (_channelOrder.isEmpty) { + _channels.sort((a, b) => a.index.compareTo(b.index)); + return; + } + + final orderIndex = {}; + for (int i = 0; i < _channelOrder.length; i++) { + orderIndex[_channelOrder[i]] = i; + } + + _channels.sort((a, b) { + final aPos = orderIndex[a.index]; + final bPos = orderIndex[b.index]; + if (aPos != null && bPos != null) return aPos.compareTo(bPos); + if (aPos != null) return -1; + if (bPos != null) return 1; + return a.index.compareTo(b.index); + }); + } + + Future setChannelOrder(List order) async { + _channelOrder = List.from(order); + _applyChannelOrder(); + await _channelOrderStore.saveChannelOrder(_channelOrder); + notifyListeners(); + } + + void _addMessage(String pubKeyHex, Message message) { + _conversations.putIfAbsent(pubKeyHex, () => []); + _conversations[pubKeyHex]!.add(message); + _messageStore.saveMessages(pubKeyHex, _conversations[pubKeyHex]!); + notifyListeners(); + } + + _RawPacket? _parseRawPacket(Uint8List raw) { + if (raw.length < 3) return null; + var index = 0; + final header = raw[index++]; + final routeType = header & _phRouteMask; + final hasTransport = routeType == _routeTransportFlood || routeType == _routeTransportDirect; + if (hasTransport) { + if (raw.length < index + 4) return null; + index += 4; + } + if (raw.length <= index) return null; + final pathLen = raw[index++]; + if (raw.length < index + pathLen) return null; + final pathBytes = Uint8List.fromList(raw.sublist(index, index + pathLen)); + index += pathLen; + if (raw.length <= index) return null; + final payload = Uint8List.fromList(raw.sublist(index)); + + return _RawPacket( + header: header, + routeType: routeType, + payloadType: (header >> _phTypeShift) & _phTypeMask, + payloadVer: (header >> _phVerShift) & _phVerMask, + pathBytes: pathBytes, + payload: payload, + ); + } + + int _computeChannelHash(Uint8List psk) { + final digest = crypto.sha256.convert(psk).bytes; + return digest[0]; + } + + Uint8List? _decryptPayload(Uint8List psk, Uint8List encrypted) { + if (encrypted.length <= _cipherMacSize) return null; + final mac = encrypted.sublist(0, _cipherMacSize); + final cipherText = encrypted.sublist(_cipherMacSize); + + final key32 = Uint8List(32); + final copyLen = psk.length < 32 ? psk.length : 32; + key32.setRange(0, copyLen, psk); + + final hmac = crypto.Hmac(crypto.sha256, key32).convert(cipherText).bytes; + if (hmac[0] != mac[0] || hmac[1] != mac[1]) { + return null; + } + + if (cipherText.isEmpty || cipherText.length % 16 != 0) return null; + final key16 = Uint8List(16); + final keyLen = psk.length < 16 ? psk.length : 16; + key16.setRange(0, keyLen, psk); + + final cipher = ECBBlockCipher(AESFastEngine()); + cipher.init(false, KeyParameter(key16)); + final out = Uint8List(cipherText.length); + for (var i = 0; i < cipherText.length; i += 16) { + cipher.processBlock(cipherText, i, out, i); + } + return out; + } + + _ParsedText _splitSenderText(String text) { + final colonIndex = text.indexOf(':'); + if (colonIndex > 0 && colonIndex < text.length - 1 && colonIndex < 50) { + final potentialSender = text.substring(0, colonIndex); + if (RegExp(r'[:\[\]]').hasMatch(potentialSender)) { + return _ParsedText(senderName: 'Unknown', text: text); + } + final offset = (colonIndex + 1 < text.length && text[colonIndex + 1] == ' ') + ? colonIndex + 2 + : colonIndex + 1; + return _ParsedText( + senderName: potentialSender, + text: text.substring(offset), + ); + } + return _ParsedText(senderName: 'Unknown', text: text); + } + + Uint8List _resolveOutgoingPathBytes( + Contact contact, + Uint8List? customPath, + int? customPathLen, + bool forceFlood, + PathSelection? selection, + ) { + if (forceFlood || contact.pathLength < 0 || selection?.useFlood == true) { + return Uint8List(0); + } + if (customPath != null && customPathLen != null && customPathLen > 0) { + return Uint8List.fromList(customPath.sublist(0, customPathLen)); + } + if (selection != null && selection.pathBytes.isNotEmpty) { + return Uint8List.fromList(selection.pathBytes); + } + return contact.path; + } + + int? _resolveOutgoingPathLength( + Contact contact, + int? customPathLen, + bool forceFlood, + PathSelection? selection, + ) { + if (forceFlood || contact.pathLength < 0 || selection?.useFlood == true) { + return -1; + } + if (customPathLen != null && customPathLen > 0) { + return customPathLen; + } + if (selection != null && selection.pathBytes.isNotEmpty) { + return selection.hopCount; + } + return contact.pathLength; + } + + void _addChannelMessage(int channelIndex, ChannelMessage message) { + _channelMessages.putIfAbsent(channelIndex, () => []); + final messages = _channelMessages[channelIndex]!; + final existingIndex = _findChannelRepeatIndex(messages, message); + if (existingIndex >= 0) { + final existing = messages[existingIndex]; + final mergedPathBytes = existing.pathBytes.isEmpty ? message.pathBytes : existing.pathBytes; + messages[existingIndex] = existing.copyWith( + repeatCount: existing.repeatCount + 1, + pathLength: message.pathLength ?? existing.pathLength, + pathBytes: mergedPathBytes, + ); + } else { + messages.add(message); + } + + // Save to persistent storage + _channelMessageStore.saveChannelMessages( + channelIndex, + messages, + ); + } + + int _findChannelRepeatIndex(List messages, ChannelMessage incoming) { + for (int i = messages.length - 1; i >= 0; i--) { + final existing = messages[i]; + if (_isChannelRepeat(existing, incoming)) { + return i; + } + } + return -1; + } + + bool _isChannelRepeat(ChannelMessage existing, ChannelMessage incoming) { + if (existing.text != incoming.text) return false; + + final diffMs = (existing.timestamp.millisecondsSinceEpoch - + incoming.timestamp.millisecondsSinceEpoch) + .abs(); + if (diffMs > 5000) return false; + + if (existing.senderName == incoming.senderName) return true; + + if (existing.isOutgoing && !incoming.isOutgoing) { + final selfName = _selfName ?? 'Me'; + if (incoming.senderName == selfName || existing.senderName == selfName) { + return true; + } + } + + return false; + } + + bool _shouldDropSelfChannelMessage(String senderName, Uint8List pathBytes) { + final selfKey = _selfPublicKey; + if (selfKey == null) return false; + if (pathBytes.length < pathHashSize) return false; + final trimmed = senderName.trim(); + if (trimmed.isEmpty) return false; + final selfName = _selfName?.trim(); + if (selfName == null || selfName.isEmpty) return false; + if (trimmed != selfName) return false; + final prefix = selfKey.sublist(0, pathHashSize); + for (int i = 0; i + pathHashSize <= pathBytes.length; i += pathHashSize) { + var match = true; + for (int j = 0; j < pathHashSize; j++) { + if (pathBytes[i + j] != prefix[j]) { + match = false; + break; + } + } + if (match) { + return true; + } + } + return false; + } + + void _handleDisconnection() { + _notifySubscription?.cancel(); + _notifySubscription = null; + _connectionSubscription?.cancel(); + _connectionSubscription = null; + + _device = null; + _rxCharacteristic = null; + _txCharacteristic = null; + _maxContacts = _defaultMaxContacts; + _maxChannels = _defaultMaxChannels; + _isSyncingQueuedMessages = false; + _queuedMessageSyncInFlight = false; + + _setState(MeshCoreConnectionState.disconnected); + } + + void _setState(MeshCoreConnectionState newState) { + if (_state != newState) { + _state = newState; + notifyListeners(); + } + } + + @override + void dispose() { + _scanSubscription?.cancel(); + _connectionSubscription?.cancel(); + _notifySubscription?.cancel(); + _receivedFramesController.close(); + super.dispose(); + } +} + +const int _phRouteMask = 0x03; +const int _phTypeShift = 2; +const int _phTypeMask = 0x0F; +const int _phVerShift = 6; +const int _phVerMask = 0x03; + +const int _routeTransportFlood = 0x00; +const int _routeFlood = 0x01; +const int _routeDirect = 0x02; +const int _routeTransportDirect = 0x03; + +const int _payloadTypeGroupText = 0x05; +const int _cipherMacSize = 2; + +class _RawPacket { + final int header; + final int routeType; + final int payloadType; + final int payloadVer; + final Uint8List pathBytes; + final Uint8List payload; + + _RawPacket({ + required this.header, + required this.routeType, + required this.payloadType, + required this.payloadVer, + required this.pathBytes, + required this.payload, + }); + + bool get isFlood => routeType == _routeFlood || routeType == _routeTransportFlood; +} + +class _ParsedText { + final String senderName; + final String text; + + _ParsedText({ + required this.senderName, + required this.text, + }); +} diff --git a/lib/connector/meshcore_protocol.dart b/lib/connector/meshcore_protocol.dart new file mode 100644 index 00000000..b46d372e --- /dev/null +++ b/lib/connector/meshcore_protocol.dart @@ -0,0 +1,534 @@ +import 'dart:convert'; +import 'dart:typed_data'; + +// Command codes (to device) +const int cmdAppStart = 1; +const int cmdSendTxtMsg = 2; +const int cmdSendChannelTxtMsg = 3; +const int cmdGetContacts = 4; +const int cmdGetDeviceTime = 5; +const int cmdSetDeviceTime = 6; +const int cmdSendSelfAdvert = 7; +const int cmdSetAdvertName = 8; +const int cmdAddUpdateContact = 9; +const int cmdSyncNextMessage = 10; +const int cmdSetRadioParams = 11; +const int cmdSetRadioTxPower = 12; +const int cmdResetPath = 13; +const int cmdSetAdvertLatLon = 14; +const int cmdRemoveContact = 15; +const int cmdShareContact = 16; +const int cmdExportContact = 17; +const int cmdImportContact = 18; +const int cmdReboot = 19; +const int cmdGetBattAndStorage = 20; +const int cmdDeviceQuery = 22; +const int cmdSendLogin = 26; +const int cmdSendStatusReq = 27; +const int cmdGetChannel = 31; +const int cmdSetChannel = 32; +const int cmdGetRadioSettings = 57; + +// Text message types +const int txtTypePlain = 0; +const int txtTypeCliData = 1; + +// Repeater request types (for server requests) +const int reqTypeGetStatus = 0x01; +const int reqTypeKeepAlive = 0x02; +const int reqTypeGetTelemetry = 0x03; +const int reqTypeGetAccessList = 0x05; +const int reqTypeGetNeighbours = 0x06; + +// Repeater response codes +const int respServerLoginOk = 0; + +// Response codes (from device) +const int respCodeOk = 0; +const int respCodeErr = 1; +const int respCodeContactsStart = 2; +const int respCodeContact = 3; +const int respCodeEndOfContacts = 4; +const int respCodeSelfInfo = 5; +const int respCodeSent = 6; +const int respCodeContactMsgRecv = 7; +const int respCodeChannelMsgRecv = 8; +const int respCodeCurrTime = 9; +const int respCodeNoMoreMessages = 10; +const int respCodeBattAndStorage = 12; +const int respCodeDeviceInfo = 13; +const int respCodeContactMsgRecvV3 = 16; +const int respCodeChannelMsgRecvV3 = 17; +const int respCodeChannelInfo = 18; +const int respCodeRadioSettings = 25; + +// Push codes (async from device) +const int pushCodeAdvert = 0x80; +const int pushCodePathUpdated = 0x81; +const int pushCodeSendConfirmed = 0x82; +const int pushCodeMsgWaiting = 0x83; +const int pushCodeLoginSuccess = 0x85; +const int pushCodeLoginFail = 0x86; +const int pushCodeStatusResponse = 0x87; +const int pushCodeLogRxData = 0x88; +const int pushCodeNewAdvert = 0x8A; + +// Contact/advertisement types +const int advTypeChat = 1; +const int advTypeRepeater = 2; +const int advTypeRoom = 3; +const int advTypeSensor = 4; + +// Sizes +const int pubKeySize = 32; +const int maxPathSize = 64; +const int pathHashSize = 1; +const int maxNameSize = 32; +const int maxFrameSize = 172; +const int appProtocolVersion = 3; + +// Contact frame offsets +const int contactPubKeyOffset = 1; +const int contactTypeOffset = 33; +const int contactFlagsOffset = 34; +const int contactPathLenOffset = 35; +const int contactPathOffset = 36; +const int contactNameOffset = 100; +const int contactTimestampOffset = 132; +const int contactLatOffset = 136; +const int contactLonOffset = 140; +const int contactLastmodOffset = 144; +const int contactFrameSize = 148; + +// Message frame offsets +const int msgPubKeyOffset = 1; +const int msgTimestampOffset = 33; +const int msgFlagsOffset = 37; +const int msgTextOffset = 38; + +class ParsedContactText { + final Uint8List senderPrefix; + final String text; + + const ParsedContactText({ + required this.senderPrefix, + required this.text, + }); +} + +ParsedContactText? parseContactMessageText(Uint8List frame) { + if (frame.isEmpty) return null; + final code = frame[0]; + if (code != respCodeContactMsgRecv && code != respCodeContactMsgRecvV3) { + return null; + } + + // Companion radio layout: + // [code][snr?][res?][res?][prefix x6][path_len][txt_type][timestamp x4][extra?][text...] + final isV3 = code == respCodeContactMsgRecvV3; + final prefixOffset = isV3 ? 4 : 1; + const prefixLen = 6; + final txtTypeOffset = prefixOffset + prefixLen + 1; + final timestampOffset = txtTypeOffset + 1; + final baseTextOffset = timestampOffset + 4; + if (frame.length <= baseTextOffset) return null; + + final flags = frame[txtTypeOffset]; + final shiftedType = flags >> 2; + final rawType = flags; + final isPlain = shiftedType == txtTypePlain || rawType == txtTypePlain; + final isCli = shiftedType == txtTypeCliData || rawType == txtTypeCliData; + if (!isPlain && !isCli) { + return null; + } + + var text = readCString(frame, baseTextOffset, frame.length - baseTextOffset).trim(); + if (text.isEmpty && frame.length > baseTextOffset + 4) { + text = + readCString(frame, baseTextOffset + 4, frame.length - (baseTextOffset + 4)).trim(); + } + if (text.isEmpty) return null; + + final senderPrefix = frame.sublist(prefixOffset, prefixOffset + prefixLen); + return ParsedContactText(senderPrefix: senderPrefix, text: text); +} + +// Helper to read uint32 little-endian +int readUint32LE(Uint8List data, int offset) { + return data[offset] | + (data[offset + 1] << 8) | + (data[offset + 2] << 16) | + (data[offset + 3] << 24); +} + +// Helper to read uint16 little-endian +int readUint16LE(Uint8List data, int offset) { + return data[offset] | (data[offset + 1] << 8); +} + +// Helper to read int32 little-endian +int readInt32LE(Uint8List data, int offset) { + int val = readUint32LE(data, offset); + if (val >= 0x80000000) val -= 0x100000000; + return val; +} + +// Helper to write uint32 little-endian +void writeUint32LE(Uint8List data, int offset, int value) { + data[offset] = value & 0xFF; + data[offset + 1] = (value >> 8) & 0xFF; + data[offset + 2] = (value >> 16) & 0xFF; + data[offset + 3] = (value >> 24) & 0xFF; +} + +// Helper to read null-terminated UTF-8 string +String readCString(Uint8List data, int offset, int maxLen) { + int end = offset; + while (end < offset + maxLen && end < data.length && data[end] != 0) { + end++; + } + try { + return utf8.decode(data.sublist(offset, end), allowMalformed: true); + } catch (e) { + // Fallback to Latin-1 if UTF-8 decoding fails + return String.fromCharCodes(data.sublist(offset, end)); + } +} + +// Helper to convert public key to hex string +String pubKeyToHex(Uint8List pubKey) { + return pubKey.map((b) => b.toRadixString(16).padLeft(2, '0')).join(); +} + +// Helper to convert hex string to public key +Uint8List hexToPubKey(String hex) { + final result = Uint8List(pubKeySize); + for (int i = 0; i < pubKeySize && i * 2 + 1 < hex.length; i++) { + result[i] = int.parse(hex.substring(i * 2, i * 2 + 2), radix: 16); + } + return result; +} + +// Build CMD_GET_CONTACTS frame +Uint8List buildGetContactsFrame({int? since}) { + if (since != null) { + final frame = Uint8List(5); + frame[0] = cmdGetContacts; + writeUint32LE(frame, 1, since); + return frame; + } + return Uint8List.fromList([cmdGetContacts]); +} + +// Build CMD_SEND_LOGIN frame +// Format: [cmd][pub_key x32][password...]\0 +Uint8List buildSendLoginFrame(Uint8List recipientPubKey, String password) { + final passwordBytes = utf8.encode(password); + final frame = Uint8List(1 + pubKeySize + passwordBytes.length + 1); + frame[0] = cmdSendLogin; + frame.setRange(1, 1 + pubKeySize, recipientPubKey); + frame.setRange(1 + pubKeySize, 1 + pubKeySize + passwordBytes.length, passwordBytes); + frame[frame.length - 1] = 0; + return frame; +} + +// Build CMD_SEND_STATUS_REQ frame +// Format: [cmd][pub_key x32] +Uint8List buildSendStatusRequestFrame(Uint8List recipientPubKey) { + final frame = Uint8List(1 + pubKeySize); + frame[0] = cmdSendStatusReq; + frame.setRange(1, 1 + pubKeySize, recipientPubKey); + return frame; +} + +// Build CMD_SEND_TXT_MSG frame (companion_radio format) +// Format: [cmd][txt_type][attempt][timestamp x4][pub_key_prefix x6][text...]\0 +Uint8List buildSendTextMsgFrame( + Uint8List recipientPubKey, + String text, { + bool forceFlood = false, + int attempt = 0, + int? timestampSeconds, +}) { + final textBytes = utf8.encode(text); + final timestamp = timestampSeconds ?? (DateTime.now().millisecondsSinceEpoch ~/ 1000); + const prefixSize = 6; + final safeAttempt = forceFlood ? 3 : (attempt & 0xFF); + final frame = Uint8List(1 + 1 + 1 + 4 + prefixSize + textBytes.length + 1); + int offset = 0; + + frame[offset++] = cmdSendTxtMsg; + frame[offset++] = txtTypePlain; + frame[offset++] = safeAttempt; + writeUint32LE(frame, offset, timestamp); + offset += 4; + + frame.setRange(offset, offset + prefixSize, recipientPubKey.sublist(0, prefixSize)); + offset += prefixSize; + + frame.setRange(offset, offset + textBytes.length, textBytes); + frame[frame.length - 1] = 0; // null terminator + return frame; +} + +// Build CMD_SEND_CHANNEL_TXT_MSG frame +// Format: [cmd][txt_type][channel_idx][timestamp x4][text...] +Uint8List buildSendChannelTextMsgFrame(int channelIndex, String text) { + final textBytes = utf8.encode(text); + final timestamp = DateTime.now().millisecondsSinceEpoch ~/ 1000; + final frame = Uint8List(1 + 1 + 1 + 4 + textBytes.length + 1); + frame[0] = cmdSendChannelTxtMsg; + frame[1] = 0; // TXT_TYPE_PLAIN + frame[2] = channelIndex; + writeUint32LE(frame, 3, timestamp); + frame.setRange(7, 7 + textBytes.length, textBytes); + frame[frame.length - 1] = 0; // null terminator + return frame; +} + +// Build CMD_REMOVE_CONTACT frame +Uint8List buildRemoveContactFrame(Uint8List pubKey) { + final frame = Uint8List(1 + pubKeySize); + frame[0] = cmdRemoveContact; + frame.setRange(1, 1 + pubKeySize, pubKey); + return frame; +} + +// Build CMD_APP_START frame +// Format: [cmd][reserved x7][app_name...] +Uint8List buildAppStartFrame({String appName = 'MeshCoreOpen'}) { + final nameBytes = utf8.encode(appName); + final frame = Uint8List(8 + nameBytes.length + 1); + frame[0] = cmdAppStart; + // bytes 1-7 are reserved (zeros) + frame.setRange(8, 8 + nameBytes.length, nameBytes); + frame[frame.length - 1] = 0; // null terminator + return frame; +} + +// Build CMD_DEVICE_QUERY frame +Uint8List buildDeviceQueryFrame({int appVersion = appProtocolVersion}) { + return Uint8List.fromList([cmdDeviceQuery, appVersion]); +} + +// Build CMD_GET_DEVICE_TIME frame +Uint8List buildGetDeviceTimeFrame() { + return Uint8List.fromList([cmdGetDeviceTime]); +} + +// Build CMD_GET_BATT_AND_STORAGE frame +Uint8List buildGetBattAndStorageFrame() { + return Uint8List.fromList([cmdGetBattAndStorage]); +} + +// Build CMD_SET_DEVICE_TIME frame +Uint8List buildSetDeviceTimeFrame(int timestamp) { + final frame = Uint8List(5); + frame[0] = cmdSetDeviceTime; + writeUint32LE(frame, 1, timestamp); + return frame; +} + +// Build CMD_SYNC_NEXT_MESSAGE frame +Uint8List buildSyncNextMessageFrame() { + return Uint8List.fromList([cmdSyncNextMessage]); +} + +// Build CMD_GET_CHANNEL frame +Uint8List buildGetChannelFrame(int channelIndex) { + return Uint8List.fromList([cmdGetChannel, channelIndex]); +} + +// Build CMD_SET_CHANNEL frame +// Format: [cmd][idx][name x32][psk x16] +Uint8List buildSetChannelFrame(int channelIndex, String name, Uint8List psk) { + final frame = Uint8List(2 + 32 + 16); + frame[0] = cmdSetChannel; + frame[1] = channelIndex; + // Write name (max 32 bytes UTF-8, null-padded) + final nameBytes = utf8.encode(name); + final nameLen = nameBytes.length < 32 ? nameBytes.length : 31; // Reserve 1 byte for null + for (int i = 0; i < nameLen; i++) { + frame[2 + i] = nameBytes[i]; + } + // frame[2 + nameLen] is already 0 (null terminator) + // Write PSK (16 bytes) + for (int i = 0; i < 16 && i < psk.length; i++) { + frame[34 + i] = psk[i]; + } + return frame; +} + +// Build CMD_SET_RADIO_PARAMS frame +// Format: [cmd][freq x4][bw x4][sf][cr] +// freq: frequency in Hz (300000-2500000) +// bw: bandwidth in Hz (7000-500000) +// sf: spreading factor (5-12) +// cr: coding rate (5-8) +Uint8List buildSetRadioParamsFrame(int freqHz, int bwHz, int sf, int cr) { + final frame = Uint8List(11); + frame[0] = cmdSetRadioParams; + writeUint32LE(frame, 1, freqHz); + writeUint32LE(frame, 5, bwHz); + frame[9] = sf; + frame[10] = cr; + return frame; +} + +// Build CMD_SET_RADIO_TX_POWER frame +// Format: [cmd][power_dbm] +Uint8List buildSetRadioTxPowerFrame(int powerDbm) { + return Uint8List.fromList([cmdSetRadioTxPower, powerDbm]); +} + +// Build CMD_RESET_PATH frame +// Format: [cmd][pub_key x32] +Uint8List buildResetPathFrame(Uint8List pubKey) { + final frame = Uint8List(1 + pubKeySize); + frame[0] = cmdResetPath; + frame.setRange(1, 1 + pubKeySize, pubKey); + return frame; +} + +// Build CMD_ADD_UPDATE_CONTACT frame to set custom path +// Format: [cmd][pub_key x32][type][flags][path_len][path x64][name x32][timestamp x4] +Uint8List buildUpdateContactPathFrame( + Uint8List pubKey, + Uint8List customPath, + int pathLen, { + int type = 1, // ADV_TYPE_CHAT + int flags = 0, + String name = '', +}) { + // Frame size: 1 + 32 + 1 + 1 + 1 + 64 + 32 + 4 = 136 bytes minimum + final frame = Uint8List(1 + pubKeySize + 1 + 1 + 1 + maxPathSize + maxNameSize + 4); + int offset = 0; + + frame[offset++] = cmdAddUpdateContact; + + // Public key (32 bytes) + frame.setRange(offset, offset + pubKeySize, pubKey); + offset += pubKeySize; + + // Type and flags + frame[offset++] = type; + frame[offset++] = flags; + + // Path length and path data + frame[offset++] = pathLen; + if (customPath.isNotEmpty && pathLen > 0) { + final copyLen = customPath.length < maxPathSize ? customPath.length : maxPathSize; + frame.setRange(offset, offset + copyLen, customPath.sublist(0, copyLen)); + } + offset += maxPathSize; + + // Name (32 bytes, null-padded) + if (name.isNotEmpty) { + final nameBytes = utf8.encode(name); + final nameLen = nameBytes.length < maxNameSize ? nameBytes.length : maxNameSize - 1; + frame.setRange(offset, offset + nameLen, nameBytes.sublist(0, nameLen)); + } + offset += maxNameSize; + + // Timestamp (current time) + final timestamp = DateTime.now().millisecondsSinceEpoch ~/ 1000; + writeUint32LE(frame, offset, timestamp); + + return frame; +} + +// Build CMD_GET_RADIO_SETTINGS frame +Uint8List buildGetRadioSettingsFrame() { + return Uint8List.fromList([cmdGetRadioSettings]); +} + +// Calculate LoRa airtime for a packet +// Based on Semtech SX127x datasheet formula +// Returns airtime in milliseconds +int calculateLoRaAirtime({ + required int payloadBytes, + required int spreadingFactor, + required int bandwidthHz, + required int codingRate, + int preambleSymbols = 8, + bool lowDataRateOptimize = false, + bool explicitHeader = true, +}) { + // Symbol duration (Ts) in milliseconds + final symbolDuration = (1 << spreadingFactor) / (bandwidthHz / 1000.0); + + // Preamble time + final preambleTime = (preambleSymbols + 4.25) * symbolDuration; + + // Payload symbol count + final headerBytes = explicitHeader ? 0 : 20; + final crc = 1; // CRC enabled + final de = lowDataRateOptimize ? 1 : 0; + + final numerator = 8 * payloadBytes - 4 * spreadingFactor + 28 + 16 * crc - headerBytes; + final denominator = 4 * (spreadingFactor - 2 * de); + var payloadSymbols = 8 + ((numerator / denominator).ceil()) * (codingRate + 4); + + if (payloadSymbols < 0) { + payloadSymbols = 8; + } + + final payloadTime = payloadSymbols * symbolDuration; + + return (preambleTime + payloadTime).ceil(); +} + +// Calculate timeout for a message based on radio settings +// Returns timeout in milliseconds +int calculateMessageTimeout({ + required int freqHz, + required int bwHz, + required int sf, + required int cr, + required int pathLength, + int messageBytes = 100, // Average message size +}) { + // Calculate airtime for one packet + final airtime = calculateLoRaAirtime( + payloadBytes: messageBytes, + spreadingFactor: sf, + bandwidthHz: bwHz, + codingRate: cr, + lowDataRateOptimize: sf >= 11, + ); + + if (pathLength < 0) { + // Flood mode: Base delay + 16× airtime + return 500 + (16 * airtime); + } else { + // Direct path: Base delay + ((airtime×6 + 250ms)×(hops+1)) + return 500 + ((airtime * 6 + 250) * (pathLength + 1)); + } +} + +// Build CLI command text message frame (companion_radio format) +// Format: [cmd][txt_type][attempt][timestamp x4][pub_key_prefix x6][text...]\0 +Uint8List buildSendCliCommandFrame( + Uint8List repeaterPubKey, + String command, { + int attempt = 0, +}) { + final textBytes = utf8.encode(command); + final timestamp = DateTime.now().millisecondsSinceEpoch ~/ 1000; + const prefixSize = 6; + final frame = Uint8List(1 + 1 + 1 + 4 + prefixSize + textBytes.length + 1); + int offset = 0; + + frame[offset++] = cmdSendTxtMsg; + frame[offset++] = txtTypeCliData; + frame[offset++] = attempt & 0xFF; + writeUint32LE(frame, offset, timestamp); + offset += 4; + + frame.setRange(offset, offset + prefixSize, repeaterPubKey.sublist(0, prefixSize)); + offset += prefixSize; + + frame.setRange(offset, offset + textBytes.length, textBytes); + frame[frame.length - 1] = 0; // null terminator + return frame; +} diff --git a/lib/helpers/smaz.dart b/lib/helpers/smaz.dart new file mode 100644 index 00000000..0e3e6c94 --- /dev/null +++ b/lib/helpers/smaz.dart @@ -0,0 +1,411 @@ +import 'dart:convert'; +import 'dart:typed_data'; + +class Smaz { + static const int _verbatimSingle = 254; + static const int _verbatimRun = 255; + + static const List _rcb = [ + " ", + "the", + "e", + "t", + "a", + "of", + "o", + "and", + "i", + "n", + "s", + "e ", + "r", + " th", + " t", + "in", + "he", + "th", + "h", + "he ", + "to", + "\r\n", + "l", + "s ", + "d", + " a", + "an", + "er", + "c", + " o", + "d ", + "on", + " of", + "re", + "of ", + "t ", + ", ", + "is", + "u", + "at", + " ", + "n ", + "or", + "which", + "f", + "m", + "as", + "it", + "that", + "\n", + "was", + "en", + " ", + " w", + "es", + " an", + " i", + "\r", + "f ", + "g", + "p", + "nd", + " s", + "nd ", + "ed ", + "w", + "ed", + "http://", + "for", + "te", + "ing", + "y ", + "The", + " c", + "ti", + "r ", + "his", + "st", + " in", + "ar", + "nt", + ",", + " to", + "y", + "ng", + " h", + "with", + "le", + "al", + "to ", + "b", + "ou", + "be", + "were", + " b", + "se", + "o ", + "ent", + "ha", + "ng ", + "their", + "\"", + "hi", + "from", + " f", + "in ", + "de", + "ion", + "me", + "v", + ".", + "ve", + "all", + "re ", + "ri", + "ro", + "is ", + "co", + "f t", + "are", + "ea", + ". ", + "her", + " m", + "er ", + " p", + "es ", + "by", + "they", + "di", + "ra", + "ic", + "not", + "s, ", + "d t", + "at ", + "ce", + "la", + "h ", + "ne", + "as ", + "tio", + "on ", + "n t", + "io", + "we", + " a ", + "om", + ", a", + "s o", + "ur", + "li", + "ll", + "ch", + "had", + "this", + "e t", + "g ", + "e\r\n", + " wh", + "ere", + " co", + "e o", + "a ", + "us", + " d", + "ss", + "\n\r\n", + "\r\n\r", + "=\"", + " be", + " e", + "s a", + "ma", + "one", + "t t", + "or ", + "but", + "el", + "so", + "l ", + "e s", + "s,", + "no", + "ter", + " wa", + "iv", + "ho", + "e a", + " r", + "hat", + "s t", + "ns", + "ch ", + "wh", + "tr", + "ut", + "/", + "have", + "ly ", + "ta", + " ha", + " on", + "tha", + "-", + " l", + "ati", + "en ", + "pe", + " re", + "there", + "ass", + "si", + " fo", + "wa", + "ec", + "our", + "who", + "its", + "z", + "fo", + "rs", + ">", + "ot", + "un", + "<", + "im", + "th ", + "nc", + "ate", + "><", + "ver", + "ad", + " we", + "ly", + "ee", + " n", + "id", + " cl", + "ac", + "il", + " _rcbBytes = + _rcb.map((s) => Uint8List.fromList(ascii.encode(s))).toList(growable: false); + static final int _maxEntryLen = _rcbBytes.fold(0, (maxLen, entry) { + return entry.length > maxLen ? entry.length : maxLen; + }); + + static String encodeIfSmaller(String text) { + if (text.isEmpty || text.startsWith('s:')) return text; + final originalBytes = Uint8List.fromList(utf8.encode(text)); + final compressed = compressBytes(originalBytes); + final encoded = base64Encode(compressed); + final candidate = 's:$encoded'; + if (utf8.encode(candidate).length < originalBytes.length) { + return candidate; + } + return text; + } + + static String? tryDecodePrefixed(String text) { + final trimmedLeft = text.trimLeft(); + if (!trimmedLeft.startsWith('s:') || trimmedLeft.length <= 2) return null; + final encoded = trimmedLeft.substring(2); + try { + final compressed = _decodeBase64Flexible(encoded); + final decompressed = decompressBytes(compressed); + return utf8.decode(decompressed, allowMalformed: true); + } catch (_) { + return null; + } + } + + static Uint8List compressBytes(Uint8List input) { + final out = BytesBuilder(copy: false); + final verbatim = []; + int index = 0; + + void flushVerbatim() { + if (verbatim.isEmpty) return; + if (verbatim.length == 1) { + out.addByte(_verbatimSingle); + out.addByte(verbatim[0]); + } else { + out.addByte(_verbatimRun); + out.addByte(verbatim.length - 1); + out.add(verbatim); + } + verbatim.clear(); + } + + while (index < input.length) { + int bestLen = 0; + int bestCode = -1; + final remaining = input.length - index; + final maxLen = remaining < _maxEntryLen ? remaining : _maxEntryLen; + + for (int code = 0; code < _rcbBytes.length; code++) { + final entry = _rcbBytes[code]; + final entryLen = entry.length; + if (entryLen == 0 || entryLen > maxLen || entryLen <= bestLen) { + continue; + } + if (_matches(input, index, entry)) { + bestLen = entryLen; + bestCode = code; + if (bestLen == maxLen) { + break; + } + } + } + + if (bestCode >= 0) { + flushVerbatim(); + out.addByte(bestCode); + index += bestLen; + continue; + } + + verbatim.add(input[index]); + index++; + if (verbatim.length == 256) { + flushVerbatim(); + } + } + + flushVerbatim(); + return out.toBytes(); + } + + static Uint8List decompressBytes(Uint8List input) { + final out = BytesBuilder(copy: false); + int index = 0; + + while (index < input.length) { + final code = input[index]; + if (code == _verbatimSingle) { + if (index + 1 >= input.length) { + throw const FormatException('Invalid SMAZ stream: truncated verbatim byte.'); + } + out.addByte(input[index + 1]); + index += 2; + } else if (code == _verbatimRun) { + if (index + 1 >= input.length) { + throw const FormatException('Invalid SMAZ stream: truncated verbatim length.'); + } + final len = input[index + 1] + 1; + final end = index + 2 + len; + if (end > input.length) { + throw const FormatException('Invalid SMAZ stream: truncated verbatim run.'); + } + out.add(input.sublist(index + 2, end)); + index = end; + } else { + if (code >= _rcbBytes.length) { + throw const FormatException('Invalid SMAZ stream: code out of range.'); + } + out.add(_rcbBytes[code]); + index += 1; + } + } + + return out.toBytes(); + } + + static bool _matches(Uint8List input, int offset, Uint8List entry) { + final len = entry.length; + if (offset + len > input.length) return false; + for (int i = 0; i < len; i++) { + if (input[offset + i] != entry[i]) return false; + } + return true; + } + + static Uint8List _decodeBase64Flexible(String encoded) { + final trimmed = encoded.trim(); + try { + return base64Decode(trimmed); + } catch (_) { + // Try base64url with missing padding. + var normalized = trimmed.replaceAll('-', '+').replaceAll('_', '/'); + final pad = normalized.length % 4; + if (pad != 0) { + normalized = normalized.padRight(normalized.length + (4 - pad), '='); + } + return base64Decode(normalized); + } + } +} diff --git a/lib/main.dart b/lib/main.dart new file mode 100644 index 00000000..2909bf9a --- /dev/null +++ b/lib/main.dart @@ -0,0 +1,118 @@ +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +import 'connector/meshcore_connector.dart'; +import 'screens/scanner_screen.dart'; +import 'services/storage_service.dart'; +import 'services/message_retry_service.dart'; +import 'services/path_history_service.dart'; +import 'services/app_settings_service.dart'; +import 'services/notification_service.dart'; +import 'services/ble_debug_log_service.dart'; + +void main() async { + WidgetsFlutterBinding.ensureInitialized(); + + // Initialize services + final storage = StorageService(); + final connector = MeshCoreConnector(); + final pathHistoryService = PathHistoryService(storage); + final retryService = MessageRetryService(storage); + final appSettingsService = AppSettingsService(); + final bleDebugLogService = BleDebugLogService(); + + // Load settings + await appSettingsService.loadSettings(); + + // Initialize notification service + final notificationService = NotificationService(); + await notificationService.initialize(); + + // Wire up connector with services + connector.initialize( + retryService: retryService, + pathHistoryService: pathHistoryService, + appSettingsService: appSettingsService, + bleDebugLogService: bleDebugLogService, + ); + + await connector.loadContactCache(); + await connector.loadChannelSettings(); + + // Load persisted channel messages + await connector.loadAllChannelMessages(); + + runApp(MeshCoreApp( + connector: connector, + retryService: retryService, + pathHistoryService: pathHistoryService, + storage: storage, + appSettingsService: appSettingsService, + bleDebugLogService: bleDebugLogService, + )); +} + +class MeshCoreApp extends StatelessWidget { + final MeshCoreConnector connector; + final MessageRetryService retryService; + final PathHistoryService pathHistoryService; + final StorageService storage; + final AppSettingsService appSettingsService; + final BleDebugLogService bleDebugLogService; + + const MeshCoreApp({ + super.key, + required this.connector, + required this.retryService, + required this.pathHistoryService, + required this.storage, + required this.appSettingsService, + required this.bleDebugLogService, + }); + + @override + Widget build(BuildContext context) { + return MultiProvider( + providers: [ + ChangeNotifierProvider.value(value: connector), + ChangeNotifierProvider.value(value: retryService), + ChangeNotifierProvider.value(value: pathHistoryService), + ChangeNotifierProvider.value(value: appSettingsService), + ChangeNotifierProvider.value(value: bleDebugLogService), + Provider.value(value: storage), + ], + child: Consumer( + builder: (context, settingsService, child) { + return MaterialApp( + title: 'MeshCore Open', + debugShowCheckedModeBanner: false, + theme: ThemeData( + colorScheme: ColorScheme.fromSeed(seedColor: Colors.blue), + useMaterial3: true, + ), + darkTheme: ThemeData( + colorScheme: ColorScheme.fromSeed( + seedColor: Colors.blue, + brightness: Brightness.dark, + ), + useMaterial3: true, + ), + themeMode: _themeModeFromSetting(settingsService.settings.themeMode), + home: const ScannerScreen(), + ); + }, + ), + ); + } + + ThemeMode _themeModeFromSetting(String value) { + switch (value) { + case 'light': + return ThemeMode.light; + case 'dark': + return ThemeMode.dark; + default: + return ThemeMode.system; + } + } +} diff --git a/lib/models/app_settings.dart b/lib/models/app_settings.dart new file mode 100644 index 00000000..9b648348 --- /dev/null +++ b/lib/models/app_settings.dart @@ -0,0 +1,108 @@ +class AppSettings { + final bool clearPathOnMaxRetry; + final bool mapShowRepeaters; + final bool mapShowChatNodes; + final bool mapShowOtherNodes; + final double mapTimeFilterHours; // 0 = all time + final bool mapKeyPrefixEnabled; + final String mapKeyPrefix; + final bool mapShowMarkers; + final bool notificationsEnabled; + final bool notifyOnNewMessage; + final bool notifyOnNewAdvert; + final bool autoRouteRotationEnabled; + final String themeMode; + final Map batteryChemistryByDeviceId; + + AppSettings({ + this.clearPathOnMaxRetry = false, + this.mapShowRepeaters = true, + this.mapShowChatNodes = true, + this.mapShowOtherNodes = true, + this.mapTimeFilterHours = 0, // Default to all time + this.mapKeyPrefixEnabled = false, + this.mapKeyPrefix = '', + this.mapShowMarkers = true, + this.notificationsEnabled = true, + this.notifyOnNewMessage = true, + this.notifyOnNewAdvert = true, + this.autoRouteRotationEnabled = false, + this.themeMode = 'system', + Map? batteryChemistryByDeviceId, + }) : batteryChemistryByDeviceId = batteryChemistryByDeviceId ?? {}; + + Map toJson() { + return { + 'clear_path_on_max_retry': clearPathOnMaxRetry, + 'map_show_repeaters': mapShowRepeaters, + 'map_show_chat_nodes': mapShowChatNodes, + 'map_show_other_nodes': mapShowOtherNodes, + 'map_time_filter_hours': mapTimeFilterHours, + 'map_key_prefix_enabled': mapKeyPrefixEnabled, + 'map_key_prefix': mapKeyPrefix, + 'map_show_markers': mapShowMarkers, + 'notifications_enabled': notificationsEnabled, + 'notify_on_new_message': notifyOnNewMessage, + 'notify_on_new_advert': notifyOnNewAdvert, + 'auto_route_rotation_enabled': autoRouteRotationEnabled, + 'theme_mode': themeMode, + 'battery_chemistry_by_device_id': batteryChemistryByDeviceId, + }; + } + + factory AppSettings.fromJson(Map json) { + return AppSettings( + clearPathOnMaxRetry: json['clear_path_on_max_retry'] as bool? ?? false, + mapShowRepeaters: json['map_show_repeaters'] as bool? ?? true, + mapShowChatNodes: json['map_show_chat_nodes'] as bool? ?? true, + mapShowOtherNodes: json['map_show_other_nodes'] as bool? ?? true, + mapTimeFilterHours: (json['map_time_filter_hours'] as num?)?.toDouble() ?? 0, + mapKeyPrefixEnabled: json['map_key_prefix_enabled'] as bool? ?? false, + mapKeyPrefix: json['map_key_prefix'] as String? ?? '', + mapShowMarkers: json['map_show_markers'] as bool? ?? true, + notificationsEnabled: json['notifications_enabled'] as bool? ?? true, + notifyOnNewMessage: json['notify_on_new_message'] as bool? ?? true, + notifyOnNewAdvert: json['notify_on_new_advert'] as bool? ?? true, + autoRouteRotationEnabled: json['auto_route_rotation_enabled'] as bool? ?? false, + themeMode: json['theme_mode'] as String? ?? 'system', + batteryChemistryByDeviceId: (json['battery_chemistry_by_device_id'] as Map?)?.map( + (key, value) => MapEntry(key.toString(), value.toString()), + ) ?? + {}, + ); + } + + AppSettings copyWith({ + bool? clearPathOnMaxRetry, + bool? mapShowRepeaters, + bool? mapShowChatNodes, + bool? mapShowOtherNodes, + double? mapTimeFilterHours, + bool? mapKeyPrefixEnabled, + String? mapKeyPrefix, + bool? mapShowMarkers, + bool? notificationsEnabled, + bool? notifyOnNewMessage, + bool? notifyOnNewAdvert, + bool? autoRouteRotationEnabled, + String? themeMode, + Map? batteryChemistryByDeviceId, + }) { + return AppSettings( + clearPathOnMaxRetry: clearPathOnMaxRetry ?? this.clearPathOnMaxRetry, + mapShowRepeaters: mapShowRepeaters ?? this.mapShowRepeaters, + mapShowChatNodes: mapShowChatNodes ?? this.mapShowChatNodes, + mapShowOtherNodes: mapShowOtherNodes ?? this.mapShowOtherNodes, + mapTimeFilterHours: mapTimeFilterHours ?? this.mapTimeFilterHours, + mapKeyPrefixEnabled: mapKeyPrefixEnabled ?? this.mapKeyPrefixEnabled, + mapKeyPrefix: mapKeyPrefix ?? this.mapKeyPrefix, + mapShowMarkers: mapShowMarkers ?? this.mapShowMarkers, + notificationsEnabled: notificationsEnabled ?? this.notificationsEnabled, + notifyOnNewMessage: notifyOnNewMessage ?? this.notifyOnNewMessage, + notifyOnNewAdvert: notifyOnNewAdvert ?? this.notifyOnNewAdvert, + autoRouteRotationEnabled: autoRouteRotationEnabled ?? this.autoRouteRotationEnabled, + themeMode: themeMode ?? this.themeMode, + batteryChemistryByDeviceId: batteryChemistryByDeviceId ?? this.batteryChemistryByDeviceId, + ); + } +} diff --git a/lib/models/channel.dart b/lib/models/channel.dart new file mode 100644 index 00000000..40a3ebbe --- /dev/null +++ b/lib/models/channel.dart @@ -0,0 +1,57 @@ +import 'dart:convert'; +import 'dart:typed_data'; + +import '../connector/meshcore_protocol.dart'; + +class Channel { + final int index; + final String name; + final Uint8List psk; // 16 bytes + + Channel({ + required this.index, + required this.name, + required this.psk, + }); + + String get pskBase64 => base64Encode(psk); + + bool get isEmpty => name.isEmpty && psk.every((b) => b == 0); + + bool get isPublicChannel => pskBase64 == publicChannelPsk; + + static Channel? fromFrame(Uint8List data) { + // CHANNEL_INFO format: + // [0] = RESP_CODE_CHANNEL_INFO (18) + // [1] = channel_idx + // [2-33] = name (32 bytes, null-terminated) + // [34-49] = psk (16 bytes) + if (data.length < 50) return null; + if (data[0] != respCodeChannelInfo) return null; + + final index = data[1]; + final name = readCString(data, 2, 32); + final psk = Uint8List.fromList(data.sublist(34, 50)); + + return Channel(index: index, name: name, psk: psk); + } + + static Channel empty(int index) { + return Channel( + index: index, + name: '', + psk: Uint8List(16), + ); + } + + static Channel fromPsk(int index, String name, String pskBase64) { + final pskBytes = base64Decode(pskBase64); + final psk = Uint8List(16); + for (int i = 0; i < pskBytes.length && i < 16; i++) { + psk[i] = pskBytes[i]; + } + return Channel(index: index, name: name, psk: psk); + } + + static const String publicChannelPsk = 'izOH6cXN6mrJ5e26oRXNcg=='; +} diff --git a/lib/models/channel_message.dart b/lib/models/channel_message.dart new file mode 100644 index 00000000..0fdb679d --- /dev/null +++ b/lib/models/channel_message.dart @@ -0,0 +1,170 @@ +import 'dart:typed_data'; +import '../connector/meshcore_protocol.dart'; +import '../helpers/smaz.dart'; + +enum ChannelMessageStatus { pending, sent, failed } + +class Repeat { + final Uint8List? repeaterKey; + final String repeaterName; + final int tripTimeMs; + final List? path; + + Repeat({ + this.repeaterKey, + required this.repeaterName, + required this.tripTimeMs, + this.path, + }); + + String? get repeaterKeyHex => + repeaterKey != null ? pubKeyToHex(repeaterKey!) : null; +} + +class ChannelMessage { + final Uint8List? senderKey; + final String senderName; + final String text; + final DateTime timestamp; + final bool isOutgoing; + final ChannelMessageStatus status; + final List repeats; + final int repeatCount; + final int? pathLength; + final Uint8List pathBytes; + final int? channelIndex; + + ChannelMessage({ + this.senderKey, + required this.senderName, + required this.text, + required this.timestamp, + required this.isOutgoing, + this.status = ChannelMessageStatus.pending, + this.repeats = const [], + this.repeatCount = 0, + this.pathLength, + Uint8List? pathBytes, + this.channelIndex, + }) : pathBytes = pathBytes ?? Uint8List(0); + + String? get senderKeyHex => senderKey != null ? pubKeyToHex(senderKey!) : null; + + ChannelMessage copyWith({ + ChannelMessageStatus? status, + List? repeats, + int? repeatCount, + int? pathLength, + Uint8List? pathBytes, + }) { + return ChannelMessage( + senderKey: senderKey, + senderName: senderName, + text: text, + timestamp: timestamp, + isOutgoing: isOutgoing, + status: status ?? this.status, + repeats: repeats ?? this.repeats, + repeatCount: repeatCount ?? this.repeatCount, + pathLength: pathLength ?? this.pathLength, + pathBytes: pathBytes ?? this.pathBytes, + channelIndex: channelIndex, + ); + } + + static ChannelMessage? fromFrame(Uint8List data) { + // CHANNEL_MSG_RECV format varies by version: + // V3: [0]=code [1]=SNR [2]=rsv1 [3]=rsv2 [4]=channel_idx [5]=path_len [path... optional] [txt_type] [timestamp x4] [text...] + // Non-V3: [0]=code [1]=channel_idx [2]=path_len [3]=txt_type [4-7]=timestamp [8+]=text + if (data.length < 8) return null; + + final code = data[0]; + if (code != respCodeChannelMsgRecv && code != respCodeChannelMsgRecvV3) { + return null; + } + + int timestampOffset, textOffset, pathLenOffset, txtTypeOffset; + Uint8List pathBytes = Uint8List(0); + int channelIdx; + + if (code == respCodeChannelMsgRecvV3) { + channelIdx = data[4]; + pathLenOffset = 5; + final pathLen = data[pathLenOffset].toSigned(8); + var cursor = 6; + final hasPathBytesFlag = (data[2] & 0x01) != 0; + final canFitPath = pathLen > 0 && data.length >= cursor + pathLen + 5; + final hasValidTxtType = + cursor < data.length && (data[cursor] == txtTypePlain || data[cursor] == txtTypeCliData); + if ((hasPathBytesFlag || (canFitPath && !hasValidTxtType)) && canFitPath) { + pathBytes = Uint8List.fromList(data.sublist(cursor, cursor + pathLen)); + cursor += pathLen; + } + txtTypeOffset = cursor; + cursor += 1; // txt_type + timestampOffset = cursor; + textOffset = cursor + 4; + } else { + channelIdx = data[1]; + pathLenOffset = 2; + txtTypeOffset = 3; + timestampOffset = 4; + textOffset = 8; + } + + if (data.length < textOffset + 1) return null; + + final txtType = data[txtTypeOffset]; + if (txtType != txtTypePlain) { + return null; + } + + final pathLen = data[pathLenOffset].toSigned(8); + final timestampRaw = readUint32LE(data, timestampOffset); + final text = readCString(data, textOffset, data.length - textOffset); + + // Extract sender name and actual message from "name: msg" format + String senderName = 'Unknown'; + String actualText = text; + + final colonIndex = text.indexOf(':'); + if (colonIndex > 0 && colonIndex < text.length - 1 && colonIndex < 50) { + final potentialSender = text.substring(0, colonIndex); + if (!RegExp(r'[:\[\]]').hasMatch(potentialSender)) { + senderName = potentialSender; + final offset = (colonIndex + 1 < text.length && text[colonIndex + 1] == ' ') + ? colonIndex + 2 + : colonIndex + 1; + actualText = text.substring(offset); + } + } + + final decodedText = Smaz.tryDecodePrefixed(actualText) ?? actualText; + + return ChannelMessage( + senderKey: null, + senderName: senderName, + text: decodedText, + timestamp: DateTime.fromMillisecondsSinceEpoch(timestampRaw * 1000), + isOutgoing: false, + status: ChannelMessageStatus.sent, + pathLength: pathLen, + pathBytes: pathBytes, + channelIndex: channelIdx, + ); + } + + static ChannelMessage outgoing(String text, String senderName, int channelIndex) { + return ChannelMessage( + senderKey: null, + senderName: senderName, + text: text, + timestamp: DateTime.now(), + isOutgoing: true, + status: ChannelMessageStatus.pending, + pathLength: null, + pathBytes: Uint8List(0), + channelIndex: channelIndex, + ); + } +} diff --git a/lib/models/contact.dart b/lib/models/contact.dart new file mode 100644 index 00000000..80e2e8a6 --- /dev/null +++ b/lib/models/contact.dart @@ -0,0 +1,110 @@ +import 'dart:typed_data'; +import '../connector/meshcore_protocol.dart'; + +class Contact { + final Uint8List publicKey; + final String name; + final int type; + final int pathLength; // -1 = flood, 0+ = direct hops + final Uint8List path; + final double? latitude; + final double? longitude; + final DateTime lastSeen; + + Contact({ + required this.publicKey, + required this.name, + required this.type, + required this.pathLength, + required this.path, + this.latitude, + this.longitude, + required this.lastSeen, + }); + + String get publicKeyHex => pubKeyToHex(publicKey); + + String get typeLabel { + switch (type) { + case advTypeChat: + return 'Chat'; + case advTypeRepeater: + return 'Repeater'; + case advTypeRoom: + return 'Room'; + case advTypeSensor: + return 'Sensor'; + default: + return 'Unknown'; + } + } + + String get pathLabel { + if (pathLength < 0) return 'Flood'; + if (pathLength == 0) return 'Direct'; + return '$pathLength hops'; + } + + bool get hasLocation => latitude != null && longitude != null; + + String get pathIdList { + if (path.isEmpty) return ''; + final parts = []; + final groupSize = pathHashSize; + for (int i = 0; i < path.length; i += groupSize) { + final end = (i + groupSize) <= path.length ? (i + groupSize) : path.length; + final chunk = path.sublist(i, end); + parts.add( + chunk.map((b) => b.toRadixString(16).padLeft(2, '0').toUpperCase()).join(), + ); + } + return parts.join(','); + } + + static Contact? fromFrame(Uint8List data) { + if (data.length < contactFrameSize) return null; + if (data[0] != respCodeContact) return null; + + final pubKey = Uint8List.fromList( + data.sublist(contactPubKeyOffset, contactPubKeyOffset + pubKeySize), + ); + final type = data[contactTypeOffset]; + final pathLen = data[contactPathLenOffset].toSigned(8); + final safePathLen = pathLen > 0 + ? (pathLen > maxPathSize ? maxPathSize : pathLen) + : 0; + final pathBytes = safePathLen > 0 + ? Uint8List.fromList( + data.sublist(contactPathOffset, contactPathOffset + safePathLen), + ) + : Uint8List(0); + final name = readCString(data, contactNameOffset, maxNameSize); + final lastmod = readUint32LE(data, contactLastmodOffset); + + double? lat, lon; + final latRaw = readInt32LE(data, contactLatOffset); + final lonRaw = readInt32LE(data, contactLonOffset); + if (latRaw != 0 || lonRaw != 0) { + lat = latRaw / 1e6; + lon = lonRaw / 1e6; + } + + return Contact( + publicKey: pubKey, + name: name.isEmpty ? 'Unknown' : name, + type: type, + pathLength: pathLen, + path: pathBytes, + latitude: lat, + longitude: lon, + lastSeen: DateTime.fromMillisecondsSinceEpoch(lastmod * 1000), + ); + } + + @override + bool operator ==(Object other) => + other is Contact && publicKeyHex == other.publicKeyHex; + + @override + int get hashCode => publicKeyHex.hashCode; +} diff --git a/lib/models/contact_group.dart b/lib/models/contact_group.dart new file mode 100644 index 00000000..000a4748 --- /dev/null +++ b/lib/models/contact_group.dart @@ -0,0 +1,37 @@ +class ContactGroup { + final String name; + final List memberKeys; + + const ContactGroup({ + required this.name, + required this.memberKeys, + }); + + ContactGroup copyWith({ + String? name, + List? memberKeys, + }) { + return ContactGroup( + name: name ?? this.name, + memberKeys: memberKeys ?? List.from(this.memberKeys), + ); + } + + Map toJson() { + return { + 'name': name, + 'members': memberKeys, + }; + } + + factory ContactGroup.fromJson(Map json) { + final members = (json['members'] as List?) + ?.map((value) => value.toString()) + .toList() ?? + []; + return ContactGroup( + name: json['name'] as String? ?? '', + memberKeys: members, + ); + } +} diff --git a/lib/models/message.dart b/lib/models/message.dart new file mode 100644 index 00000000..4c347d46 --- /dev/null +++ b/lib/models/message.dart @@ -0,0 +1,125 @@ +import 'dart:typed_data'; +import '../connector/meshcore_protocol.dart'; + +enum MessageStatus { pending, sent, delivered, failed } + +class Message { + final Uint8List senderKey; + final String text; + final DateTime timestamp; + final bool isOutgoing; + final bool isCli; + final MessageStatus status; + + // NEW: Retry logic fields + final String? messageId; + final int retryCount; + final int? estimatedTimeoutMs; + final Uint8List? expectedAckHash; + final DateTime? sentAt; + final DateTime? deliveredAt; + final int? tripTimeMs; + final bool forceFlood; + final int? pathLength; + final Uint8List pathBytes; + + Message({ + required this.senderKey, + required this.text, + required this.timestamp, + required this.isOutgoing, + this.isCli = false, + this.status = MessageStatus.pending, + this.messageId, + this.retryCount = 0, + this.estimatedTimeoutMs, + this.expectedAckHash, + this.sentAt, + this.deliveredAt, + this.tripTimeMs, + this.forceFlood = false, + this.pathLength, + Uint8List? pathBytes, + }) : pathBytes = pathBytes ?? Uint8List(0); + + String get senderKeyHex => pubKeyToHex(senderKey); + + Message copyWith({ + MessageStatus? status, + int? retryCount, + int? estimatedTimeoutMs, + Uint8List? expectedAckHash, + DateTime? sentAt, + DateTime? deliveredAt, + int? tripTimeMs, + int? pathLength, + Uint8List? pathBytes, + bool? isCli, + }) { + return Message( + senderKey: senderKey, + text: text, + timestamp: timestamp, + isOutgoing: isOutgoing, + isCli: isCli ?? this.isCli, + status: status ?? this.status, + messageId: messageId, + retryCount: retryCount ?? this.retryCount, + estimatedTimeoutMs: estimatedTimeoutMs ?? this.estimatedTimeoutMs, + expectedAckHash: expectedAckHash ?? this.expectedAckHash, + sentAt: sentAt ?? this.sentAt, + deliveredAt: deliveredAt ?? this.deliveredAt, + tripTimeMs: tripTimeMs ?? this.tripTimeMs, + forceFlood: forceFlood, + pathLength: pathLength ?? this.pathLength, + pathBytes: pathBytes ?? this.pathBytes, + ); + } + + static Message? fromFrame(Uint8List data, Uint8List selfPubKey) { + if (data.length < msgTextOffset + 1) return null; + + final code = data[0]; + if (code != respCodeContactMsgRecv && code != respCodeContactMsgRecvV3) { + return null; + } + + final senderKey = Uint8List.fromList( + data.sublist(msgPubKeyOffset, msgPubKeyOffset + pubKeySize), + ); + final timestampRaw = readUint32LE(data, msgTimestampOffset); + final flags = data[msgFlagsOffset]; + if ((flags >> 2) != txtTypePlain) { + return null; + } + final text = readCString(data, msgTextOffset, data.length - msgTextOffset); + + return Message( + senderKey: senderKey, + text: text, + timestamp: DateTime.fromMillisecondsSinceEpoch(timestampRaw * 1000), + isOutgoing: false, + isCli: false, + status: MessageStatus.delivered, + pathBytes: Uint8List(0), + ); + } + + static Message outgoing( + Uint8List recipientKey, + String text, { + int? pathLength, + Uint8List? pathBytes, + }) { + return Message( + senderKey: recipientKey, + text: text, + timestamp: DateTime.now(), + isOutgoing: true, + isCli: false, + status: MessageStatus.pending, + pathLength: pathLength, + pathBytes: pathBytes, + ); + } +} diff --git a/lib/models/path_history.dart b/lib/models/path_history.dart new file mode 100644 index 00000000..1e2426a0 --- /dev/null +++ b/lib/models/path_history.dart @@ -0,0 +1,85 @@ +class PathRecord { + final int hopCount; + final int tripTimeMs; + final DateTime timestamp; + final bool wasFloodDiscovery; + final List pathBytes; + final int successCount; + final int failureCount; + + PathRecord({ + required this.hopCount, + required this.tripTimeMs, + required this.timestamp, + required this.wasFloodDiscovery, + required this.pathBytes, + required this.successCount, + required this.failureCount, + }); + + String get displayText => + '$hopCount ${hopCount == 1 ? 'hop' : 'hops'} - ${(tripTimeMs / 1000).toStringAsFixed(2)}s'; + + Map toJson() { + return { + 'hop_count': hopCount, + 'trip_time_ms': tripTimeMs, + 'timestamp': timestamp.toIso8601String(), + 'was_flood': wasFloodDiscovery, + 'path_bytes': pathBytes, + 'success_count': successCount, + 'failure_count': failureCount, + }; + } + + factory PathRecord.fromJson(Map json) { + return PathRecord( + hopCount: json['hop_count'] as int, + tripTimeMs: json['trip_time_ms'] as int, + timestamp: DateTime.parse(json['timestamp'] as String), + wasFloodDiscovery: json['was_flood'] as bool, + pathBytes: (json['path_bytes'] as List?)?.map((b) => b as int).toList() ?? [], + successCount: json['success_count'] as int? ?? 0, + failureCount: json['failure_count'] as int? ?? 0, + ); + } +} + +class ContactPathHistory { + final String contactPubKeyHex; + final List recentPaths; + + ContactPathHistory({ + required this.contactPubKeyHex, + required this.recentPaths, + }); + + PathRecord? get fastest { + if (recentPaths.isEmpty) return null; + return recentPaths.reduce((a, b) => a.tripTimeMs < b.tripTimeMs ? a : b); + } + + PathRecord? get mostRecent { + if (recentPaths.isEmpty) return null; + return recentPaths.first; + } + + Map toJson() { + return { + 'recent_paths': recentPaths.map((p) => p.toJson()).toList(), + }; + } + + factory ContactPathHistory.fromJson( + String contactPubKeyHex, Map json) { + final pathsList = (json['recent_paths'] as List?) + ?.map((p) => PathRecord.fromJson(p as Map)) + .toList() ?? + []; + + return ContactPathHistory( + contactPubKeyHex: contactPubKeyHex, + recentPaths: pathsList, + ); + } +} diff --git a/lib/models/path_selection.dart b/lib/models/path_selection.dart new file mode 100644 index 00000000..65f2f278 --- /dev/null +++ b/lib/models/path_selection.dart @@ -0,0 +1,11 @@ +class PathSelection { + final List pathBytes; + final int hopCount; + final bool useFlood; + + const PathSelection({ + required this.pathBytes, + required this.hopCount, + required this.useFlood, + }); +} diff --git a/lib/models/radio_settings.dart b/lib/models/radio_settings.dart new file mode 100644 index 00000000..9df96be1 --- /dev/null +++ b/lib/models/radio_settings.dart @@ -0,0 +1,107 @@ +enum LoRaBandwidth { + bw7_8(7800, '7.8 kHz'), + bw10_4(10400, '10.4 kHz'), + bw15_6(15600, '15.6 kHz'), + bw20_8(20800, '20.8 kHz'), + bw31_25(31250, '31.25 kHz'), + bw41_7(41700, '41.7 kHz'), + bw62_5(62500, '62.5 kHz'), + bw125(125000, '125 kHz'), + bw250(250000, '250 kHz'), + bw500(500000, '500 kHz'); + + final int hz; + final String label; + + const LoRaBandwidth(this.hz, this.label); +} + +enum LoRaSpreadingFactor { + sf5(5, 'SF5'), + sf6(6, 'SF6'), + sf7(7, 'SF7'), + sf8(8, 'SF8'), + sf9(9, 'SF9'), + sf10(10, 'SF10'), + sf11(11, 'SF11'), + sf12(12, 'SF12'); + + final int value; + final String label; + + const LoRaSpreadingFactor(this.value, this.label); +} + +enum LoRaCodingRate { + cr4_5(5, '4/5'), + cr4_6(6, '4/6'), + cr4_7(7, '4/7'), + cr4_8(8, '4/8'); + + final int value; + final String label; + + const LoRaCodingRate(this.value, this.label); +} + +class RadioSettings { + final double frequencyMHz; + final LoRaBandwidth bandwidth; + final LoRaSpreadingFactor spreadingFactor; + final LoRaCodingRate codingRate; + final int txPowerDbm; + + RadioSettings({ + required this.frequencyMHz, + required this.bandwidth, + required this.spreadingFactor, + required this.codingRate, + required this.txPowerDbm, + }); + + // Preset configurations + static RadioSettings get preset915MHz => RadioSettings( + frequencyMHz: 915.0, + bandwidth: LoRaBandwidth.bw125, + spreadingFactor: LoRaSpreadingFactor.sf7, + codingRate: LoRaCodingRate.cr4_5, + txPowerDbm: 20, + ); + + static RadioSettings get preset868MHz => RadioSettings( + frequencyMHz: 868.0, + bandwidth: LoRaBandwidth.bw125, + spreadingFactor: LoRaSpreadingFactor.sf7, + codingRate: LoRaCodingRate.cr4_5, + txPowerDbm: 14, + ); + + static RadioSettings get preset433MHz => RadioSettings( + frequencyMHz: 433.0, + bandwidth: LoRaBandwidth.bw125, + spreadingFactor: LoRaSpreadingFactor.sf7, + codingRate: LoRaCodingRate.cr4_5, + txPowerDbm: 20, + ); + + static RadioSettings get presetLongRange => RadioSettings( + frequencyMHz: 915.0, + bandwidth: LoRaBandwidth.bw125, + spreadingFactor: LoRaSpreadingFactor.sf12, + codingRate: LoRaCodingRate.cr4_8, + txPowerDbm: 20, + ); + + static RadioSettings get presetFastSpeed => RadioSettings( + frequencyMHz: 915.0, + bandwidth: LoRaBandwidth.bw500, + spreadingFactor: LoRaSpreadingFactor.sf7, + codingRate: LoRaCodingRate.cr4_5, + txPowerDbm: 20, + ); + + int get frequencyHz => (frequencyMHz * 1000).round(); + int get bandwidthHz => bandwidth.hz; + int get sf => spreadingFactor.value; + int get cr => codingRate.value; +} diff --git a/lib/screens/app_settings_screen.dart b/lib/screens/app_settings_screen.dart new file mode 100644 index 00000000..2592a972 --- /dev/null +++ b/lib/screens/app_settings_screen.dart @@ -0,0 +1,484 @@ +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +import '../connector/meshcore_connector.dart'; +import '../services/app_settings_service.dart'; +import '../services/notification_service.dart'; + +class AppSettingsScreen extends StatelessWidget { + const AppSettingsScreen({super.key}); + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: const Text('App Settings'), + centerTitle: true, + ), + body: Consumer2( + builder: (context, settingsService, connector, child) { + return ListView( + padding: const EdgeInsets.all(16), + children: [ + _buildAppearanceCard(context, settingsService), + const SizedBox(height: 16), + _buildNotificationsCard(context, settingsService), + const SizedBox(height: 16), + _buildMessagingCard(context, settingsService), + const SizedBox(height: 16), + _buildBatteryCard(context, settingsService, connector), + const SizedBox(height: 16), + _buildMapSettingsCard(context, settingsService), + ], + ); + }, + ), + ); + } + + Widget _buildAppearanceCard(BuildContext context, AppSettingsService settingsService) { + return Card( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const Padding( + padding: EdgeInsets.fromLTRB(16, 16, 16, 8), + child: Text( + 'Appearance', + style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold), + ), + ), + ListTile( + leading: const Icon(Icons.brightness_6_outlined), + title: const Text('Theme'), + subtitle: Text(_themeModeLabel(settingsService.settings.themeMode)), + trailing: const Icon(Icons.chevron_right), + onTap: () => _showThemeModeDialog(context, settingsService), + ), + ], + ), + ); + } + + Widget _buildNotificationsCard(BuildContext context, AppSettingsService settingsService) { + return Card( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const Padding( + padding: EdgeInsets.fromLTRB(16, 16, 16, 8), + child: Text( + 'Notifications', + style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold), + ), + ), + SwitchListTile( + secondary: const Icon(Icons.notifications_outlined), + title: const Text('Enable Notifications'), + subtitle: const Text('Receive notifications for messages and adverts'), + value: settingsService.settings.notificationsEnabled, + onChanged: (value) async { + if (value) { + // Request permission when enabling + final granted = await NotificationService().requestPermissions(); + if (!granted) { + if (context.mounted) { + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar( + content: Text('Notification permission denied'), + duration: Duration(seconds: 2), + ), + ); + } + return; + } + } + + await settingsService.setNotificationsEnabled(value); + if (context.mounted) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text(value + ? 'Notifications enabled' + : 'Notifications disabled'), + duration: const Duration(seconds: 2), + ), + ); + } + }, + ), + const Divider(height: 1), + SwitchListTile( + secondary: Icon( + Icons.message_outlined, + color: settingsService.settings.notificationsEnabled ? null : Colors.grey, + ), + title: Text( + 'Message Notifications', + style: TextStyle( + color: settingsService.settings.notificationsEnabled ? null : Colors.grey, + ), + ), + subtitle: Text( + 'Show notification when receiving new messages', + style: TextStyle( + color: settingsService.settings.notificationsEnabled ? null : Colors.grey, + ), + ), + value: settingsService.settings.notifyOnNewMessage, + onChanged: settingsService.settings.notificationsEnabled + ? (value) { + settingsService.setNotifyOnNewMessage(value); + } + : null, + ), + const Divider(height: 1), + SwitchListTile( + secondary: Icon( + Icons.cell_tower, + color: settingsService.settings.notificationsEnabled ? null : Colors.grey, + ), + title: Text( + 'Advertisement Notifications', + style: TextStyle( + color: settingsService.settings.notificationsEnabled ? null : Colors.grey, + ), + ), + subtitle: Text( + 'Show notification when new nodes are discovered', + style: TextStyle( + color: settingsService.settings.notificationsEnabled ? null : Colors.grey, + ), + ), + value: settingsService.settings.notifyOnNewAdvert, + onChanged: settingsService.settings.notificationsEnabled + ? (value) { + settingsService.setNotifyOnNewAdvert(value); + } + : null, + ), + ], + ), + ); + } + + Widget _buildMessagingCard(BuildContext context, AppSettingsService settingsService) { + return Card( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const Padding( + padding: EdgeInsets.fromLTRB(16, 16, 16, 8), + child: Text( + 'Messaging', + style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold), + ), + ), + SwitchListTile( + secondary: const Icon(Icons.refresh_outlined), + title: const Text('Clear Path on Max Retry'), + subtitle: const Text('Reset contact path after 5 failed send attempts'), + value: settingsService.settings.clearPathOnMaxRetry, + onChanged: (value) { + settingsService.setClearPathOnMaxRetry(value); + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text(value + ? 'Paths will be cleared after 5 failed retries' + : 'Paths will not be auto-cleared'), + duration: const Duration(seconds: 2), + ), + ); + }, + ), + const Divider(height: 1), + SwitchListTile( + secondary: const Icon(Icons.alt_route), + title: const Text('Auto Route Rotation'), + subtitle: const Text('Cycle between best paths and flood mode'), + value: settingsService.settings.autoRouteRotationEnabled, + onChanged: (value) { + settingsService.setAutoRouteRotationEnabled(value); + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text(value + ? 'Auto route rotation enabled' + : 'Auto route rotation disabled'), + duration: const Duration(seconds: 2), + ), + ); + }, + ), + ], + ), + ); + } + + Widget _buildMapSettingsCard(BuildContext context, AppSettingsService settingsService) { + return Card( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const Padding( + padding: EdgeInsets.fromLTRB(16, 16, 16, 8), + child: Text( + 'Map Display', + style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold), + ), + ), + SwitchListTile( + secondary: const Icon(Icons.router_outlined), + title: const Text('Show Repeaters'), + subtitle: const Text('Display repeater nodes on the map'), + value: settingsService.settings.mapShowRepeaters, + onChanged: (value) { + settingsService.setMapShowRepeaters(value); + }, + ), + const Divider(height: 1), + SwitchListTile( + secondary: const Icon(Icons.chat_outlined), + title: const Text('Show Chat Nodes'), + subtitle: const Text('Display chat nodes on the map'), + value: settingsService.settings.mapShowChatNodes, + onChanged: (value) { + settingsService.setMapShowChatNodes(value); + }, + ), + const Divider(height: 1), + SwitchListTile( + secondary: const Icon(Icons.people_outline), + title: const Text('Show Other Nodes'), + subtitle: const Text('Display other node types on the map'), + value: settingsService.settings.mapShowOtherNodes, + onChanged: (value) { + settingsService.setMapShowOtherNodes(value); + }, + ), + const Divider(height: 1), + ListTile( + leading: const Icon(Icons.timer_outlined), + title: const Text('Time Filter'), + subtitle: Text( + settingsService.settings.mapTimeFilterHours == 0 + ? 'Show all nodes' + : 'Show nodes from last ${settingsService.settings.mapTimeFilterHours.toInt()} hours', + ), + trailing: const Icon(Icons.chevron_right), + onTap: () => _showTimeFilterDialog(context, settingsService), + ), + ], + ), + ); + } + + Widget _buildBatteryCard( + BuildContext context, + AppSettingsService settingsService, + MeshCoreConnector connector, + ) { + final deviceId = connector.device?.remoteId.toString(); + final isConnected = connector.isConnected && deviceId != null; + final selection = + isConnected ? settingsService.batteryChemistryForDevice(deviceId) : 'nmc'; + + return Card( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const Padding( + padding: EdgeInsets.fromLTRB(16, 16, 16, 8), + child: Text( + 'Battery', + style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold), + ), + ), + ListTile( + leading: const Icon(Icons.battery_full), + title: const Text('Battery Chemistry'), + subtitle: Text( + isConnected + ? 'Set per device (${connector.device!.platformName})' + : 'Connect to a device to choose', + ), + trailing: DropdownButton( + value: selection, + onChanged: isConnected + ? (value) { + if (value != null) { + settingsService.setBatteryChemistryForDevice(deviceId, value); + } + } + : null, + items: const [ + DropdownMenuItem( + value: 'nmc', + child: Text('18650 NMC (3.0-4.2V)'), + ), + DropdownMenuItem( + value: 'lifepo4', + child: Text('LiFePO4 (2.6-3.65V)'), + ), + DropdownMenuItem( + value: 'lipo', + child: Text('LiPo (3.0-4.2V)'), + ), + ], + ), + ), + ], + ), + ); + } + + void _showThemeModeDialog(BuildContext context, AppSettingsService settingsService) { + showDialog( + context: context, + builder: (context) => AlertDialog( + title: const Text('Theme'), + content: Column( + mainAxisSize: MainAxisSize.min, + children: [ + RadioListTile( + title: const Text('System default'), + value: 'system', + groupValue: settingsService.settings.themeMode, + onChanged: (value) { + if (value != null) { + settingsService.setThemeMode(value); + Navigator.pop(context); + } + }, + ), + RadioListTile( + title: const Text('Light'), + value: 'light', + groupValue: settingsService.settings.themeMode, + onChanged: (value) { + if (value != null) { + settingsService.setThemeMode(value); + Navigator.pop(context); + } + }, + ), + RadioListTile( + title: const Text('Dark'), + value: 'dark', + groupValue: settingsService.settings.themeMode, + onChanged: (value) { + if (value != null) { + settingsService.setThemeMode(value); + Navigator.pop(context); + } + }, + ), + ], + ), + actions: [ + TextButton( + onPressed: () => Navigator.pop(context), + child: const Text('Close'), + ), + ], + ), + ); + } + + String _themeModeLabel(String value) { + switch (value) { + case 'light': + return 'Light'; + case 'dark': + return 'Dark'; + default: + return 'System default'; + } + } + + void _showTimeFilterDialog(BuildContext context, AppSettingsService settingsService) { + showDialog( + context: context, + builder: (context) => AlertDialog( + title: const Text('Map Time Filter'), + content: Column( + mainAxisSize: MainAxisSize.min, + children: [ + const Text('Show nodes discovered within:'), + const SizedBox(height: 16), + ListTile( + title: const Text('All time'), + leading: Radio( + value: 0, + groupValue: settingsService.settings.mapTimeFilterHours, + onChanged: (value) { + if (value != null) { + settingsService.setMapTimeFilterHours(value); + Navigator.pop(context); + } + }, + ), + ), + ListTile( + title: const Text('Last hour'), + leading: Radio( + value: 1, + groupValue: settingsService.settings.mapTimeFilterHours, + onChanged: (value) { + if (value != null) { + settingsService.setMapTimeFilterHours(value); + Navigator.pop(context); + } + }, + ), + ), + ListTile( + title: const Text('Last 6 hours'), + leading: Radio( + value: 6, + groupValue: settingsService.settings.mapTimeFilterHours, + onChanged: (value) { + if (value != null) { + settingsService.setMapTimeFilterHours(value); + Navigator.pop(context); + } + }, + ), + ), + ListTile( + title: const Text('Last 24 hours'), + leading: Radio( + value: 24, + groupValue: settingsService.settings.mapTimeFilterHours, + onChanged: (value) { + if (value != null) { + settingsService.setMapTimeFilterHours(value); + Navigator.pop(context); + } + }, + ), + ), + ListTile( + title: const Text('Last week'), + leading: Radio( + value: 168, + groupValue: settingsService.settings.mapTimeFilterHours, + onChanged: (value) { + if (value != null) { + settingsService.setMapTimeFilterHours(value); + Navigator.pop(context); + } + }, + ), + ), + ], + ), + actions: [ + TextButton( + onPressed: () => Navigator.pop(context), + child: const Text('Close'), + ), + ], + ), + ); + } +} diff --git a/lib/screens/ble_debug_log_screen.dart b/lib/screens/ble_debug_log_screen.dart new file mode 100644 index 00000000..f7689d2a --- /dev/null +++ b/lib/screens/ble_debug_log_screen.dart @@ -0,0 +1,384 @@ +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; +import 'package:flutter/services.dart'; +import '../services/ble_debug_log_service.dart'; +import '../connector/meshcore_protocol.dart'; + +enum _BleLogView { frames, rawLogRx } + +class BleDebugLogScreen extends StatefulWidget { + const BleDebugLogScreen({super.key}); + + @override + State createState() => _BleDebugLogScreenState(); +} + +class _BleDebugLogScreenState extends State { + _BleLogView _view = _BleLogView.frames; + + @override + Widget build(BuildContext context) { + return Consumer( + builder: (context, logService, _) { + final entries = logService.entries.reversed.toList(); + final rawEntries = logService.rawLogRxEntries.reversed.toList(); + final showingFrames = _view == _BleLogView.frames; + final hasEntries = showingFrames ? entries.isNotEmpty : rawEntries.isNotEmpty; + return Scaffold( + appBar: AppBar( + title: const Text('BLE Debug Log'), + actions: [ + IconButton( + tooltip: 'Copy log', + icon: const Icon(Icons.copy), + onPressed: hasEntries + ? () async { + final text = showingFrames + ? entries + .map((entry) => '${entry.description}\n${entry.hexPreview}\n') + .join('\n') + : rawEntries + .map((entry) => 'RX RAW_LOG_RX_DATA\n${entry.hexPreview}\n') + .join('\n'); + await Clipboard.setData(ClipboardData(text: text)); + if (!context.mounted) return; + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar(content: Text('BLE log copied')), + ); + } + : null, + ), + IconButton( + tooltip: 'Clear log', + icon: const Icon(Icons.delete_outline), + onPressed: hasEntries + ? () { + logService.clear(); + } + : null, + ), + ], + ), + body: Column( + children: [ + Padding( + padding: const EdgeInsets.fromLTRB(16, 12, 16, 0), + child: SegmentedButton<_BleLogView>( + segments: const [ + ButtonSegment(value: _BleLogView.frames, label: Text('Frames')), + ButtonSegment(value: _BleLogView.rawLogRx, label: Text('Raw Log-RX')), + ], + selected: {_view}, + onSelectionChanged: (selection) { + setState(() => _view = selection.first); + }, + ), + ), + const SizedBox(height: 8), + Expanded( + child: hasEntries + ? ListView.separated( + itemCount: showingFrames ? entries.length : rawEntries.length, + separatorBuilder: (_, __) => const Divider(height: 1), + itemBuilder: (context, index) { + if (showingFrames) { + final entry = entries[index]; + final time = + '${entry.timestamp.hour.toString().padLeft(2, '0')}:${entry.timestamp.minute.toString().padLeft(2, '0')}:${entry.timestamp.second.toString().padLeft(2, '0')}'; + return ListTile( + dense: true, + title: Text(entry.description), + subtitle: Text('${entry.hexPreview}\n$time'), + isThreeLine: true, + leading: Icon( + entry.outgoing ? Icons.upload : Icons.download, + size: 18, + ), + ); + } + + final entry = rawEntries[index]; + final info = _decodeRawPacket(entry.payload); + final time = + '${entry.timestamp.hour.toString().padLeft(2, '0')}:${entry.timestamp.minute.toString().padLeft(2, '0')}:${entry.timestamp.second.toString().padLeft(2, '0')}'; + return ListTile( + dense: true, + title: Text(info.title), + subtitle: Text('${info.summary}\n$time'), + isThreeLine: true, + leading: const Icon(Icons.download, size: 18), + onTap: () => _showRawDialog(context, info), + ); + }, + ) + : const Center( + child: Text('No BLE activity yet'), + ), + ), + ], + ), + ); + }, + ); + } + + void _showRawDialog(BuildContext context, _RawPacketInfo info) { + showDialog( + context: context, + builder: (context) => AlertDialog( + title: Text(info.title), + content: SingleChildScrollView( + child: SelectableText(info.rawHex), + ), + actions: [ + TextButton( + onPressed: () => Navigator.pop(context), + child: const Text('Close'), + ), + ], + ), + ); + } + + _RawPacketInfo _decodeRawPacket(Uint8List raw) { + if (raw.length < 2) { + return _RawPacketInfo( + title: 'RX RAW_LOG_RX_DATA • invalid', + summary: 'Packet too short', + rawHex: _bytesToHex(raw), + ); + } + + var index = 0; + final header = raw[index++]; + final routeType = header & 0x03; + final payloadType = (header >> 2) & 0x0F; + final payloadVer = (header >> 6) & 0x03; + final hasTransport = routeType == 0 || routeType == 3; + if (hasTransport) { + if (raw.length < index + 4) { + return _RawPacketInfo( + title: 'RX RAW_LOG_RX_DATA • ${_payloadTypeLabel(payloadType)}', + summary: 'Missing transport codes', + rawHex: _bytesToHex(raw), + ); + } + index += 4; + } + if (raw.length <= index) { + return _RawPacketInfo( + title: 'RX RAW_LOG_RX_DATA • ${_payloadTypeLabel(payloadType)}', + summary: 'Missing path length', + rawHex: _bytesToHex(raw), + ); + } + final pathLen = raw[index++]; + if (raw.length < index + pathLen) { + return _RawPacketInfo( + title: 'RX RAW_LOG_RX_DATA • ${_payloadTypeLabel(payloadType)}', + summary: 'Truncated path', + rawHex: _bytesToHex(raw), + ); + } + final pathBytes = raw.sublist(index, index + pathLen); + index += pathLen; + if (raw.length <= index) { + return _RawPacketInfo( + title: 'RX RAW_LOG_RX_DATA • ${_payloadTypeLabel(payloadType)}', + summary: 'Missing payload', + rawHex: _bytesToHex(raw), + ); + } + final payload = raw.sublist(index); + + final title = 'RX ${_payloadTypeLabel(payloadType)} • ${_routeLabel(routeType)} • v$payloadVer'; + final summary = _decodePayloadSummary(payloadType, payload); + final pathSummary = pathLen > 0 ? 'Path=${_bytesToHex(pathBytes)}' : 'Path=none'; + final detail = '$summary • $pathSummary • len=${raw.length}'; + return _RawPacketInfo(title: title, summary: detail, rawHex: _bytesToHex(raw)); + } + + String _decodePayloadSummary(int payloadType, Uint8List payload) { + switch (payloadType) { + case 0x00: // REQ + return 'REQ payload=${payload.length} bytes'; + case 0x01: // RESP + return 'RESP payload=${payload.length} bytes'; + case 0x02: // TXT + return 'TXT payload=${payload.length} bytes'; + case 0x03: // ACK + if (payload.length < 4) return 'ACK (short)'; + return 'ACK crc=${_bytesToHex(payload.sublist(0, 4))}'; + case 0x04: // ADVERT + return _decodeAdvertSummary(payload); + case 0x05: // GROUP_TXT + if (payload.length < 3) return 'GRP_TXT (short)'; + final channelHash = payload[0].toRadixString(16).padLeft(2, '0'); + final mac = _bytesToHex(payload.sublist(1, 3)); + final cipherLen = payload.length - 3; + return 'GRP_TXT hash=$channelHash mac=$mac cipher=$cipherLen'; + case 0x06: // GROUP_DATA + return 'GRP_DATA payload=${payload.length} bytes'; + case 0x07: // ANON_REQ + return 'ANON_REQ payload=${payload.length} bytes'; + case 0x08: // PATH + return 'PATH payload=${payload.length} bytes'; + case 0x09: // TRACE + return 'TRACE payload=${payload.length} bytes'; + case 0x0A: // MULTIPART + return 'MULTIPART payload=${payload.length} bytes'; + case 0x0B: // CONTROL + return _decodeControlSummary(payload); + case 0x0F: // RAW + return 'RAW payload=${payload.length} bytes'; + default: + return 'TYPE_$payloadType payload=${payload.length} bytes'; + } + } + + String _decodeAdvertSummary(Uint8List payload) { + if (payload.length < 101) { + return 'ADVERT (short)'; + } + var offset = 0; + final pubKey = _bytesToHex(payload.sublist(offset, offset + 32), spaced: false); + offset += 32; + final timestamp = readUint32LE(payload, offset); + offset += 4; + offset += 64; // signature + final flags = payload[offset++]; + final role = _deviceRoleLabel(flags & 0x0F); + final hasLocation = (flags & 0x10) != 0; + final hasFeature1 = (flags & 0x20) != 0; + final hasFeature2 = (flags & 0x40) != 0; + final hasName = (flags & 0x80) != 0; + String? name; + double? lat; + double? lon; + if (hasLocation && payload.length >= offset + 8) { + lat = readInt32LE(payload, offset) / 1000000.0; + lon = readInt32LE(payload, offset + 4) / 1000000.0; + offset += 8; + } + if (hasFeature1) offset += 2; + if (hasFeature2) offset += 2; + if (hasName && payload.length > offset) { + final rawName = String.fromCharCodes(payload.sublist(offset)); + final nul = rawName.indexOf('\u0000'); + name = nul >= 0 ? rawName.substring(0, nul) : rawName; + name = name.trim(); + } + final namePart = (name != null && name.isNotEmpty) ? ' name="$name"' : ''; + final locPart = (lat != null && lon != null) + ? ' loc=${lat.toStringAsFixed(6)},${lon.toStringAsFixed(6)}' + : ''; + return 'ADVERT role=$role ts=$timestamp$namePart$locPart key=${pubKey.substring(0, 12)}…'; + } + + String _decodeControlSummary(Uint8List payload) { + if (payload.isEmpty) return 'CONTROL (empty)'; + final flags = payload[0]; + final subType = flags & 0xF0; + if (subType == 0x80) { + if (payload.length < 6) return 'CONTROL DISCOVER_REQ (short)'; + final typeFilter = payload[1]; + final tag = readUint32LE(payload, 2); + final since = payload.length >= 10 ? readUint32LE(payload, 6) : 0; + return 'CONTROL DISCOVER_REQ filter=0x${typeFilter.toRadixString(16).padLeft(2, '0')} tag=$tag since=$since'; + } + if (subType == 0x90) { + if (payload.length < 14) return 'CONTROL DISCOVER_RESP (short)'; + final nodeType = flags & 0x0F; + final snrRaw = payload[1]; + final snrSigned = snrRaw > 127 ? snrRaw - 256 : snrRaw; + final snr = snrSigned / 4.0; + final tag = readUint32LE(payload, 2); + final keyLen = payload.length - 6; + return 'CONTROL DISCOVER_RESP node=${_deviceRoleLabel(nodeType)} snr=${snr.toStringAsFixed(2)} tag=$tag key=$keyLen'; + } + return 'CONTROL subtype=0x${subType.toRadixString(16).padLeft(2, '0')}'; + } + + String _payloadTypeLabel(int payloadType) { + switch (payloadType) { + case 0x00: + return 'REQ'; + case 0x01: + return 'RESP'; + case 0x02: + return 'TXT'; + case 0x03: + return 'ACK'; + case 0x04: + return 'ADVERT'; + case 0x05: + return 'GRP_TXT'; + case 0x06: + return 'GRP_DATA'; + case 0x07: + return 'ANON_REQ'; + case 0x08: + return 'PATH'; + case 0x09: + return 'TRACE'; + case 0x0A: + return 'MULTIPART'; + case 0x0B: + return 'CONTROL'; + case 0x0F: + return 'RAW'; + default: + return 'TYPE_$payloadType'; + } + } + + String _routeLabel(int routeType) { + switch (routeType) { + case 0: + return 'TRANS_FLOOD'; + case 1: + return 'FLOOD'; + case 2: + return 'DIRECT'; + case 3: + return 'TRANS_DIRECT'; + default: + return 'ROUTE_$routeType'; + } + } + + String _deviceRoleLabel(int role) { + switch (role) { + case 0x01: + return 'Chat'; + case 0x02: + return 'Repeater'; + case 0x03: + return 'Room'; + case 0x04: + return 'Sensor'; + default: + return 'Unknown'; + } + } + + String _bytesToHex(Uint8List bytes, {bool spaced = true}) { + if (bytes.isEmpty) return ''; + if (!spaced) { + return bytes.map((b) => b.toRadixString(16).padLeft(2, '0')).join(); + } + return bytes.map((b) => b.toRadixString(16).padLeft(2, '0')).join(' '); + } +} + +class _RawPacketInfo { + final String title; + final String summary; + final String rawHex; + + _RawPacketInfo({ + required this.title, + required this.summary, + required this.rawHex, + }); +} diff --git a/lib/screens/channel_chat_screen.dart b/lib/screens/channel_chat_screen.dart new file mode 100644 index 00000000..e9b7476d --- /dev/null +++ b/lib/screens/channel_chat_screen.dart @@ -0,0 +1,555 @@ +import 'dart:typed_data'; + +import 'package:flutter/material.dart'; +import 'package:latlong2/latlong.dart'; +import 'package:provider/provider.dart'; + +import '../connector/meshcore_connector.dart'; +import '../models/channel.dart'; +import '../models/channel_message.dart'; +import '../utils/emoji_utils.dart'; +import '../widgets/gif_message.dart'; +import '../widgets/gif_picker.dart'; +import 'map_screen.dart'; + +class ChannelChatScreen extends StatefulWidget { + final Channel channel; + + const ChannelChatScreen({ + super.key, + required this.channel, + }); + + @override + State createState() => _ChannelChatScreenState(); +} + +class _ChannelChatScreenState extends State { + final TextEditingController _textController = TextEditingController(); + final ScrollController _scrollController = ScrollController(); + + @override + void dispose() { + _textController.dispose(); + _scrollController.dispose(); + super.dispose(); + } + + void _scrollToBottom() { + if (_scrollController.hasClients) { + _scrollController.animateTo( + _scrollController.position.maxScrollExtent, + duration: const Duration(milliseconds: 300), + curve: Curves.easeOut, + ); + } + } + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: Row( + children: [ + Icon( + widget.channel.isPublicChannel ? Icons.public : Icons.tag, + size: 20, + ), + const SizedBox(width: 8), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + widget.channel.name.isEmpty + ? 'Channel ${widget.channel.index}' + : widget.channel.name, + style: const TextStyle(fontSize: 16), + ), + Text( + widget.channel.isPublicChannel ? 'Public' : 'Private', + style: const TextStyle(fontSize: 12), + ), + ], + ), + ), + ], + ), + centerTitle: false, + ), + body: Column( + children: [ + Expanded( + child: Consumer( + builder: (context, connector, child) { + final messages = connector.getChannelMessages(widget.channel); + + WidgetsBinding.instance.addPostFrameCallback((_) { + _scrollToBottom(); + }); + + if (messages.isEmpty) { + return Center( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon( + widget.channel.isPublicChannel + ? Icons.public + : Icons.tag, + size: 64, + color: Colors.grey[400], + ), + const SizedBox(height: 16), + Text( + 'No messages yet', + style: TextStyle( + fontSize: 16, + color: Colors.grey[600], + ), + ), + const SizedBox(height: 8), + Text( + 'Send a message to get started', + style: TextStyle( + fontSize: 14, + color: Colors.grey[500], + ), + ), + ], + ), + ); + } + + return ListView.builder( + controller: _scrollController, + padding: const EdgeInsets.all(8), + cacheExtent: 0, + addAutomaticKeepAlives: false, + itemCount: messages.length, + itemBuilder: (context, index) { + final message = messages[index]; + return _buildMessageBubble(message); + }, + ); + }, + ), + ), + _buildMessageComposer(), + ], + ), + ); + } + + Widget _buildMessageBubble(ChannelMessage message) { + final isOutgoing = message.isOutgoing; + final gifId = _parseGifId(message.text); + final poi = _parsePoiMessage(message.text); + + return Padding( + padding: const EdgeInsets.symmetric(vertical: 4, horizontal: 8), + child: Row( + mainAxisAlignment: isOutgoing ? MainAxisAlignment.end : MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + if (!isOutgoing) ...[ + _buildAvatar(message.senderName), + const SizedBox(width: 8), + ], + Flexible( + child: GestureDetector( + onLongPress: () => _showMessagePathInfo(message), + child: Container( + padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8), + constraints: BoxConstraints( + maxWidth: MediaQuery.of(context).size.width * 0.65, + ), + decoration: BoxDecoration( + color: isOutgoing + ? Theme.of(context).colorScheme.primaryContainer + : Theme.of(context).colorScheme.surfaceContainerHighest, + borderRadius: BorderRadius.circular(12), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + if (!isOutgoing) ...[ + Text( + message.senderName, + style: TextStyle( + fontSize: 12, + fontWeight: FontWeight.bold, + color: Theme.of(context).colorScheme.primary, + ), + ), + const SizedBox(height: 4), + ], + if (poi != null) + _buildPoiMessage(context, poi, isOutgoing) + else if (gifId != null) + GifMessage( + url: 'https://media.giphy.com/media/$gifId/giphy.gif', + backgroundColor: Theme.of(context).colorScheme.surfaceContainerHighest, + fallbackTextColor: isOutgoing + ? Theme.of(context).colorScheme.onPrimaryContainer.withValues(alpha: 0.7) + : Theme.of(context).colorScheme.onSurface.withValues(alpha: 0.6), + ) + else + Text( + message.text, + style: const TextStyle(fontSize: 14), + ), + if (message.pathBytes.isNotEmpty) ...[ + const SizedBox(height: 4), + Text( + 'via ${_formatPathPrefixes(message.pathBytes)}', + style: TextStyle(fontSize: 11, color: Colors.grey[600]), + ), + ], + const SizedBox(height: 4), + Row( + mainAxisSize: MainAxisSize.min, + children: [ + Text( + _formatTime(message.timestamp), + style: TextStyle( + fontSize: 11, + color: Colors.grey[600], + ), + ), + if (message.repeatCount > 0) ...[ + const SizedBox(width: 6), + Icon(Icons.repeat, size: 12, color: Colors.grey[600]), + const SizedBox(width: 2), + Text( + '${message.repeatCount}', + style: TextStyle(fontSize: 11, color: Colors.grey[600]), + ), + ], + if (isOutgoing) ...[ + const SizedBox(width: 4), + Icon( + message.status == ChannelMessageStatus.sent + ? Icons.check + : message.status == ChannelMessageStatus.pending + ? Icons.schedule + : Icons.error_outline, + size: 14, + color: message.status == ChannelMessageStatus.failed + ? Colors.red + : Colors.grey[600], + ), + ], + ], + ), + ], + ), + ), + ), + ), + ], + ), + ); + } + + String? _parseGifId(String text) { + final trimmed = text.trim(); + final match = RegExp(r'^g:([A-Za-z0-9_-]+)$').firstMatch(trimmed); + return match?.group(1); + } + + _PoiInfo? _parsePoiMessage(String text) { + final trimmed = text.trim(); + final match = RegExp(r'm:([\-0-9.]+),([\-0-9.]+)\|([^|]*)\|').firstMatch(trimmed); + if (match == null) return null; + final lat = double.tryParse(match.group(1) ?? ''); + final lon = double.tryParse(match.group(2) ?? ''); + if (lat == null || lon == null) return null; + final label = match.group(3) ?? ''; + return _PoiInfo(lat: lat, lon: lon, label: label); + } + + Widget _buildPoiMessage(BuildContext context, _PoiInfo poi, bool isOutgoing) { + final colorScheme = Theme.of(context).colorScheme; + final textColor = + isOutgoing ? colorScheme.onPrimaryContainer : colorScheme.onSurface; + final metaColor = textColor.withValues(alpha: 0.7); + final channelColor = widget.channel.isPublicChannel ? Colors.orange : Colors.blue; + + return Row( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + IconButton( + icon: Icon(Icons.location_on_outlined, color: channelColor), + padding: EdgeInsets.zero, + constraints: const BoxConstraints(minWidth: 32, minHeight: 32), + onPressed: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => MapScreen( + highlightPosition: LatLng(poi.lat, poi.lon), + highlightLabel: poi.label, + ), + ), + ); + }, + ), + const SizedBox(width: 8), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + 'POI Shared', + style: TextStyle( + color: textColor, + fontWeight: FontWeight.w600, + ), + ), + if (poi.label.isNotEmpty) + Text( + poi.label, + style: TextStyle( + color: metaColor, + fontSize: 12, + ), + ), + ], + ), + ), + ], + ); + } + + void _showGifPicker(BuildContext context) { + showModalBottomSheet( + context: context, + isScrollControlled: true, + builder: (context) => GifPicker( + onGifSelected: (gifId) { + _textController.text = 'g:$gifId'; + }, + ), + ); + } + + Widget _buildAvatar(String senderName) { + final initial = _getFirstCharacterOrEmoji(senderName); + final color = _getColorForName(senderName); + + return CircleAvatar( + radius: 18, + backgroundColor: color.withValues(alpha: 0.2), + child: Text( + initial, + style: TextStyle( + fontSize: 14, + fontWeight: FontWeight.bold, + color: color, + ), + ), + ); + } + + String _getFirstCharacterOrEmoji(String name) { + if (name.isEmpty) return '?'; + + final emoji = firstEmoji(name); + if (emoji != null) return emoji; + + final runes = name.runes.toList(); + if (runes.isEmpty) return '?'; + return String.fromCharCode(runes[0]).toUpperCase(); + } + + Color _getColorForName(String name) { + // Generate a consistent color based on the name hash + final hash = name.hashCode; + final colors = [ + Colors.blue, + Colors.green, + Colors.orange, + Colors.purple, + Colors.pink, + Colors.teal, + Colors.indigo, + Colors.cyan, + Colors.amber, + Colors.deepOrange, + ]; + + return colors[hash.abs() % colors.length]; + } + + Widget _buildMessageComposer() { + return Container( + padding: const EdgeInsets.all(8), + decoration: BoxDecoration( + color: Theme.of(context).colorScheme.surface, + boxShadow: [ + BoxShadow( + color: Colors.black.withValues(alpha: 0.1), + blurRadius: 4, + offset: const Offset(0, -2), + ), + ], + ), + child: Row( + children: [ + IconButton( + icon: const Icon(Icons.gif_box), + onPressed: () => _showGifPicker(context), + tooltip: 'Send GIF', + ), + Expanded( + child: ValueListenableBuilder( + valueListenable: _textController, + builder: (context, value, child) { + final gifId = _parseGifId(value.text); + if (gifId != null) { + return Row( + children: [ + Expanded( + child: GifMessage( + url: 'https://media.giphy.com/media/$gifId/giphy.gif', + backgroundColor: + Theme.of(context).colorScheme.surfaceContainerHighest, + fallbackTextColor: + Theme.of(context).colorScheme.onSurface.withValues(alpha: 0.6), + width: 160, + height: 110, + ), + ), + const SizedBox(width: 8), + IconButton( + icon: const Icon(Icons.close), + onPressed: () => _textController.clear(), + ), + ], + ); + } + + return TextField( + controller: _textController, + decoration: InputDecoration( + hintText: 'Type a message...', + border: OutlineInputBorder( + borderRadius: BorderRadius.circular(24), + ), + contentPadding: const EdgeInsets.symmetric( + horizontal: 16, + vertical: 8, + ), + ), + maxLines: null, + textInputAction: TextInputAction.send, + onSubmitted: (_) => _sendMessage(), + ); + }, + ), + ), + const SizedBox(width: 8), + IconButton( + icon: const Icon(Icons.send), + onPressed: _sendMessage, + color: Theme.of(context).colorScheme.primary, + ), + ], + ), + ); + } + + void _sendMessage() { + final text = _textController.text.trim(); + if (text.isEmpty) return; + + context.read().sendChannelMessage(widget.channel, text); + _textController.clear(); + } + + String _formatTime(DateTime time) { + final now = DateTime.now(); + final diff = now.difference(time); + + if (diff.inDays > 0) { + return '${time.day}/${time.month} ${time.hour}:${time.minute.toString().padLeft(2, '0')}'; + } else { + return '${time.hour}:${time.minute.toString().padLeft(2, '0')}'; + } + } + + void _showMessagePathInfo(ChannelMessage message) { + final pathPrefixes = + message.pathBytes.isNotEmpty ? _formatPathPrefixes(message.pathBytes) : null; + showDialog( + context: context, + builder: (context) => AlertDialog( + title: const Text('Packet Path'), + content: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + _buildDetailRow('Sender', message.senderName), + _buildDetailRow('Time', _formatTime(message.timestamp)), + _buildDetailRow('Repeats', message.repeatCount.toString()), + _buildDetailRow('Path', _formatPathLabel(message.pathLength)), + if (pathPrefixes != null) _buildDetailRow('Prefixes', pathPrefixes), + if (pathPrefixes == null) ...[ + const SizedBox(height: 8), + const Text( + 'Hop details are not provided for this packet.', + style: TextStyle(fontSize: 11, color: Colors.grey), + ), + ], + ], + ), + actions: [ + TextButton( + onPressed: () => Navigator.pop(context), + child: const Text('Close'), + ), + ], + ), + ); + } + + String _formatPathLabel(int? pathLength) { + if (pathLength == null) return 'Unknown'; + if (pathLength < 0) return 'Flood'; + if (pathLength == 0) return 'Direct'; + return '$pathLength hops'; + } + + String _formatPathPrefixes(Uint8List pathBytes) { + return pathBytes.map((b) => b.toRadixString(16).padLeft(2, '0')).join(','); + } + + Widget _buildDetailRow(String label, String value) { + return Padding( + padding: const EdgeInsets.symmetric(vertical: 2), + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox( + width: 70, + child: Text(label, style: TextStyle(color: Colors.grey[600])), + ), + Expanded(child: Text(value)), + ], + ), + ); + } +} + +class _PoiInfo { + final double lat; + final double lon; + final String label; + + const _PoiInfo({ + required this.lat, + required this.lon, + required this.label, + }); +} diff --git a/lib/screens/channels_screen.dart b/lib/screens/channels_screen.dart new file mode 100644 index 00000000..fe5e061c --- /dev/null +++ b/lib/screens/channels_screen.dart @@ -0,0 +1,439 @@ +import 'dart:convert'; +import 'dart:math'; +import 'dart:typed_data'; + +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +import '../connector/meshcore_connector.dart'; +import '../models/channel.dart'; +import 'channel_chat_screen.dart'; + +class ChannelsScreen extends StatefulWidget { + const ChannelsScreen({super.key}); + + @override + State createState() => _ChannelsScreenState(); +} + +class _ChannelsScreenState extends State { + @override + void initState() { + super.initState(); + WidgetsBinding.instance.addPostFrameCallback((_) { + context.read().getChannels(); + }); + } + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: const Text('Channels'), + centerTitle: true, + actions: [ + IconButton( + icon: const Icon(Icons.refresh), + onPressed: () => context.read().getChannels(), + ), + ], + ), + body: Consumer( + builder: (context, connector, child) { + if (connector.isLoadingChannels) { + return const Center(child: CircularProgressIndicator()); + } + + final channels = connector.channels; + + if (channels.isEmpty) { + return Center( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon(Icons.tag, size: 64, color: Colors.grey[400]), + const SizedBox(height: 16), + Text( + 'No channels configured', + style: TextStyle(fontSize: 16, color: Colors.grey[600]), + ), + const SizedBox(height: 24), + FilledButton.icon( + onPressed: () => _addPublicChannel(context, connector), + icon: const Icon(Icons.public), + label: const Text('Add Public Channel'), + ), + ], + ), + ); + } + + return ReorderableListView.builder( + padding: const EdgeInsets.all(8), + itemCount: channels.length, + onReorder: (oldIndex, newIndex) async { + if (newIndex > oldIndex) newIndex -= 1; + final reordered = List.from(channels); + final item = reordered.removeAt(oldIndex); + reordered.insert(newIndex, item); + await connector.setChannelOrder( + reordered.map((c) => c.index).toList(), + ); + }, + itemBuilder: (context, index) { + final channel = channels[index]; + return _buildChannelTile(context, connector, channel); + }, + ); + }, + ), + floatingActionButton: FloatingActionButton( + onPressed: () => _showAddChannelDialog(context), + child: const Icon(Icons.add), + ), + ); + } + + Widget _buildChannelTile( + BuildContext context, + MeshCoreConnector connector, + Channel channel, + ) { + return Card( + key: ValueKey('channel_${channel.index}'), + child: ListTile( + leading: CircleAvatar( + backgroundColor: channel.isPublicChannel + ? Colors.green.withValues(alpha: 0.2) + : Colors.blue.withValues(alpha: 0.2), + child: Icon( + channel.isPublicChannel + ? Icons.public + : channel.name.startsWith('#') + ? Icons.tag + : Icons.lock, + color: channel.isPublicChannel ? Colors.green : Colors.blue, + ), + ), + title: Text( + channel.name.isEmpty ? 'Channel ${channel.index}' : channel.name, + style: const TextStyle(fontWeight: FontWeight.w500), + ), + subtitle: Text( + channel.name.startsWith('#') + ? 'Hashtag channel' + : channel.isPublicChannel + ? 'Public channel' + : 'Private channel', + ), + trailing: Row( + mainAxisSize: MainAxisSize.min, + children: [ + IconButton( + icon: const Icon(Icons.edit_outlined), + onPressed: () => _showEditChannelDialog(context, connector, channel), + ), + PopupMenuButton( + onSelected: (value) { + if (value == 'delete') { + _confirmDeleteChannel(context, connector, channel); + } + }, + itemBuilder: (context) => [ + const PopupMenuItem( + value: 'delete', + child: Text('Delete'), + ), + ], + ), + ], + ), + onTap: () => Navigator.push( + context, + MaterialPageRoute( + builder: (context) => ChannelChatScreen(channel: channel), + ), + ), + ), + ); + } + + void _showAddChannelDialog(BuildContext context) { + final connector = context.read(); + final nameController = TextEditingController(); + final pskController = TextEditingController(); + final maxChannels = connector.maxChannels; + int selectedIndex = _findNextAvailableIndex(connector.channels, maxChannels); + bool usePublicPsk = false; + + showDialog( + context: context, + builder: (context) => StatefulBuilder( + builder: (context, setDialogState) => AlertDialog( + title: const Text('Add Channel'), + content: SingleChildScrollView( + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + DropdownButtonFormField( + initialValue: selectedIndex, + decoration: const InputDecoration( + labelText: 'Channel Index', + border: OutlineInputBorder(), + ), + items: List.generate(maxChannels, (i) => i) + .map((i) => DropdownMenuItem( + value: i, + child: Text('Channel $i'), + )) + .toList(), + onChanged: (value) { + if (value != null) { + setDialogState(() => selectedIndex = value); + } + }, + ), + const SizedBox(height: 16), + TextField( + controller: nameController, + decoration: const InputDecoration( + labelText: 'Channel Name', + border: OutlineInputBorder(), + ), + maxLength: 31, + ), + const SizedBox(height: 8), + CheckboxListTile( + title: const Text('Use Public Channel'), + subtitle: const Text('Standard public PSK'), + value: usePublicPsk, + onChanged: (value) { + setDialogState(() { + usePublicPsk = value ?? false; + if (usePublicPsk) { + nameController.text = 'Public'; + pskController.text = Channel.publicChannelPsk; + } else { + pskController.clear(); + } + }); + }, + ), + if (!usePublicPsk) ...[ + const SizedBox(height: 8), + TextField( + controller: pskController, + decoration: InputDecoration( + labelText: 'PSK (Base64)', + border: const OutlineInputBorder(), + suffixIcon: IconButton( + icon: const Icon(Icons.casino), + tooltip: 'Generate random PSK', + onPressed: () { + final random = Random.secure(); + final bytes = Uint8List(16); + for (int i = 0; i < 16; i++) { + bytes[i] = random.nextInt(256); + } + pskController.text = base64Encode(bytes); + }, + ), + ), + ), + ], + ], + ), + ), + actions: [ + TextButton( + onPressed: () => Navigator.pop(context), + child: const Text('Cancel'), + ), + FilledButton( + onPressed: () { + final name = nameController.text.trim(); + final pskBase64 = usePublicPsk + ? Channel.publicChannelPsk + : pskController.text.trim(); + + if (name.isEmpty) { + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar(content: Text('Please enter a channel name')), + ); + return; + } + + Uint8List psk; + try { + final decoded = base64Decode(pskBase64); + psk = Uint8List(16); + for (int i = 0; i < decoded.length && i < 16; i++) { + psk[i] = decoded[i]; + } + } catch (e) { + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar(content: Text('Invalid PSK format')), + ); + return; + } + + Navigator.pop(context); + connector.setChannel(selectedIndex, name, psk); + ScaffoldMessenger.of(context).showSnackBar( + SnackBar(content: Text('Channel "$name" added')), + ); + }, + child: const Text('Add'), + ), + ], + ), + ), + ); + } + + void _showEditChannelDialog( + BuildContext context, + MeshCoreConnector connector, + Channel channel, + ) { + final nameController = TextEditingController(text: channel.name); + final pskController = TextEditingController(text: channel.pskBase64); + bool smazEnabled = connector.isChannelSmazEnabled(channel.index); + + showDialog( + context: context, + builder: (context) => StatefulBuilder( + builder: (context, setState) => AlertDialog( + title: Text('Edit Channel ${channel.index}'), + content: SingleChildScrollView( + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + TextField( + controller: nameController, + decoration: const InputDecoration( + labelText: 'Channel Name', + border: OutlineInputBorder(), + ), + maxLength: 31, + ), + const SizedBox(height: 16), + TextField( + controller: pskController, + decoration: InputDecoration( + labelText: 'PSK (Base64)', + border: const OutlineInputBorder(), + suffixIcon: IconButton( + icon: const Icon(Icons.casino), + tooltip: 'Generate random PSK', + onPressed: () { + final random = Random.secure(); + final bytes = Uint8List(16); + for (int i = 0; i < 16; i++) { + bytes[i] = random.nextInt(256); + } + pskController.text = base64Encode(bytes); + }, + ), + ), + ), + const SizedBox(height: 16), + SwitchListTile( + contentPadding: EdgeInsets.zero, + title: const Text('SMAZ compression'), + value: smazEnabled, + onChanged: (value) => setState(() => smazEnabled = value), + ), + ], + ), + ), + actions: [ + TextButton( + onPressed: () => Navigator.pop(context), + child: const Text('Cancel'), + ), + FilledButton( + onPressed: () { + final name = nameController.text.trim(); + final pskBase64 = pskController.text.trim(); + + Uint8List psk; + try { + final decoded = base64Decode(pskBase64); + psk = Uint8List(16); + for (int i = 0; i < decoded.length && i < 16; i++) { + psk[i] = decoded[i]; + } + } catch (e) { + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar(content: Text('Invalid PSK format')), + ); + return; + } + + Navigator.pop(context); + connector.setChannel(channel.index, name, psk); + connector.setChannelSmazEnabled(channel.index, smazEnabled); + ScaffoldMessenger.of(context).showSnackBar( + SnackBar(content: Text('Channel "$name" updated')), + ); + }, + child: const Text('Save'), + ), + ], + ), + ), + ); + } + + void _confirmDeleteChannel( + BuildContext context, + MeshCoreConnector connector, + Channel channel, + ) { + showDialog( + context: context, + builder: (context) => AlertDialog( + title: const Text('Delete Channel'), + content: Text('Delete "${channel.name}"? This cannot be undone.'), + actions: [ + TextButton( + onPressed: () => Navigator.pop(context), + child: const Text('Cancel'), + ), + TextButton( + onPressed: () { + Navigator.pop(context); + connector.deleteChannel(channel.index); + ScaffoldMessenger.of(context).showSnackBar( + SnackBar(content: Text('Channel "${channel.name}" deleted')), + ); + }, + child: const Text('Delete', style: TextStyle(color: Colors.red)), + ), + ], + ), + ); + } + + void _addPublicChannel(BuildContext context, MeshCoreConnector connector) { + final psk = Uint8List(16); + final decoded = base64Decode(Channel.publicChannelPsk); + for (int i = 0; i < decoded.length && i < 16; i++) { + psk[i] = decoded[i]; + } + connector.setChannel(0, 'Public', psk); + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar(content: Text('Public channel added')), + ); + } + + int _findNextAvailableIndex(List channels, int maxChannels) { + final usedIndices = channels.map((c) => c.index).toSet(); + for (int i = 0; i < maxChannels; i++) { + if (!usedIndices.contains(i)) return i; + } + return 0; + } +} diff --git a/lib/screens/chat_screen.dart b/lib/screens/chat_screen.dart new file mode 100644 index 00000000..8dfddb88 --- /dev/null +++ b/lib/screens/chat_screen.dart @@ -0,0 +1,1272 @@ +import 'dart:typed_data'; + +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; +import 'package:latlong2/latlong.dart'; + +import '../connector/meshcore_connector.dart'; +import '../models/contact.dart'; +import '../models/message.dart'; +import '../services/path_history_service.dart'; +import 'map_screen.dart'; +import '../utils/emoji_utils.dart'; +import '../widgets/gif_message.dart'; +import '../widgets/gif_picker.dart'; + +class ChatScreen extends StatefulWidget { + final Contact contact; + + const ChatScreen({super.key, required this.contact}); + + @override + State createState() => _ChatScreenState(); +} + +class _ChatScreenState extends State { + final _textController = TextEditingController(); + final _scrollController = ScrollController(); + bool _forceFlood = false; + + @override + void dispose() { + _textController.dispose(); + _scrollController.dispose(); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: Consumer2( + builder: (context, pathService, connector, _) { + final paths = pathService.getRecentPaths(widget.contact.publicKeyHex); + final contact = _resolveContact(connector); + final showRecentPath = paths.isNotEmpty && contact.pathLength >= 0; + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Text(contact.name), + if (showRecentPath) + GestureDetector( + behavior: HitTestBehavior.opaque, + onLongPress: () => _showFullPathDialog(context, paths.first.pathBytes), + child: Text( + paths.first.displayText, + style: const TextStyle(fontSize: 11, fontWeight: FontWeight.normal), + ), + ) + else if (contact.pathLength >= 0) + Text( + '${contact.pathLength} ${contact.pathLength == 1 ? 'hop' : 'hops'}', + style: const TextStyle(fontSize: 11, fontWeight: FontWeight.normal), + ) + else + const Text( + 'No path', + style: TextStyle(fontSize: 11, fontWeight: FontWeight.normal), + ), + ], + ); + }, + ), + centerTitle: false, + actions: [ + PopupMenuButton( + icon: Icon(_forceFlood ? Icons.waves : Icons.route), + tooltip: 'Routing mode', + onSelected: (mode) { + setState(() { + _forceFlood = (mode == 'flood'); + }); + }, + itemBuilder: (context) => [ + PopupMenuItem( + value: 'auto', + child: Row( + children: [ + Icon(Icons.auto_mode, size: 20, color: !_forceFlood ? Theme.of(context).primaryColor : null), + const SizedBox(width: 8), + Text( + 'Auto (use saved path)', + style: TextStyle( + fontWeight: !_forceFlood ? FontWeight.bold : FontWeight.normal, + ), + ), + ], + ), + ), + PopupMenuItem( + value: 'flood', + child: Row( + children: [ + Icon(Icons.waves, size: 20, color: _forceFlood ? Theme.of(context).primaryColor : null), + const SizedBox(width: 8), + Text( + 'Force Flood Mode', + style: TextStyle( + fontWeight: _forceFlood ? FontWeight.bold : FontWeight.normal, + ), + ), + ], + ), + ), + ], + ), + IconButton( + icon: const Icon(Icons.timeline), + tooltip: 'Path management', + onPressed: () => _showPathHistory(context), + ), + IconButton( + icon: const Icon(Icons.info_outline), + onPressed: () => _showContactInfo(context), + ), + ], + ), + body: Consumer( + builder: (context, connector, child) { + final messages = connector.getMessages(widget.contact); + + return Column( + children: [ + Expanded( + child: messages.isEmpty + ? _buildEmptyState() + : _buildMessageList(messages), + ), + _buildInputBar(connector), + ], + ); + }, + ), + ); + } + + Widget _buildEmptyState() { + return Center( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon(Icons.chat_bubble_outline, size: 64, color: Colors.grey[400]), + const SizedBox(height: 16), + Text( + 'No messages yet', + style: TextStyle(fontSize: 16, color: Colors.grey[600]), + ), + const SizedBox(height: 8), + Text( + 'Send a message to ${widget.contact.name}', + style: TextStyle(fontSize: 14, color: Colors.grey[500]), + ), + ], + ), + ); + } + + Widget _buildMessageList(List messages) { + return ListView.builder( + controller: _scrollController, + padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 16), + cacheExtent: 0, + addAutomaticKeepAlives: false, + itemCount: messages.length, + itemBuilder: (context, index) { + final message = messages[index]; + return _MessageBubble( + message: message, + senderName: widget.contact.name, + onLongPress: message.isOutgoing && message.status == MessageStatus.failed + ? () => _showMessageRetry(context, message) + : null, + ); + }, + ); + } + + Widget _buildInputBar(MeshCoreConnector connector) { + return Container( + padding: const EdgeInsets.all(8), + decoration: BoxDecoration( + color: Theme.of(context).colorScheme.surface, + border: Border( + top: BorderSide(color: Theme.of(context).dividerColor), + ), + ), + child: SafeArea( + child: Row( + children: [ + IconButton( + icon: const Icon(Icons.gif_box), + onPressed: () => _showGifPicker(context), + tooltip: 'Send GIF', + ), + Expanded( + child: ValueListenableBuilder( + valueListenable: _textController, + builder: (context, value, child) { + final gifId = _parseGifId(value.text); + if (gifId != null) { + return Row( + children: [ + Expanded( + child: GifMessage( + url: 'https://media.giphy.com/media/$gifId/giphy.gif', + backgroundColor: Theme.of(context).colorScheme.surfaceContainerHighest, + fallbackTextColor: + Theme.of(context).colorScheme.onSurface.withValues(alpha: 0.6), + width: 160, + height: 110, + ), + ), + const SizedBox(width: 8), + IconButton( + icon: const Icon(Icons.close), + onPressed: () => _textController.clear(), + ), + ], + ); + } + + return TextField( + controller: _textController, + decoration: const InputDecoration( + hintText: 'Type a message...', + border: OutlineInputBorder(), + contentPadding: EdgeInsets.symmetric(horizontal: 16, vertical: 12), + ), + textInputAction: TextInputAction.send, + onSubmitted: (_) => _sendMessage(connector), + ); + }, + ), + ), + const SizedBox(width: 8), + IconButton.filled( + icon: const Icon(Icons.send), + onPressed: () => _sendMessage(connector), + ), + ], + ), + ), + ); + } + + String? _parseGifId(String text) { + final trimmed = text.trim(); + final match = RegExp(r'^g:([A-Za-z0-9_-]+)$').firstMatch(trimmed); + return match?.group(1); + } + + void _showGifPicker(BuildContext context) { + showModalBottomSheet( + context: context, + isScrollControlled: true, + builder: (context) => GifPicker( + onGifSelected: (gifId) { + _textController.text = 'g:$gifId'; + }, + ), + ); + } + + void _sendMessage(MeshCoreConnector connector) { + final text = _textController.text.trim(); + if (text.isEmpty) return; + + connector.sendMessage( + widget.contact, + text, + forceFlood: _forceFlood, + ); + _textController.clear(); + + Future.delayed(const Duration(milliseconds: 100), () { + if (_scrollController.hasClients) { + _scrollController.animateTo( + _scrollController.position.maxScrollExtent, + duration: const Duration(milliseconds: 200), + curve: Curves.easeOut, + ); + } + }); + } + + void _showPathHistory(BuildContext context) { + final connector = Provider.of(context, listen: false); + + showDialog( + context: context, + builder: (context) => Consumer( + builder: (context, pathService, _) { + final paths = pathService.getRecentPaths(widget.contact.publicKeyHex); + return AlertDialog( + title: const Row( + children: [ + Icon(Icons.timeline), + SizedBox(width: 8), + Text('Path Management'), + ], + ), + content: SingleChildScrollView( + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + if (paths.isNotEmpty) ...[ + const Text( + 'Recent ACK Paths (tap to use):', + style: TextStyle(fontWeight: FontWeight.bold, fontSize: 12), + ), + if (paths.length >= 100) ...[ + const SizedBox(height: 8), + Container( + width: double.infinity, + padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8), + decoration: BoxDecoration( + color: Colors.amber[100], + borderRadius: BorderRadius.circular(8), + ), + child: const Text( + 'Path history is full. Remove entries to add new ones.', + style: TextStyle(fontSize: 12), + ), + ), + ], + const SizedBox(height: 8), + ...paths.map((path) { + return Card( + margin: const EdgeInsets.symmetric(vertical: 4), + child: ListTile( + dense: true, + leading: CircleAvatar( + radius: 16, + backgroundColor: path.wasFloodDiscovery ? Colors.blue : Colors.green, + child: Text( + '${path.hopCount}', + style: const TextStyle(fontSize: 12), + ), + ), + title: Text( + '${path.hopCount} ${path.hopCount == 1 ? 'hop' : 'hops'}', + style: const TextStyle(fontSize: 14), + ), + subtitle: Text( + '${(path.tripTimeMs / 1000).toStringAsFixed(2)}s • ${_formatRelativeTime(path.timestamp)} • ${path.successCount} successes', + style: const TextStyle(fontSize: 11), + ), + trailing: Row( + mainAxisSize: MainAxisSize.min, + children: [ + IconButton( + icon: const Icon(Icons.close, size: 16), + tooltip: 'Remove path', + onPressed: () async { + await pathService.removePathRecord( + widget.contact.publicKeyHex, + path.pathBytes, + ); + }, + ), + path.wasFloodDiscovery + ? const Icon(Icons.waves, size: 16, color: Colors.grey) + : const Icon(Icons.route, size: 16, color: Colors.grey), + ], + ), + onLongPress: () => _showFullPathDialog(context, path.pathBytes), + onTap: () async { + if (path.pathBytes.isEmpty) { + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar( + content: Text('Path details not available yet. Try sending a message to refresh.'), + duration: Duration(seconds: 2), + ), + ); + return; + } + + await connector.setContactPath( + widget.contact, + Uint8List.fromList(path.pathBytes), + path.pathBytes.length, + ); + + if (!context.mounted) return; + setState(() { + _forceFlood = false; + }); + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text('Using ${path.hopCount} ${path.hopCount == 1 ? 'hop' : 'hops'} path'), + duration: const Duration(seconds: 2), + ), + ); + Navigator.pop(context); + }, + ), + ); + }), + const Divider(), + ] else ...[ + const Text('No path history yet.\nSend a message to discover paths.'), + const Divider(), + ], + const SizedBox(height: 8), + const Text( + 'Path Actions:', + style: TextStyle(fontWeight: FontWeight.bold, fontSize: 12), + ), + const SizedBox(height: 8), + ListTile( + dense: true, + leading: const CircleAvatar( + radius: 16, + backgroundColor: Colors.purple, + child: Icon(Icons.edit_road, size: 16), + ), + title: const Text('Set Custom Path', style: TextStyle(fontSize: 14)), + subtitle: const Text('Manually specify routing path', style: TextStyle(fontSize: 11)), + onTap: () { + Navigator.pop(context); + _showCustomPathDialog(context); + }, + ), + ListTile( + dense: true, + leading: const CircleAvatar( + radius: 16, + backgroundColor: Colors.orange, + child: Icon(Icons.clear_all, size: 16), + ), + title: const Text('Clear Path', style: TextStyle(fontSize: 14)), + subtitle: const Text('Force rediscovery on next send', style: TextStyle(fontSize: 11)), + onTap: () async { + await connector.clearContactPath(widget.contact); + if (!context.mounted) return; + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar( + content: Text('Path cleared. Next message will rediscover route.'), + duration: Duration(seconds: 2), + ), + ); + Navigator.pop(context); + }, + ), + ListTile( + dense: true, + leading: const CircleAvatar( + radius: 16, + backgroundColor: Colors.blue, + child: Icon(Icons.waves, size: 16), + ), + title: const Text('Force Flood Mode', style: TextStyle(fontSize: 14)), + subtitle: const Text('Use routing toggle in app bar', style: TextStyle(fontSize: 11)), + onTap: () { + setState(() { + _forceFlood = true; + }); + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar( + content: Text('Flood mode enabled. Toggle back via routing icon in app bar.'), + duration: Duration(seconds: 2), + ), + ); + Navigator.pop(context); + }, + ), + ], + ), + ), + actions: [ + TextButton( + onPressed: () => Navigator.pop(context), + child: const Text('Close'), + ), + ], + ); + }, + ), + ); + } + + String _formatRelativeTime(DateTime time) { + final diff = DateTime.now().difference(time); + if (diff.inSeconds < 60) return 'Just now'; + if (diff.inMinutes < 60) return '${diff.inMinutes}m ago'; + if (diff.inHours < 24) return '${diff.inHours}h ago'; + return '${diff.inDays}d ago'; + } + + void _showFullPathDialog(BuildContext context, List pathBytes) { + if (pathBytes.isEmpty) { + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar( + content: Text('Path details not available yet. Try sending a message to refresh.'), + duration: Duration(seconds: 2), + ), + ); + return; + } + + final formattedPath = pathBytes + .map((b) => b.toRadixString(16).padLeft(2, '0').toUpperCase()) + .join(','); + + showDialog( + context: context, + builder: (context) => AlertDialog( + title: const Text('Full Path'), + content: SelectableText(formattedPath), + actions: [ + TextButton( + onPressed: () => Navigator.pop(context), + child: const Text('Close'), + ), + ], + ), + ); + } + + Contact _resolveContact(MeshCoreConnector connector) { + return connector.contacts.firstWhere( + (c) => c.publicKeyHex == widget.contact.publicKeyHex, + orElse: () => widget.contact, + ); + } + + String _currentPathLabel(Contact contact) { + if (contact.pathLength < 0) return 'Flood (auto)'; + if (contact.pathLength == 0) return 'Direct'; + if (contact.pathIdList.isNotEmpty) return contact.pathIdList; + return '${contact.pathLength} hops'; + } + + void _showContactInfo(BuildContext context) { + showDialog( + context: context, + builder: (context) => AlertDialog( + title: Text(widget.contact.name), + content: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + _buildInfoRow('Type', widget.contact.typeLabel), + _buildInfoRow('Path', widget.contact.pathLabel), + if (widget.contact.hasLocation) + _buildInfoRow( + 'Location', + '${widget.contact.latitude?.toStringAsFixed(4)}, ${widget.contact.longitude?.toStringAsFixed(4)}', + ), + _buildInfoRow('Public Key', widget.contact.publicKeyHex.substring(0, 16) + '...'), + ], + ), + actions: [ + TextButton( + onPressed: () => Navigator.pop(context), + child: const Text('Close'), + ), + ], + ), + ); + } + + Widget _buildInfoRow(String label, String value) { + return Padding( + padding: const EdgeInsets.symmetric(vertical: 4), + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox( + width: 80, + child: Text(label, style: TextStyle(color: Colors.grey[600])), + ), + Expanded(child: Text(value)), + ], + ), + ); + } + + void _showCustomPathDialog(BuildContext context) { + final connector = Provider.of(context, listen: false); + + final currentContact = _resolveContact(connector); + if (currentContact.pathLength > 0 && currentContact.path.isEmpty && connector.isConnected) { + connector.getContacts(); + } + + showDialog( + context: context, + builder: (context) => AlertDialog( + title: const Row( + children: [ + Icon(Icons.edit_road), + SizedBox(width: 8), + Text('Set Custom Path'), + ], + ), + content: Consumer( + builder: (context, connector, _) { + final contact = _resolveContact(connector); + final pathForInput = contact.pathIdList; + final currentPathLabel = _currentPathLabel(contact); + + return Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + const Text( + 'Current path', + style: TextStyle(fontSize: 12, fontWeight: FontWeight.bold), + ), + const Spacer(), + TextButton.icon( + onPressed: connector.isConnected ? connector.getContacts : null, + icon: const Icon(Icons.refresh, size: 16), + label: const Text('Reload'), + ), + ], + ), + Text( + currentPathLabel, + style: const TextStyle(fontSize: 11, color: Colors.grey), + ), + const SizedBox(height: 16), + const Text( + 'Choose how to set the message path:', + style: TextStyle(fontSize: 14), + ), + const SizedBox(height: 16), + ListTile( + dense: true, + leading: const CircleAvatar( + radius: 16, + backgroundColor: Colors.blue, + child: Icon(Icons.text_fields, size: 16), + ), + title: const Text('Enter Path Manually', style: TextStyle(fontSize: 14)), + subtitle: const Text('Type IDs like: A1B2C3D4,FFEEDDCC', style: TextStyle(fontSize: 11)), + onTap: () { + Navigator.pop(context); + _showManualPathInput( + context, + initialPath: pathForInput.isEmpty ? null : pathForInput, + ); + }, + ), + const SizedBox(height: 8), + ListTile( + dense: true, + leading: const CircleAvatar( + radius: 16, + backgroundColor: Colors.green, + child: Icon(Icons.contacts, size: 16), + ), + title: const Text('Select from Contacts', style: TextStyle(fontSize: 14)), + subtitle: const Text('Pick repeaters/rooms as hops', style: TextStyle(fontSize: 11)), + onTap: () { + Navigator.pop(context); + _showContactPathPicker(context); + }, + ), + ], + ); + }, + ), + actions: [ + TextButton( + onPressed: () => Navigator.pop(context), + child: const Text('Cancel'), + ), + ], + ), + ); + } + + void _showManualPathInput(BuildContext context, {String? initialPath}) { + final connector = Provider.of(context, listen: false); + final controller = TextEditingController(text: initialPath ?? ''); + + showDialog( + context: context, + builder: (context) => AlertDialog( + title: const Text('Enter Custom Path'), + content: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const Text( + 'Enter node IDs separated by commas.', + style: TextStyle(fontSize: 12, color: Colors.grey), + ), + const SizedBox(height: 8), + const Text( + 'Example: A1B2C3D4,FFEEDDCC', + style: TextStyle(fontSize: 11, color: Colors.grey), + ), + const SizedBox(height: 16), + TextField( + controller: controller, + decoration: const InputDecoration( + labelText: 'Path', + hintText: 'A1,A2,A3', + border: OutlineInputBorder(), + helperText: 'Node identifiers from your mesh network', + ), + textCapitalization: TextCapitalization.characters, + ), + ], + ), + actions: [ + TextButton( + onPressed: () => Navigator.pop(context), + child: const Text('Cancel'), + ), + TextButton( + onPressed: () async { + final path = controller.text.trim(); + if (path.isNotEmpty) { + // Parse comma-separated hex strings and convert to bytes + final pathIds = path.split(',').map((s) => s.trim()).where((s) => s.isNotEmpty).toList(); + final pathBytesList = []; + + for (final id in pathIds) { + if (id.length >= 2) { + try { + pathBytesList.add(int.parse(id.substring(0, 2), radix: 16)); + } catch (e) { + // Skip invalid hex + } + } + } + + if (pathBytesList.isNotEmpty) { + await connector.setContactPath( + widget.contact, + Uint8List.fromList(pathBytesList), + pathBytesList.length, + ); + + if (context.mounted) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text('Custom path set: $path'), + duration: const Duration(seconds: 2), + ), + ); + } + } + } + if (context.mounted) { + Navigator.pop(context); + } + }, + child: const Text('Set Path'), + ), + ], + ), + ); + } + + void _showContactPathPicker(BuildContext context) { + final connector = Provider.of(context, listen: false); + final selectedContacts = []; + + // Filter to only repeaters and room servers + final validContacts = connector.contacts + .where((c) => (c.type == 2 || c.type == 3) && c != widget.contact) + .toList(); + + showDialog( + context: context, + builder: (context) => StatefulBuilder( + builder: (context, setDialogState) => AlertDialog( + title: const Text('Build Path from Contacts'), + content: SizedBox( + width: double.maxFinite, + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + if (validContacts.isEmpty) ...[ + const Icon(Icons.info_outline, size: 48, color: Colors.grey), + const SizedBox(height: 16), + const Text( + 'No repeaters or room servers found.', + style: TextStyle(fontSize: 14), + textAlign: TextAlign.center, + ), + const SizedBox(height: 8), + const Text( + 'Custom paths require intermediate hops that can relay messages.', + style: TextStyle(fontSize: 12, color: Colors.grey), + textAlign: TextAlign.center, + ), + ] else if (selectedContacts.isNotEmpty) ...[ + const Text( + 'Selected Path:', + style: TextStyle(fontWeight: FontWeight.bold, fontSize: 12), + ), + const SizedBox(height: 8), + Wrap( + spacing: 8, + runSpacing: 8, + children: selectedContacts.asMap().entries.map((entry) { + final idx = entry.key; + final contact = entry.value; + return Chip( + avatar: CircleAvatar( + child: Text('${idx + 1}'), + ), + label: Text(contact.name), + onDeleted: () { + setDialogState(() { + selectedContacts.removeAt(idx); + }); + }, + ); + }).toList(), + ), + const Divider(), + ] else + const Text( + 'Tap repeaters/rooms to add them to the path:', + style: TextStyle(fontSize: 12, color: Colors.grey), + ), + const SizedBox(height: 8), + if (validContacts.isNotEmpty) + Flexible( + child: ListView.builder( + shrinkWrap: true, + itemCount: validContacts.length, + itemBuilder: (context, index) { + final contact = validContacts[index]; + final isSelected = selectedContacts.contains(contact); + + return ListTile( + dense: true, + leading: CircleAvatar( + radius: 16, + backgroundColor: isSelected ? Colors.green : (contact.type == 2 ? Colors.blue : Colors.purple), + child: Icon( + contact.type == 2 ? Icons.router : Icons.meeting_room, + size: 16, + color: Colors.white, + ), + ), + title: Text(contact.name, style: const TextStyle(fontSize: 14)), + subtitle: Text( + '${contact.typeLabel} • ${contact.publicKeyHex.substring(0, 8)}', + style: const TextStyle(fontSize: 10), + ), + trailing: isSelected + ? const Icon(Icons.check_circle, color: Colors.green) + : const Icon(Icons.add_circle_outline), + onTap: () { + setDialogState(() { + if (isSelected) { + selectedContacts.remove(contact); + } else { + selectedContacts.add(contact); + } + }); + }, + ); + }, + ), + ), + ], + ), + ), + actions: [ + if (selectedContacts.isNotEmpty) + TextButton( + onPressed: () { + setDialogState(() { + selectedContacts.clear(); + }); + }, + child: const Text('Clear'), + ), + TextButton( + onPressed: () => Navigator.pop(context), + child: const Text('Cancel'), + ), + TextButton( + onPressed: selectedContacts.isEmpty + ? null + : () async { + // Build path bytes from selected contacts (prefix byte of each pub key) + final pathBytesList = []; + for (final contact in selectedContacts) { + if (contact.publicKeyHex.length >= 2) { + try { + pathBytesList.add(int.parse(contact.publicKeyHex.substring(0, 2), radix: 16)); + } catch (e) { + // Skip invalid hex + } + } + } + + if (pathBytesList.isNotEmpty) { + await connector.setContactPath( + widget.contact, + Uint8List.fromList(pathBytesList), + pathBytesList.length, + ); + + final pathIds = selectedContacts + .map((c) => c.publicKeyHex.substring(0, 8)) + .join(','); + + if (context.mounted) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text('Custom path set: $pathIds'), + duration: const Duration(seconds: 2), + ), + ); + Navigator.pop(context); + } + } + }, + child: const Text('Set Path'), + ), + ], + ), + ), + ); + } + + void _showMessageRetry(BuildContext context, Message message) { + showModalBottomSheet( + context: context, + builder: (context) => SafeArea( + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + ListTile( + leading: const Icon(Icons.refresh), + title: const Text('Retry'), + onTap: () { + Navigator.pop(context); + _retryMessage(message); + }, + ), + ], + ), + ), + ); + } + + void _retryMessage(Message message) { + final connector = Provider.of(context, listen: false); + connector.sendMessage( + widget.contact, + message.text, + forceFlood: message.forceFlood, + ); + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar(content: Text('Retrying message')), + ); + } +} + +class _MessageBubble extends StatelessWidget { + final Message message; + final String senderName; + final VoidCallback? onLongPress; + + const _MessageBubble({ + required this.message, + required this.senderName, + this.onLongPress, + }); + + @override + Widget build(BuildContext context) { + final isOutgoing = message.isOutgoing; + final colorScheme = Theme.of(context).colorScheme; + final gifId = _parseGifId(message.text); + final poi = _parsePoiMessage(message.text); + final isFailed = message.status == MessageStatus.failed; + final attempts = message.retryCount + 1; + final bubbleColor = isFailed + ? colorScheme.errorContainer + : (isOutgoing ? colorScheme.primary : colorScheme.surfaceContainerHighest); + final textColor = isFailed + ? colorScheme.onErrorContainer + : (isOutgoing ? colorScheme.onPrimary : colorScheme.onSurface); + final metaColor = textColor.withValues(alpha: 0.7); + + return Padding( + padding: const EdgeInsets.symmetric(vertical: 4), + child: GestureDetector( + onLongPress: onLongPress, + child: Row( + mainAxisAlignment: isOutgoing ? MainAxisAlignment.end : MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + if (!isOutgoing) ...[ + _buildAvatar(senderName, colorScheme), + const SizedBox(width: 8), + ], + Flexible( + child: Container( + padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8), + constraints: BoxConstraints( + maxWidth: MediaQuery.of(context).size.width * 0.65, + ), + decoration: BoxDecoration( + color: bubbleColor, + borderRadius: BorderRadius.circular(16), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + if (!isOutgoing) ...[ + Text( + senderName, + style: TextStyle( + fontSize: 12, + fontWeight: FontWeight.bold, + color: colorScheme.primary, + ), + ), + const SizedBox(height: 4), + ], + if (poi != null) + _buildPoiMessage(context, poi, textColor, metaColor) + else if (gifId != null) + GifMessage( + url: 'https://media.giphy.com/media/$gifId/giphy.gif', + backgroundColor: bubbleColor, + fallbackTextColor: textColor.withValues(alpha: 0.7), + ) + else + Text( + message.text, + style: TextStyle( + color: textColor, + ), + ), + if (isOutgoing) ...[ + const SizedBox(height: 4), + Text( + 'Attempts: $attempts', + style: TextStyle( + fontSize: 10, + color: metaColor, + ), + ), + ], + const SizedBox(height: 4), + Wrap( + spacing: 4, + crossAxisAlignment: WrapCrossAlignment.center, + children: [ + Text( + _formatTime(message.timestamp), + style: TextStyle( + fontSize: 10, + color: metaColor, + ), + ), + if (isOutgoing) ...[ + const SizedBox(width: 4), + _buildStatusIcon(metaColor), + ], + if (message.tripTimeMs != null && + message.status == MessageStatus.delivered) ...[ + const SizedBox(width: 4), + Icon( + Icons.speed, + size: 10, + color: isOutgoing ? metaColor : Colors.green[700], + ), + Text( + '${(message.tripTimeMs! / 1000).toStringAsFixed(1)}s', + style: TextStyle( + fontSize: 9, + color: isOutgoing ? metaColor : Colors.green[700], + ), + ), + ], + ], + ), + ], + ), + ), + ), + ], + ), + ), + ); + } + + String? _parseGifId(String text) { + final trimmed = text.trim(); + final match = RegExp(r'^g:([A-Za-z0-9_-]+)$').firstMatch(trimmed); + return match?.group(1); + } + + _PoiInfo? _parsePoiMessage(String text) { + final trimmed = text.trim(); + final match = RegExp(r'^m:([\-0-9.]+),([\-0-9.]+)\|([^|]*)\|.*$') + .firstMatch(trimmed); + if (match == null) return null; + final lat = double.tryParse(match.group(1) ?? ''); + final lon = double.tryParse(match.group(2) ?? ''); + if (lat == null || lon == null) return null; + final label = match.group(3) ?? ''; + return _PoiInfo(lat: lat, lon: lon, label: label); + } + + Widget _buildPoiMessage( + BuildContext context, + _PoiInfo poi, + Color textColor, + Color metaColor, + ) { + return Row( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + IconButton( + icon: Icon(Icons.location_on_outlined, color: textColor), + padding: EdgeInsets.zero, + constraints: const BoxConstraints(minWidth: 32, minHeight: 32), + onPressed: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => MapScreen( + highlightPosition: LatLng(poi.lat, poi.lon), + highlightLabel: poi.label, + ), + ), + ); + }, + ), + const SizedBox(width: 8), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + 'POI Shared', + style: TextStyle( + color: textColor, + fontWeight: FontWeight.w600, + ), + ), + if (poi.label.isNotEmpty) + Text( + poi.label, + style: TextStyle( + color: metaColor, + fontSize: 12, + ), + ), + ], + ), + ), + ], + ); + } + + String _formatPathPrefixes(Uint8List pathBytes) { + return pathBytes.map((b) => b.toRadixString(16).padLeft(2, '0')).join(','); + } + + Widget _buildAvatar(String senderName, ColorScheme colorScheme) { + final initial = _getFirstCharacterOrEmoji(senderName); + final color = _getColorForName(senderName); + + return CircleAvatar( + radius: 18, + backgroundColor: color.withValues(alpha: 0.2), + child: Text( + initial, + style: TextStyle( + fontSize: 14, + fontWeight: FontWeight.bold, + color: color, + ), + ), + ); + } + + String _getFirstCharacterOrEmoji(String name) { + if (name.isEmpty) return '?'; + + final emoji = firstEmoji(name); + if (emoji != null) return emoji; + + final runes = name.runes.toList(); + if (runes.isEmpty) return '?'; + return String.fromCharCode(runes[0]).toUpperCase(); + } + + Color _getColorForName(String name) { + // Generate a consistent color based on the name hash + final hash = name.hashCode; + final colors = [ + Colors.blue, + Colors.green, + Colors.orange, + Colors.purple, + Colors.pink, + Colors.teal, + Colors.indigo, + Colors.cyan, + Colors.amber, + Colors.deepOrange, + ]; + + return colors[hash.abs() % colors.length]; + } + + Widget _buildStatusIcon(Color color) { + IconData icon; + switch (message.status) { + case MessageStatus.pending: + icon = Icons.access_time; + break; + case MessageStatus.sent: + icon = Icons.schedule; + break; + case MessageStatus.delivered: + icon = Icons.check; + break; + case MessageStatus.failed: + icon = Icons.error_outline; + break; + } + + return Icon( + icon, + size: 12, + color: color, + ); + } + + String _formatTime(DateTime time) { + final hour = time.hour.toString().padLeft(2, '0'); + final minute = time.minute.toString().padLeft(2, '0'); + return '$hour:$minute'; + } +} + +class _PoiInfo { + final double lat; + final double lon; + final String label; + + const _PoiInfo({ + required this.lat, + required this.lon, + required this.label, + }); +} diff --git a/lib/screens/contacts_screen.dart b/lib/screens/contacts_screen.dart new file mode 100644 index 00000000..26e2209c --- /dev/null +++ b/lib/screens/contacts_screen.dart @@ -0,0 +1,791 @@ +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +import '../connector/meshcore_connector.dart'; +import '../connector/meshcore_protocol.dart'; +import '../models/contact.dart'; +import '../models/contact_group.dart'; +import '../storage/contact_group_store.dart'; +import '../widgets/repeater_login_dialog.dart'; +import '../utils/emoji_utils.dart'; +import 'chat_screen.dart'; +import 'repeater_hub_screen.dart'; + +enum ContactSortOption { + lastSeen, + recentMessages, + name, + type, +} + +class ContactsScreen extends StatefulWidget { + const ContactsScreen({super.key}); + + @override + State createState() => _ContactsScreenState(); +} + +class _ContactsScreenState extends State { + final TextEditingController _searchController = TextEditingController(); + String _searchQuery = ''; + ContactSortOption _sortOption = ContactSortOption.lastSeen; + final ContactGroupStore _groupStore = ContactGroupStore(); + List _groups = []; + + @override + void initState() { + super.initState(); + _loadGroups(); + } + + @override + void dispose() { + _searchController.dispose(); + super.dispose(); + } + + Future _loadGroups() async { + final groups = await _groupStore.loadGroups(); + if (!mounted) return; + setState(() { + _groups = groups; + }); + } + + Future _saveGroups() async { + await _groupStore.saveGroups(_groups); + } + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: const Text('Contacts'), + centerTitle: true, + actions: [ + PopupMenuButton( + icon: const Icon(Icons.sort), + tooltip: 'Sort by', + onSelected: (option) { + setState(() { + _sortOption = option; + }); + }, + itemBuilder: (context) => [ + PopupMenuItem( + value: ContactSortOption.lastSeen, + child: Row( + children: [ + Icon( + Icons.access_time, + size: 20, + color: _sortOption == ContactSortOption.lastSeen + ? Theme.of(context).primaryColor + : null, + ), + const SizedBox(width: 12), + Text( + 'Last Seen', + style: TextStyle( + fontWeight: _sortOption == ContactSortOption.lastSeen + ? FontWeight.bold + : FontWeight.normal, + ), + ), + ], + ), + ), + PopupMenuItem( + value: ContactSortOption.recentMessages, + child: Row( + children: [ + Icon( + Icons.chat_bubble, + size: 20, + color: _sortOption == ContactSortOption.recentMessages + ? Theme.of(context).primaryColor + : null, + ), + const SizedBox(width: 12), + Text( + 'Recent Messages', + style: TextStyle( + fontWeight: _sortOption == ContactSortOption.recentMessages + ? FontWeight.bold + : FontWeight.normal, + ), + ), + ], + ), + ), + PopupMenuItem( + value: ContactSortOption.name, + child: Row( + children: [ + Icon( + Icons.sort_by_alpha, + size: 20, + color: _sortOption == ContactSortOption.name + ? Theme.of(context).primaryColor + : null, + ), + const SizedBox(width: 12), + Text( + 'Name', + style: TextStyle( + fontWeight: _sortOption == ContactSortOption.name + ? FontWeight.bold + : FontWeight.normal, + ), + ), + ], + ), + ), + PopupMenuItem( + value: ContactSortOption.type, + child: Row( + children: [ + Icon( + Icons.category, + size: 20, + color: _sortOption == ContactSortOption.type + ? Theme.of(context).primaryColor + : null, + ), + const SizedBox(width: 12), + Text( + 'Type', + style: TextStyle( + fontWeight: _sortOption == ContactSortOption.type + ? FontWeight.bold + : FontWeight.normal, + ), + ), + ], + ), + ), + ], + ), + IconButton( + icon: const Icon(Icons.group_add), + tooltip: 'New group', + onPressed: () { + final contacts = context.read().contacts; + _showGroupEditor(context, contacts); + }, + ), + Consumer( + builder: (context, connector, child) { + return IconButton( + icon: connector.isLoadingContacts + ? const SizedBox( + width: 20, + height: 20, + child: CircularProgressIndicator(strokeWidth: 2), + ) + : const Icon(Icons.refresh), + onPressed: connector.isLoadingContacts + ? null + : () => connector.getContacts(), + ); + }, + ), + ], + ), + body: Consumer( + builder: (context, connector, child) { + final contacts = connector.contacts; + + if (contacts.isEmpty && connector.isLoadingContacts && _groups.isEmpty) { + return const Center(child: CircularProgressIndicator()); + } + + if (contacts.isEmpty && _groups.isEmpty) { + return Center( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon(Icons.people_outline, size: 64, color: Colors.grey[400]), + const SizedBox(height: 16), + Text( + 'No contacts yet', + style: TextStyle(fontSize: 16, color: Colors.grey[600]), + ), + const SizedBox(height: 8), + Text( + 'Contacts will appear when devices advertise', + style: TextStyle(fontSize: 14, color: Colors.grey[500]), + ), + ], + ), + ); + } + + final filteredAndSorted = _filterAndSortContacts(contacts, connector); + final filteredGroups = _filterAndSortGroups(_groups, contacts); + + return Column( + children: [ + Padding( + padding: const EdgeInsets.all(8.0), + child: TextField( + controller: _searchController, + decoration: InputDecoration( + hintText: 'Search contacts...', + prefixIcon: const Icon(Icons.search), + suffixIcon: _searchQuery.isNotEmpty + ? IconButton( + icon: const Icon(Icons.clear), + onPressed: () { + _searchController.clear(); + setState(() { + _searchQuery = ''; + }); + }, + ) + : null, + border: OutlineInputBorder( + borderRadius: BorderRadius.circular(12), + ), + contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12), + ), + onChanged: (value) { + setState(() { + _searchQuery = value.toLowerCase(); + }); + }, + ), + ), + Expanded( + child: filteredAndSorted.isEmpty && filteredGroups.isEmpty + ? Center( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon(Icons.search_off, size: 64, color: Colors.grey[400]), + const SizedBox(height: 16), + Text( + 'No contacts or groups found', + style: TextStyle(fontSize: 16, color: Colors.grey[600]), + ), + ], + ), + ) + : RefreshIndicator( + onRefresh: () => connector.getContacts(), + child: ListView.builder( + itemCount: filteredGroups.length + filteredAndSorted.length, + itemBuilder: (context, index) { + if (index < filteredGroups.length) { + final group = filteredGroups[index]; + return _buildGroupTile(context, group, contacts); + } + final contact = filteredAndSorted[index - filteredGroups.length]; + return _ContactTile( + contact: contact, + onTap: () => _openChat(context, contact), + onLongPress: () => _showContactOptions(context, connector, contact), + ); + }, + ), + ), + ), + ], + ); + }, + ), + ); + } + + List _filterAndSortGroups(List groups, List contacts) { + final query = _searchQuery.trim().toLowerCase(); + final contactNames = {}; + for (final contact in contacts) { + contactNames[contact.publicKeyHex] = contact.name.toLowerCase(); + } + + final filtered = groups.where((group) { + if (query.isEmpty) return true; + if (group.name.toLowerCase().contains(query)) return true; + for (final key in group.memberKeys) { + final name = contactNames[key]; + if (name != null && name.contains(query)) return true; + } + return false; + }).toList(); + + filtered.sort((a, b) => a.name.toLowerCase().compareTo(b.name.toLowerCase())); + return filtered; + } + + List _filterAndSortContacts(List contacts, MeshCoreConnector connector) { + var filtered = contacts.where((contact) { + if (_searchQuery.isEmpty) return true; + return contact.name.toLowerCase().contains(_searchQuery); + }).toList(); + + switch (_sortOption) { + case ContactSortOption.lastSeen: + filtered.sort((a, b) => b.lastSeen.compareTo(a.lastSeen)); + break; + case ContactSortOption.recentMessages: + filtered.sort((a, b) { + final aMessages = connector.getMessages(a); + final bMessages = connector.getMessages(b); + final aLastMsg = aMessages.isEmpty ? DateTime(1970) : aMessages.last.timestamp; + final bLastMsg = bMessages.isEmpty ? DateTime(1970) : bMessages.last.timestamp; + return bLastMsg.compareTo(aLastMsg); + }); + break; + case ContactSortOption.name: + filtered.sort((a, b) => a.name.toLowerCase().compareTo(b.name.toLowerCase())); + break; + case ContactSortOption.type: + filtered.sort((a, b) { + final typeCompare = a.type.compareTo(b.type); + if (typeCompare != 0) return typeCompare; + return a.name.toLowerCase().compareTo(b.name.toLowerCase()); + }); + break; + } + + return filtered; + } + + Widget _buildGroupTile(BuildContext context, ContactGroup group, List contacts) { + final memberContacts = _resolveGroupContacts(group, contacts); + final subtitle = _formatGroupMembers(memberContacts); + return ListTile( + leading: const CircleAvatar( + backgroundColor: Colors.teal, + child: Icon(Icons.group, color: Colors.white, size: 20), + ), + title: Text(group.name), + subtitle: Text(subtitle), + trailing: Text( + memberContacts.length.toString(), + style: TextStyle(fontSize: 12, color: Colors.grey[600]), + ), + onTap: () => _showGroupOptions(context, group, contacts), + onLongPress: () => _showGroupOptions(context, group, contacts), + ); + } + + List _resolveGroupContacts(ContactGroup group, List contacts) { + final byKey = {}; + for (final contact in contacts) { + byKey[contact.publicKeyHex] = contact; + } + final resolved = []; + for (final key in group.memberKeys) { + final contact = byKey[key]; + if (contact != null) { + resolved.add(contact); + } + } + resolved.sort((a, b) => a.name.toLowerCase().compareTo(b.name.toLowerCase())); + return resolved; + } + + String _formatGroupMembers(List members) { + if (members.isEmpty) return 'No members'; + final names = members.map((c) => c.name).toList(); + if (names.length <= 2) return names.join(', '); + return '${names.take(2).join(', ')} +${names.length - 2}'; + } + + void _openChat(BuildContext context, Contact contact) { + // Check if this is a repeater + if (contact.type == advTypeRepeater) { + _showRepeaterLogin(context, contact); + } else { + Navigator.push( + context, + MaterialPageRoute(builder: (context) => ChatScreen(contact: contact)), + ); + } + } + + void _showRepeaterLogin(BuildContext context, Contact repeater) { + showDialog( + context: context, + builder: (context) => RepeaterLoginDialog( + repeater: repeater, + onLogin: (password) { + // Navigate to repeater hub screen after successful login + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => RepeaterHubScreen( + repeater: repeater, + password: password, + ), + ), + ); + }, + ), + ); + } + + void _showGroupOptions(BuildContext context, ContactGroup group, List contacts) { + final members = _resolveGroupContacts(group, contacts); + showModalBottomSheet( + context: context, + builder: (sheetContext) => SafeArea( + child: SingleChildScrollView( + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + ListTile( + leading: const Icon(Icons.edit), + title: const Text('Edit Group'), + onTap: () { + Navigator.pop(sheetContext); + _showGroupEditor(context, contacts, group: group); + }, + ), + ListTile( + leading: const Icon(Icons.delete, color: Colors.red), + title: const Text('Delete Group', style: TextStyle(color: Colors.red)), + onTap: () { + Navigator.pop(sheetContext); + _confirmDeleteGroup(context, group); + }, + ), + if (members.isNotEmpty) const Divider(), + ...members.map((member) { + return ListTile( + leading: const Icon(Icons.person), + title: Text(member.name), + subtitle: Text(member.typeLabel), + onTap: () { + Navigator.pop(sheetContext); + _openChat(context, member); + }, + ); + }), + ], + ), + ), + ), + ); + } + + void _confirmDeleteGroup(BuildContext context, ContactGroup group) { + showDialog( + context: context, + builder: (dialogContext) => AlertDialog( + title: const Text('Delete Group'), + content: Text('Remove "${group.name}"?'), + actions: [ + TextButton( + onPressed: () => Navigator.pop(dialogContext), + child: const Text('Cancel'), + ), + TextButton( + onPressed: () async { + Navigator.pop(dialogContext); + setState(() { + _groups.removeWhere((g) => g.name == group.name); + }); + await _saveGroups(); + }, + child: const Text('Delete', style: TextStyle(color: Colors.red)), + ), + ], + ), + ); + } + + void _showGroupEditor( + BuildContext context, + List contacts, { + ContactGroup? group, + }) { + final isEditing = group != null; + final nameController = TextEditingController(text: group?.name ?? ''); + final selectedKeys = {...group?.memberKeys ?? []}; + String filterQuery = ''; + final sortedContacts = List.from(contacts) + ..sort((a, b) => a.name.toLowerCase().compareTo(b.name.toLowerCase())); + + showDialog( + context: context, + builder: (dialogContext) => StatefulBuilder( + builder: (builderContext, setDialogState) { + final filteredContacts = filterQuery.isEmpty + ? sortedContacts + : sortedContacts + .where((contact) => contact.name.toLowerCase().contains(filterQuery)) + .toList(); + return AlertDialog( + title: Text(isEditing ? 'Edit Group' : 'New Group'), + content: SizedBox( + width: double.maxFinite, + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + TextField( + controller: nameController, + decoration: const InputDecoration( + labelText: 'Group name', + border: OutlineInputBorder(), + ), + ), + const SizedBox(height: 12), + TextField( + decoration: const InputDecoration( + hintText: 'Filter contacts...', + prefixIcon: Icon(Icons.search), + border: OutlineInputBorder(), + isDense: true, + ), + onChanged: (value) { + setDialogState(() { + filterQuery = value.toLowerCase(); + }); + }, + ), + const SizedBox(height: 12), + SizedBox( + height: 240, + child: filteredContacts.isEmpty + ? const Center(child: Text('No contacts match your filter')) + : ListView.builder( + itemCount: filteredContacts.length, + itemBuilder: (context, index) { + final contact = filteredContacts[index]; + final isSelected = selectedKeys.contains(contact.publicKeyHex); + return CheckboxListTile( + value: isSelected, + title: Text(contact.name), + subtitle: Text(contact.typeLabel), + onChanged: (value) { + setDialogState(() { + if (value == true) { + selectedKeys.add(contact.publicKeyHex); + } else { + selectedKeys.remove(contact.publicKeyHex); + } + }); + }, + ); + }, + ), + ), + ], + ), + ), + actions: [ + TextButton( + onPressed: () => Navigator.pop(dialogContext), + child: const Text('Cancel'), + ), + TextButton( + onPressed: () async { + final name = nameController.text.trim(); + if (name.isEmpty) { + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar(content: Text('Group name is required')), + ); + return; + } + final exists = _groups.any((g) { + if (isEditing && g.name == group!.name) return false; + return g.name.toLowerCase() == name.toLowerCase(); + }); + if (exists) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar(content: Text('Group "$name" already exists')), + ); + return; + } + setState(() { + if (isEditing) { + final index = _groups.indexWhere((g) => g.name == group!.name); + if (index != -1) { + _groups[index] = ContactGroup( + name: name, + memberKeys: selectedKeys.toList(), + ); + } + } else { + _groups.add(ContactGroup(name: name, memberKeys: selectedKeys.toList())); + } + }); + await _saveGroups(); + if (dialogContext.mounted) { + Navigator.pop(dialogContext); + } + }, + child: Text(isEditing ? 'Save' : 'Create'), + ), + ], + ); + }, + ), + ); + } + + void _showContactOptions( + BuildContext context, + MeshCoreConnector connector, + Contact contact, + ) { + final isRepeater = contact.type == advTypeRepeater; + + showModalBottomSheet( + context: context, + builder: (context) => SafeArea( + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + if (isRepeater) + ListTile( + leading: const Icon(Icons.cell_tower, color: Colors.orange), + title: const Text('Manage Repeater'), + onTap: () { + Navigator.pop(context); + _showRepeaterLogin(context, contact); + }, + ) + else + ListTile( + leading: const Icon(Icons.chat), + title: const Text('Open Chat'), + onTap: () { + Navigator.pop(context); + _openChat(context, contact); + }, + ), + ListTile( + leading: const Icon(Icons.delete, color: Colors.red), + title: const Text('Delete Contact', style: TextStyle(color: Colors.red)), + onTap: () { + Navigator.pop(context); + _confirmDelete(context, connector, contact); + }, + ), + ], + ), + ), + ); + } + + void _confirmDelete( + BuildContext context, + MeshCoreConnector connector, + Contact contact, + ) { + showDialog( + context: context, + builder: (context) => AlertDialog( + title: const Text('Delete Contact'), + content: Text('Remove ${contact.name} from contacts?'), + actions: [ + TextButton( + onPressed: () => Navigator.pop(context), + child: const Text('Cancel'), + ), + TextButton( + onPressed: () { + Navigator.pop(context); + connector.removeContact(contact); + }, + child: const Text('Delete', style: TextStyle(color: Colors.red)), + ), + ], + ), + ); + } +} + +class _ContactTile extends StatelessWidget { + final Contact contact; + final VoidCallback onTap; + final VoidCallback onLongPress; + + const _ContactTile({ + required this.contact, + required this.onTap, + required this.onLongPress, + }); + + @override + Widget build(BuildContext context) { + return ListTile( + leading: CircleAvatar( + backgroundColor: _getTypeColor(contact.type), + child: _buildContactAvatar(contact), + ), + title: Text(contact.name), + subtitle: Text('${contact.typeLabel} • ${contact.pathLabel}'), + trailing: Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + Text( + _formatLastSeen(contact.lastSeen), + style: TextStyle(fontSize: 12, color: Colors.grey[600]), + ), + if (contact.hasLocation) + Icon(Icons.location_on, size: 14, color: Colors.grey[400]), + ], + ), + onTap: onTap, + onLongPress: onLongPress, + ); + } + + Widget _buildContactAvatar(Contact contact) { + final emoji = firstEmoji(contact.name); + if (emoji != null) { + return Text( + emoji, + style: const TextStyle(fontSize: 18), + ); + } + return Icon(_getTypeIcon(contact.type), color: Colors.white, size: 20); + } + + IconData _getTypeIcon(int type) { + switch (type) { + case advTypeChat: + return Icons.chat; + case advTypeRepeater: + return Icons.cell_tower; + case advTypeRoom: + return Icons.group; + case advTypeSensor: + return Icons.sensors; + default: + return Icons.device_unknown; + } + } + + Color _getTypeColor(int type) { + switch (type) { + case advTypeChat: + return Colors.blue; + case advTypeRepeater: + return Colors.orange; + case advTypeRoom: + return Colors.purple; + case advTypeSensor: + return Colors.green; + default: + return Colors.grey; + } + } + + String _formatLastSeen(DateTime lastSeen) { + final now = DateTime.now(); + final diff = now.difference(lastSeen); + + if (diff.inMinutes < 1) return 'Just now'; + if (diff.inMinutes < 60) return '${diff.inMinutes}m ago'; + if (diff.inHours < 24) return '${diff.inHours}h ago'; + if (diff.inDays < 7) return '${diff.inDays}d ago'; + return '${lastSeen.month}/${lastSeen.day}'; + } +} diff --git a/lib/screens/device_screen.dart b/lib/screens/device_screen.dart new file mode 100644 index 00000000..e464141c --- /dev/null +++ b/lib/screens/device_screen.dart @@ -0,0 +1,292 @@ +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +import '../connector/meshcore_connector.dart'; +import 'channels_screen.dart'; +import 'contacts_screen.dart'; +import 'map_screen.dart'; +import 'settings_screen.dart'; + +/// Main hub screen after connecting to a MeshCore device +class DeviceScreen extends StatefulWidget { + const DeviceScreen({super.key}); + + @override + State createState() => _DeviceScreenState(); +} + +class _DeviceScreenState extends State { + bool _showBatteryVoltage = false; + + @override + Widget build(BuildContext context) { + return Consumer( + builder: (context, connector, child) { + // If disconnected, pop back to scanner + if (!connector.isConnected) { + WidgetsBinding.instance.addPostFrameCallback((_) { + if (context.mounted) { + Navigator.popUntil(context, (route) => route.isFirst); + } + }); + } + + return PopScope( + canPop: false, + child: Scaffold( + appBar: AppBar( + title: Text(connector.device?.platformName ?? 'MeshCore Device'), + centerTitle: true, + automaticallyImplyLeading: false, + actions: [ + IconButton( + icon: const Icon(Icons.bluetooth_disabled), + tooltip: 'Disconnect', + onPressed: () => _disconnect(context, connector), + ), + ], + ), + body: Padding( + padding: const EdgeInsets.all(16.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + // Connection status card + _buildStatusCard(connector, context), + + const SizedBox(height: 24), + + // Navigation grid + Expanded( + child: _buildNavigationGrid(context), + ), + ], + ), + ), + ), + ); + }, + ); + } + + Widget _buildStatusCard(MeshCoreConnector connector, BuildContext context) { + return Card( + child: Padding( + padding: const EdgeInsets.all(16.0), + child: Row( + children: [ + const Icon(Icons.bluetooth_connected, color: Colors.green, size: 32), + const SizedBox(width: 16), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + connector.device?.platformName ?? 'Unknown Device', + style: const TextStyle( + fontSize: 18, + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 4), + Text( + connector.device?.remoteId.toString() ?? '', + style: TextStyle( + fontSize: 12, + color: Colors.grey[600], + ), + ), + ], + ), + ), + Column( + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + Container( + padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6), + decoration: BoxDecoration( + color: Colors.green.withValues(alpha: 0.1), + borderRadius: BorderRadius.circular(16), + ), + child: const Text( + 'Connected', + style: TextStyle( + color: Colors.green, + fontWeight: FontWeight.w500, + ), + ), + ), + const SizedBox(height: 8), + _buildBatteryIndicator(connector, context), + ], + ), + ], + ), + ), + ); + } + + Widget _buildBatteryIndicator(MeshCoreConnector connector, BuildContext context) { + final percent = connector.batteryPercent; + final millivolts = connector.batteryMillivolts; + final percentLabel = percent != null ? '$percent%' : '--%'; + final voltageLabel = millivolts == null + ? '-- V' + : '${(millivolts / 1000.0).toStringAsFixed(2)} V'; + final displayLabel = _showBatteryVoltage ? voltageLabel : percentLabel; + final icon = _batteryIcon(percent); + + return InkWell( + borderRadius: BorderRadius.circular(16), + onTap: () { + setState(() { + _showBatteryVoltage = !_showBatteryVoltage; + }); + }, + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Icon(icon, size: 18, color: Colors.grey[700]), + const SizedBox(width: 4), + Text( + displayLabel, + style: TextStyle( + fontSize: 12, + color: Colors.grey[700], + fontWeight: FontWeight.w600, + ), + ), + ], + ), + ), + ); + } + + IconData _batteryIcon(int? percent) { + if (percent == null) return Icons.battery_unknown; + if (percent <= 15) return Icons.battery_alert; + return Icons.battery_full; + } + + Widget _buildNavigationGrid(BuildContext context) { + final items = [ + _NavItem( + icon: Icons.people_outline, + label: 'Contacts', + color: Colors.blue, + onTap: () => Navigator.push( + context, + MaterialPageRoute(builder: (context) => const ContactsScreen()), + ), + ), + _NavItem( + icon: Icons.tag, + label: 'Channels', + color: Colors.green, + onTap: () => Navigator.push( + context, + MaterialPageRoute(builder: (context) => const ChannelsScreen()), + ), + ), + _NavItem( + icon: Icons.map_outlined, + label: 'Map', + color: Colors.orange, + onTap: () => Navigator.push( + context, + MaterialPageRoute(builder: (context) => const MapScreen()), + ), + ), + _NavItem( + icon: Icons.settings_outlined, + label: 'Settings', + color: Colors.grey, + onTap: () => Navigator.push( + context, + MaterialPageRoute(builder: (context) => const SettingsScreen()), + ), + ), + ]; + + return GridView.builder( + gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount( + crossAxisCount: 2, + crossAxisSpacing: 16, + mainAxisSpacing: 16, + childAspectRatio: 1.2, + ), + itemCount: items.length, + itemBuilder: (context, index) { + final item = items[index]; + return _buildNavCard(item); + }, + ); + } + + Widget _buildNavCard(_NavItem item) { + return Card( + child: InkWell( + onTap: item.onTap, + borderRadius: BorderRadius.circular(12), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon( + item.icon, + size: 48, + color: item.color, + ), + const SizedBox(height: 12), + Text( + item.label, + style: const TextStyle( + fontSize: 16, + fontWeight: FontWeight.w500, + ), + ), + ], + ), + ), + ); + } + + Future _disconnect(BuildContext context, MeshCoreConnector connector) async { + final confirmed = await showDialog( + context: context, + builder: (context) => AlertDialog( + title: const Text('Disconnect'), + content: const Text('Are you sure you want to disconnect from this device?'), + actions: [ + TextButton( + onPressed: () => Navigator.pop(context, false), + child: const Text('Cancel'), + ), + TextButton( + onPressed: () => Navigator.pop(context, true), + child: const Text('Disconnect'), + ), + ], + ), + ); + + if (confirmed == true) { + await connector.disconnect(); + } + } +} + +class _NavItem { + final IconData icon; + final String label; + final Color color; + final VoidCallback onTap; + + _NavItem({ + required this.icon, + required this.label, + required this.color, + required this.onTap, + }); +} diff --git a/lib/screens/map_screen.dart b/lib/screens/map_screen.dart new file mode 100644 index 00000000..eb15eb36 --- /dev/null +++ b/lib/screens/map_screen.dart @@ -0,0 +1,1109 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_map/flutter_map.dart'; +import 'package:latlong2/latlong.dart'; +import 'package:provider/provider.dart'; + +import '../connector/meshcore_connector.dart'; +import '../connector/meshcore_protocol.dart'; +import '../models/channel.dart'; +import '../models/contact.dart'; +import '../services/app_settings_service.dart'; +import '../services/map_marker_service.dart'; +import 'chat_screen.dart'; + +class MapScreen extends StatefulWidget { + final LatLng? highlightPosition; + final String? highlightLabel; + final double highlightZoom; + + const MapScreen({ + super.key, + this.highlightPosition, + this.highlightLabel, + this.highlightZoom = 15.0, + }); + + @override + State createState() => _MapScreenState(); +} + +class _MapScreenState extends State { + final MapController _mapController = MapController(); + final MapMarkerService _markerService = MapMarkerService(); + final Set _hiddenMarkerIds = {}; + Set _removedMarkerIds = {}; + bool _isSelectingPoi = false; + + @override + void initState() { + super.initState(); + _loadRemovedMarkers(); + WidgetsBinding.instance.addPostFrameCallback((_) { + if (mounted) { + context.read().getChannels(); + if (widget.highlightPosition != null) { + _mapController.move(widget.highlightPosition!, widget.highlightZoom); + } + } + }); + } + + Future _loadRemovedMarkers() async { + final ids = await _markerService.loadRemovedIds(); + if (!mounted) return; + setState(() { + _removedMarkerIds = ids; + }); + } + + @override + Widget build(BuildContext context) { + return Consumer2( + builder: (context, connector, settingsService, child) { + final settings = settingsService.settings; + final contacts = connector.contacts; + final highlightPosition = widget.highlightPosition; + final sharedMarkers = settings.mapShowMarkers + ? _collectSharedMarkers(connector) + .where((marker) => + !_hiddenMarkerIds.contains(marker.id) && + !_removedMarkerIds.contains(marker.id)) + .toList() + : <_SharedMarker>[]; + + // Filter by time + final now = DateTime.now(); + final filteredByTime = settings.mapTimeFilterHours == 0 + ? contacts + : contacts.where((c) { + final hoursSinceLastSeen = + now.difference(c.lastSeen).inHours; + return hoursSinceLastSeen <= settings.mapTimeFilterHours; + }).toList(); + + // Filter by key prefix + final keyPrefix = settings.mapKeyPrefix.trim(); + final filteredByKeyPrefix = (settings.mapKeyPrefixEnabled && keyPrefix.isNotEmpty) + ? filteredByTime.where((c) { + return c.publicKeyHex.toLowerCase().startsWith(keyPrefix.toLowerCase()); + }).toList() + : filteredByTime; + + // Filter by location + final contactsWithLocation = filteredByKeyPrefix + .where((c) => c.hasLocation) + .toList(); + + // Calculate center of all nodes, or default to (0, 0) + LatLng center = const LatLng(0, 0); + final hasMapContent = contactsWithLocation.isNotEmpty || + sharedMarkers.isNotEmpty || + _isSelectingPoi || + highlightPosition != null; + if (contactsWithLocation.isNotEmpty || sharedMarkers.isNotEmpty) { + double avgLat = contactsWithLocation + .map((c) => c.latitude!) + .fold(0, (sum, lat) => sum + lat); + double avgLon = contactsWithLocation + .map((c) => c.longitude!) + .fold(0, (sum, lon) => sum + lon); + for (final marker in sharedMarkers) { + avgLat += marker.position.latitude; + avgLon += marker.position.longitude; + } + final total = contactsWithLocation.length + sharedMarkers.length; + if (total > 0) { + center = LatLng(avgLat / total, avgLon / total); + } + } + if (highlightPosition != null) { + center = highlightPosition; + } + + return Scaffold( + appBar: AppBar( + title: const Text('Node Map'), + centerTitle: true, + ), + body: !hasMapContent + ? _buildEmptyState() + : Stack( + children: [ + FlutterMap( + mapController: _mapController, + options: MapOptions( + initialCenter: center, + initialZoom: 13.0, + minZoom: 2.0, + maxZoom: 18.0, + onTap: (_, latLng) { + if (_isSelectingPoi) { + setState(() { + _isSelectingPoi = false; + }); + _shareMarker( + context: context, + connector: connector, + position: latLng, + defaultLabel: 'Point of interest', + flags: 'poi', + ); + } + }, + onLongPress: (_, latLng) { + if (_isSelectingPoi) { + setState(() { + _isSelectingPoi = false; + }); + _shareMarker( + context: context, + connector: connector, + position: latLng, + defaultLabel: 'Point of interest', + flags: 'poi', + ); + return; + } + _showShareMarkerAtPositionSheet( + context: context, + connector: connector, + position: latLng, + ); + }, + ), + children: [ + TileLayer( + urlTemplate: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png', + userAgentPackageName: 'com.meshcore.open', + maxZoom: 19, + ), + MarkerLayer( + markers: [ + if (highlightPosition != null) + Marker( + point: highlightPosition, + width: 40, + height: 40, + child: Icon( + Icons.location_on_outlined, + color: Colors.red[600], + size: 34, + ), + ), + ..._buildMarkers(contactsWithLocation, settings), + ...sharedMarkers.map(_buildSharedMarker), + ], + ), + ], + ), + _buildLegend(contactsWithLocation.length, sharedMarkers.length), + ], + ), + floatingActionButton: FloatingActionButton( + onPressed: () => _showFilterDialog(context, settingsService), + child: const Icon(Icons.filter_list), + ), + ); + }, + ); + } + + Widget _buildEmptyState() { + return Center( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon( + Icons.location_off, + size: 64, + color: Colors.grey[400], + ), + const SizedBox(height: 16), + Text( + 'No nodes with location data', + style: TextStyle( + fontSize: 18, + color: Colors.grey[600], + ), + ), + const SizedBox(height: 8), + Text( + 'Nodes need to share their GPS coordinates\nto appear on the map', + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 14, + color: Colors.grey[500], + ), + ), + ], + ), + ); + } + + List _buildMarkers(List contacts, settings) { + final markers = []; + + for (final contact in contacts) { + if (!contact.hasLocation) continue; + + // Apply node type filters + if (contact.type == advTypeRepeater && !settings.mapShowRepeaters) continue; + if (contact.type == advTypeChat && !settings.mapShowChatNodes) continue; + if (contact.type != advTypeChat && + contact.type != advTypeRepeater && + !settings.mapShowOtherNodes) { + continue; + } + + final marker = Marker( + point: LatLng(contact.latitude!, contact.longitude!), + width: 80, + height: 80, + child: GestureDetector( + onTap: () => _showNodeInfo(context, contact), + child: Column( + children: [ + Container( + padding: const EdgeInsets.all(8), + decoration: BoxDecoration( + color: _getNodeColor(contact.type), + shape: BoxShape.circle, + border: Border.all(color: Colors.white, width: 2), + boxShadow: [ + BoxShadow( + color: Colors.black.withValues(alpha: 0.3), + blurRadius: 4, + offset: const Offset(0, 2), + ), + ], + ), + child: Icon( + _getNodeIcon(contact.type), + color: Colors.white, + size: 24, + ), + ), + ], + ), + ), + ); + + markers.add(marker); + } + + return markers; + } + + Color _getNodeColor(int type) { + switch (type) { + case advTypeChat: + return Colors.blue; + case advTypeRepeater: + return Colors.green; + case advTypeRoom: + return Colors.purple; + case advTypeSensor: + return Colors.orange; + default: + return Colors.grey; + } + } + + IconData _getNodeIcon(int type) { + switch (type) { + case advTypeChat: + return Icons.person; + case advTypeRepeater: + return Icons.router; + case advTypeRoom: + return Icons.meeting_room; + case advTypeSensor: + return Icons.sensors; + default: + return Icons.device_unknown; + } + } + + Widget _buildLegend(int nodeCount, int markerCount) { + return Positioned( + top: 16, + right: 16, + child: Card( + child: Padding( + padding: const EdgeInsets.all(12.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Text( + 'Nodes: $nodeCount', + style: const TextStyle( + fontWeight: FontWeight.bold, + fontSize: 14, + ), + ), + Text( + 'Pins: $markerCount', + style: const TextStyle( + fontWeight: FontWeight.bold, + fontSize: 12, + ), + ), + const SizedBox(height: 8), + _buildLegendItem(Icons.person, 'Chat', Colors.blue), + _buildLegendItem(Icons.router, 'Repeater', Colors.green), + _buildLegendItem(Icons.meeting_room, 'Room', Colors.purple), + _buildLegendItem(Icons.sensors, 'Sensor', Colors.orange), + _buildLegendItem(Icons.flag, 'Pin (DM)', Colors.blue), + _buildLegendItem(Icons.flag, 'Pin (Private)', Colors.purple), + _buildLegendItem(Icons.flag, 'Pin (Public)', Colors.orange), + ], + ), + ), + ), + ); + } + + Widget _buildLegendItem(IconData icon, String label, Color color) { + return Padding( + padding: const EdgeInsets.symmetric(vertical: 4.0), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Icon(icon, size: 16, color: color), + const SizedBox(width: 8), + Text( + label, + style: const TextStyle(fontSize: 12), + ), + ], + ), + ); + } + + List<_SharedMarker> _collectSharedMarkers(MeshCoreConnector connector) { + final markers = <_SharedMarker>[]; + final selfName = connector.selfName ?? 'Me'; + + for (final contact in connector.contacts) { + final messages = connector.getMessages(contact); + for (final message in messages) { + final payload = _parseMarkerText(message.text); + if (payload == null) continue; + final fromName = message.isOutgoing ? selfName : contact.name; + final id = _buildMarkerId( + sourceId: contact.publicKeyHex, + timestamp: message.timestamp, + text: message.text, + ); + markers.add( + _SharedMarker( + id: id, + position: payload.position, + label: payload.label, + flags: payload.flags, + fromName: fromName, + sourceLabel: contact.name, + isChannel: false, + isPublicChannel: false, + ), + ); + } + } + + for (final channel in connector.channels.where((c) => !c.isEmpty)) { + final isPublic = _isPublicChannel(channel); + final messages = connector.getChannelMessages(channel); + for (final message in messages) { + final payload = _parseMarkerText(message.text); + if (payload == null) continue; + final id = _buildMarkerId( + sourceId: 'channel:${channel.index}', + timestamp: message.timestamp, + text: message.text, + ); + markers.add( + _SharedMarker( + id: id, + position: payload.position, + label: payload.label, + flags: payload.flags, + fromName: message.senderName, + sourceLabel: channel.name.isEmpty ? 'Channel ${channel.index}' : channel.name, + isChannel: true, + isPublicChannel: isPublic, + ), + ); + } + } + + return markers; + } + + _MarkerPayload? _parseMarkerText(String text) { + final trimmed = text.trim(); + if (!trimmed.startsWith('m:')) return null; + + final parts = trimmed.substring(2).split('|'); + if (parts.isEmpty) return null; + final coords = parts[0].split(','); + if (coords.length != 2) return null; + final lat = double.tryParse(coords[0].trim()); + final lon = double.tryParse(coords[1].trim()); + if (lat == null || lon == null) return null; + + final label = parts.length > 1 ? parts[1].trim() : ''; + final flags = parts.length > 2 ? parts[2].trim() : ''; + return _MarkerPayload( + position: LatLng(lat, lon), + label: label.isEmpty ? 'Shared pin' : label, + flags: flags, + ); + } + + String _buildMarkerId({ + required String sourceId, + required DateTime timestamp, + required String text, + }) { + return '$sourceId|${timestamp.millisecondsSinceEpoch}|$text'; + } + + Marker _buildSharedMarker(_SharedMarker marker) { + final markerColor = marker.isChannel + ? (marker.isPublicChannel ? Colors.orange : Colors.purple) + : Colors.blue; + return Marker( + point: marker.position, + width: 60, + height: 60, + child: GestureDetector( + onTap: () => _showMarkerInfo(marker), + child: Column( + children: [ + Container( + padding: const EdgeInsets.all(6), + decoration: BoxDecoration( + color: markerColor, + shape: BoxShape.circle, + border: Border.all(color: Colors.white, width: 2), + boxShadow: [ + BoxShadow( + color: Colors.black.withValues(alpha: 0.3), + blurRadius: 4, + offset: const Offset(0, 2), + ), + ], + ), + child: const Icon( + Icons.flag, + color: Colors.white, + size: 20, + ), + ), + ], + ), + ), + ); + } + + void _showNodeInfo(BuildContext context, Contact contact) { + showDialog( + context: context, + builder: (context) => AlertDialog( + title: Row( + children: [ + Icon( + _getNodeIcon(contact.type), + color: _getNodeColor(contact.type), + ), + const SizedBox(width: 8), + Expanded(child: Text(contact.name)), + ], + ), + content: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + _buildInfoRow('Type', contact.typeLabel), + _buildInfoRow('Path', contact.pathLabel), + _buildInfoRow('Location', + '${contact.latitude!.toStringAsFixed(6)}, ${contact.longitude!.toStringAsFixed(6)}'), + _buildInfoRow('Last Seen', _formatLastSeen(contact.lastSeen)), + _buildInfoRow('Public Key', contact.publicKeyHex), + ], + ), + actions: [ + TextButton( + onPressed: () => Navigator.pop(context), + child: const Text('Close'), + ), + if (contact.type == advTypeChat) // Only show chat button for chat nodes + TextButton( + onPressed: () { + Navigator.pop(context); + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => ChatScreen(contact: contact), + ), + ); + }, + child: const Text('Open Chat'), + ), + ], + ), + ); + } + + void _showMarkerInfo(_SharedMarker marker) { + showDialog( + context: context, + builder: (context) => AlertDialog( + title: Text(marker.label), + content: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + _buildInfoRow('From', marker.fromName), + _buildInfoRow('Source', marker.sourceLabel), + _buildInfoRow( + 'Location', + '${marker.position.latitude.toStringAsFixed(6)}, ${marker.position.longitude.toStringAsFixed(6)}', + ), + if (marker.flags.isNotEmpty) _buildInfoRow('Flags', marker.flags), + ], + ), + actions: [ + TextButton( + onPressed: () { + setState(() { + _hiddenMarkerIds.add(marker.id); + }); + Navigator.pop(context); + }, + child: const Text('Hide'), + ), + TextButton( + onPressed: () async { + setState(() { + _hiddenMarkerIds.add(marker.id); + _removedMarkerIds.add(marker.id); + }); + await _markerService.saveRemovedIds(_removedMarkerIds); + if (context.mounted) { + Navigator.pop(context); + } + }, + child: const Text('Remove'), + ), + TextButton( + onPressed: () => Navigator.pop(context), + child: const Text('Close'), + ), + ], + ), + ); + } + + Widget _buildInfoRow(String label, String value) { + return Padding( + padding: const EdgeInsets.symmetric(vertical: 4.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + label, + style: TextStyle( + fontSize: 12, + color: Colors.grey[600], + fontWeight: FontWeight.w500, + ), + ), + const SizedBox(height: 2), + Text( + value, + style: const TextStyle(fontSize: 14), + ), + ], + ), + ); + } + + String _formatLastSeen(DateTime lastSeen) { + final now = DateTime.now(); + final difference = now.difference(lastSeen); + + if (difference.inSeconds < 60) { + return 'Just now'; + } else if (difference.inMinutes < 60) { + return '${difference.inMinutes}m ago'; + } else if (difference.inHours < 24) { + return '${difference.inHours}h ago'; + } else { + return '${difference.inDays}d ago'; + } + } + + void _showShareMarkerAtPositionSheet({ + required BuildContext context, + required MeshCoreConnector connector, + required LatLng position, + }) { + showModalBottomSheet( + context: context, + builder: (sheetContext) => SafeArea( + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + ListTile( + leading: const Icon(Icons.place), + title: const Text('Share marker here'), + onTap: () { + Navigator.pop(sheetContext); + _shareMarker( + context: context, + connector: connector, + position: position, + defaultLabel: 'Point of interest', + flags: 'poi', + ); + }, + ), + ListTile( + leading: const Icon(Icons.close), + title: const Text('Cancel'), + onTap: () => Navigator.pop(sheetContext), + ), + ], + ), + ), + ); + } + + Future _shareMarker({ + required BuildContext context, + required MeshCoreConnector connector, + required LatLng position, + required String defaultLabel, + required String flags, + }) async { + if (!connector.isConnected) { + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar(content: Text('Connect to a device to share markers')), + ); + return; + } + + final label = await _promptForLabel(context, defaultLabel); + if (label == null) return; + + final markerText = _formatMarkerMessage(position, label, flags); + await _showRecipientSheet( + context: context, + connector: connector, + markerText: markerText, + ); + } + + Future _promptForLabel(BuildContext context, String defaultLabel) async { + final controller = TextEditingController(text: defaultLabel); + return showDialog( + context: context, + builder: (dialogContext) => AlertDialog( + title: const Text('Pin label'), + content: TextField( + controller: controller, + decoration: const InputDecoration( + hintText: 'Label', + border: OutlineInputBorder(), + ), + ), + actions: [ + TextButton( + onPressed: () => Navigator.pop(dialogContext), + child: const Text('Cancel'), + ), + TextButton( + onPressed: () { + final label = controller.text.trim().replaceAll('|', '/'); + Navigator.pop(dialogContext, label.isEmpty ? defaultLabel : label); + }, + child: const Text('Continue'), + ), + ], + ), + ); + } + + String _formatMarkerMessage(LatLng position, String label, String flags) { + final lat = position.latitude.toStringAsFixed(6); + final lon = position.longitude.toStringAsFixed(6); + return 'm:$lat,$lon|$label|$flags'; + } + + Future _showRecipientSheet({ + required BuildContext context, + required MeshCoreConnector connector, + required String markerText, + }) async { + if (!connector.isLoadingChannels && connector.channels.isEmpty) { + connector.getChannels(); + } + String query = ''; + + await showModalBottomSheet( + context: context, + builder: (sheetContext) => StatefulBuilder( + builder: (sheetContext, setSheetState) { + return Consumer( + builder: (context, liveConnector, child) { + final allContacts = liveConnector.contacts + .where((contact) => + contact.type != advTypeRepeater && contact.type != advTypeRoom) + .toList(); + return SafeArea( + child: SingleChildScrollView( + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const Padding( + padding: EdgeInsets.fromLTRB(16, 12, 16, 4), + child: Text('Send to contact', style: TextStyle(fontWeight: FontWeight.bold)), + ), + Padding( + padding: const EdgeInsets.fromLTRB(16, 4, 16, 8), + child: TextField( + decoration: InputDecoration( + hintText: 'Search contacts...', + prefixIcon: const Icon(Icons.search), + border: OutlineInputBorder( + borderRadius: BorderRadius.circular(12), + ), + contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12), + ), + onChanged: (value) { + setSheetState(() { + query = value.toLowerCase(); + }); + }, + ), + ), + ...allContacts + .where((contact) => + query.isEmpty || + contact.name.toLowerCase().contains(query)) + .map((contact) { + return ListTile( + leading: const Icon(Icons.person), + title: Text(contact.name), + onTap: () { + Navigator.pop(sheetContext); + liveConnector.sendMessage(contact, markerText); + }, + ); + }), + const Padding( + padding: EdgeInsets.fromLTRB(16, 12, 16, 4), + child: Text('Send to channel', style: TextStyle(fontWeight: FontWeight.bold)), + ), + if (liveConnector.isLoadingChannels) + const Padding( + padding: EdgeInsets.symmetric(horizontal: 16, vertical: 8), + child: LinearProgressIndicator(), + ) + else if (liveConnector.channels.where((c) => !c.isEmpty).isEmpty) + const Padding( + padding: EdgeInsets.symmetric(horizontal: 16, vertical: 8), + child: Text('No channels available'), + ) + else + ...liveConnector.channels.where((c) => !c.isEmpty).map((channel) { + final isPublic = _isPublicChannel(channel); + final label = channel.name.isEmpty ? 'Channel ${channel.index}' : channel.name; + return ListTile( + leading: Icon( + isPublic ? Icons.public : Icons.tag, + color: isPublic ? Colors.orange : Colors.blue, + ), + title: Text(label), + subtitle: isPublic ? const Text('Public channel') : null, + onTap: () async { + Navigator.pop(sheetContext); + final canSend = isPublic + ? await _confirmPublicShare(context, label) + : true; + if (canSend) { + liveConnector.sendChannelMessage(channel, markerText); + } + }, + ); + }), + ], + ), + ), + ); + }, + ); + }, + ), + ); + } + + bool _isPublicChannel(Channel channel) { + return channel.pskBase64 == Channel.publicChannelPsk; + } + + Future _confirmPublicShare(BuildContext context, String channelLabel) async { + final result = await showDialog( + context: context, + builder: (dialogContext) => AlertDialog( + title: const Text('Public location share'), + content: Text( + 'You are about to share a location in $channelLabel. ' + 'This channel is public and anyone with the PSK can see it.', + ), + actions: [ + TextButton( + onPressed: () => Navigator.pop(dialogContext, false), + child: const Text('Cancel'), + ), + TextButton( + onPressed: () => Navigator.pop(dialogContext, true), + child: const Text('Share'), + ), + ], + ), + ); + return result ?? false; + } + + void _showFilterDialog(BuildContext context, AppSettingsService settingsService) { + showDialog( + context: context, + builder: (dialogContext) => AlertDialog( + title: const Text('Filter Nodes'), + contentPadding: const EdgeInsets.fromLTRB(24, 20, 24, 0), + content: SingleChildScrollView( + child: Consumer( + builder: (context, service, child) { + final settings = service.settings; + return Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const Text( + 'Node Types', + style: TextStyle( + fontWeight: FontWeight.bold, + fontSize: 16, + ), + ), + const SizedBox(height: 8), + CheckboxListTile( + title: const Text('Chat Nodes'), + value: settings.mapShowChatNodes, + onChanged: (value) { + service.setMapShowChatNodes(value ?? true); + }, + contentPadding: EdgeInsets.zero, + ), + CheckboxListTile( + title: const Text('Repeaters'), + value: settings.mapShowRepeaters, + onChanged: (value) { + service.setMapShowRepeaters(value ?? true); + }, + contentPadding: EdgeInsets.zero, + ), + CheckboxListTile( + title: const Text('Other Nodes'), + value: settings.mapShowOtherNodes, + onChanged: (value) { + service.setMapShowOtherNodes(value ?? true); + }, + contentPadding: EdgeInsets.zero, + ), + const SizedBox(height: 16), + const Text( + 'Key Prefix', + style: TextStyle( + fontWeight: FontWeight.bold, + fontSize: 16, + ), + ), + const SizedBox(height: 8), + CheckboxListTile( + title: const Text('Filter by key prefix'), + value: settings.mapKeyPrefixEnabled, + onChanged: (value) { + service.setMapKeyPrefixEnabled(value ?? false); + }, + contentPadding: EdgeInsets.zero, + ), + TextFormField( + initialValue: settings.mapKeyPrefix, + enabled: settings.mapKeyPrefixEnabled, + decoration: const InputDecoration( + labelText: 'Public key prefix', + hintText: 'e.g. ab12', + border: OutlineInputBorder(), + isDense: true, + ), + onChanged: (value) { + service.setMapKeyPrefix(value); + }, + ), + const SizedBox(height: 16), + const Text( + 'Markers', + style: TextStyle( + fontWeight: FontWeight.bold, + fontSize: 16, + ), + ), + const SizedBox(height: 8), + CheckboxListTile( + title: const Text('Show shared markers'), + value: settings.mapShowMarkers, + onChanged: (value) { + service.setMapShowMarkers(value ?? true); + }, + contentPadding: EdgeInsets.zero, + ), + const SizedBox(height: 16), + const Text( + 'Last Seen Time', + style: TextStyle( + fontWeight: FontWeight.bold, + fontSize: 16, + ), + ), + const SizedBox(height: 8), + Text( + _getTimeFilterLabel(settings.mapTimeFilterHours), + style: TextStyle( + fontSize: 14, + color: Colors.grey[700], + ), + ), + Slider( + value: _hoursToSliderValue(settings.mapTimeFilterHours), + min: 0, + max: 100, + divisions: 100, + onChanged: (value) { + final hours = _sliderValueToHours(value); + service.setMapTimeFilterHours(hours); + }, + ), + ], + ); + }, + ), + ), + actions: [ + TextButton( + onPressed: () => Navigator.pop(dialogContext), + child: const Text('Close'), + ), + ], + ), + ); + } + + // Convert hours to slider value (0-100) with exponential scaling + double _hoursToSliderValue(double hours) { + if (hours == 0) return 100; // All time + + // Map hours exponentially + // 0-24h: 0-40 + // 24h-7d: 40-60 + // 7d-30d: 60-80 + // 30d-6mo: 80-99 + // All time: 100 + + if (hours <= 24) { + return (hours / 24) * 40; + } else if (hours <= 168) { // 7 days + return 40 + ((hours - 24) / (168 - 24)) * 20; + } else if (hours <= 720) { // 30 days + return 60 + ((hours - 168) / (720 - 168)) * 20; + } else if (hours <= 4380) { // 6 months + return 80 + ((hours - 720) / (4380 - 720)) * 19; + } else { + return 100; + } + } + + // Convert slider value (0-100) to hours with exponential scaling + double _sliderValueToHours(double value) { + if (value >= 99.5) return 0; // All time + + if (value <= 40) { + return (value / 40) * 24; // 0-24 hours + } else if (value <= 60) { + return 24 + ((value - 40) / 20) * (168 - 24); // 1-7 days + } else if (value <= 80) { + return 168 + ((value - 60) / 20) * (720 - 168); // 7-30 days + } else { + return 720 + ((value - 80) / 19) * (4380 - 720); // 30 days - 6 months + } + } + + String _getTimeFilterLabel(double hours) { + if (hours == 0) return 'All Time'; + + if (hours < 1) { + return '${(hours * 60).round()} minutes'; + } else if (hours < 24) { + return '${hours.round()} ${hours.round() == 1 ? 'hour' : 'hours'}'; + } else if (hours < 168) { + final days = (hours / 24).round(); + return '$days ${days == 1 ? 'day' : 'days'}'; + } else if (hours < 720) { + final weeks = (hours / 168).round(); + return '$weeks ${weeks == 1 ? 'week' : 'weeks'}'; + } else if (hours < 4380) { + final months = (hours / 730).round(); + return '$months ${months == 1 ? 'month' : 'months'}'; + } else { + return 'All Time'; + } + } +} + +class _MarkerPayload { + final LatLng position; + final String label; + final String flags; + + _MarkerPayload({ + required this.position, + required this.label, + required this.flags, + }); +} + +class _SharedMarker { + final String id; + final LatLng position; + final String label; + final String flags; + final String fromName; + final String sourceLabel; + final bool isChannel; + final bool isPublicChannel; + + _SharedMarker({ + required this.id, + required this.position, + required this.label, + required this.flags, + required this.fromName, + required this.sourceLabel, + required this.isChannel, + required this.isPublicChannel, + }); +} diff --git a/lib/screens/repeater_cli_screen.dart b/lib/screens/repeater_cli_screen.dart new file mode 100644 index 00000000..d91a4f60 --- /dev/null +++ b/lib/screens/repeater_cli_screen.dart @@ -0,0 +1,528 @@ +import 'dart:async'; +import 'dart:typed_data'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; +import '../models/contact.dart'; +import '../connector/meshcore_connector.dart'; +import '../connector/meshcore_protocol.dart'; +import '../widgets/debug_frame_viewer.dart'; +import '../services/repeater_command_service.dart'; + +class RepeaterCliScreen extends StatefulWidget { + final Contact repeater; + final String password; + + const RepeaterCliScreen({ + super.key, + required this.repeater, + required this.password, + }); + + @override + State createState() => _RepeaterCliScreenState(); +} + +class _RepeaterCliScreenState extends State { + final TextEditingController _commandController = TextEditingController(); + final ScrollController _scrollController = ScrollController(); + final List> _commandHistory = []; + int _historyIndex = -1; + StreamSubscription? _frameSubscription; + RepeaterCommandService? _commandService; + + // Common commands for quick access + final List> _quickCommands = [ + {'label': 'Get Name', 'command': 'get name'}, + {'label': 'Get Radio', 'command': 'get radio'}, + {'label': 'Get TX', 'command': 'get tx'}, + {'label': 'Neighbors', 'command': 'neighbors'}, + {'label': 'Version', 'command': 'ver'}, + {'label': 'Advertise', 'command': 'advert'}, + {'label': 'Clock', 'command': 'clock'}, + ]; + + @override + void initState() { + super.initState(); + final connector = Provider.of(context, listen: false); + _commandService = RepeaterCommandService(connector); + _setupMessageListener(); + } + + @override + void dispose() { + _frameSubscription?.cancel(); + _commandService?.dispose(); + _commandController.dispose(); + _scrollController.dispose(); + super.dispose(); + } + + void _setupMessageListener() { + final connector = Provider.of(context, listen: false); + + // Listen for incoming text messages from the repeater + _frameSubscription = connector.receivedFrames.listen((frame) { + if (frame.isEmpty) return; + + // Check if it's a text message response + if (frame[0] == respCodeContactMsgRecv || + frame[0] == respCodeContactMsgRecvV3) { + _handleTextMessageResponse(frame); + } + }); + } + + void _handleTextMessageResponse(Uint8List frame) { + final parsed = parseContactMessageText(frame); + if (parsed == null) return; + if (!_matchesRepeaterPrefix(parsed.senderPrefix)) return; + + // Notify command service of response (for retry handling) + _commandService?.handleResponse(widget.repeater, parsed.text); + + // Note: The command service will handle the response via the Future + // We don't need to add it to history here anymore as _sendCommand will do it + } + + bool _matchesRepeaterPrefix(Uint8List prefix) { + final target = widget.repeater.publicKey; + if (target.length < 6 || prefix.length < 6) return false; + for (int i = 0; i < 6; i++) { + if (prefix[i] != target[i]) return false; + } + return true; + } + + void _sendCommand({bool showDebug = false}) async { + final command = _commandController.text.trim(); + if (command.isEmpty) return; + + setState(() { + _commandHistory.add({ + 'type': 'command', + 'text': command, + 'timestamp': DateTime.now().toString(), + }); + }); + + // Show debug info if requested + if (showDebug && mounted) { + final frame = buildSendCliCommandFrame(widget.repeater.publicKey, command); + DebugFrameViewer.showFrameDebug(context, frame, 'CLI Command Frame'); + } + + // Send CLI command to repeater with retry + try { + if (_commandService != null) { + final response = await _commandService!.sendCommand( + widget.repeater, + command, + ); + + if (mounted) { + setState(() { + _commandHistory.add({ + 'type': 'response', + 'text': response, + 'timestamp': DateTime.now().toString(), + }); + }); + } + } + } catch (e) { + if (mounted) { + setState(() { + _commandHistory.add({ + 'type': 'response', + 'text': 'Error: $e', + 'timestamp': DateTime.now().toString(), + }); + }); + } + } + + _commandController.clear(); + _historyIndex = -1; + + // Auto-scroll to bottom + Future.delayed(const Duration(milliseconds: 100), () { + if (_scrollController.hasClients) { + _scrollController.animateTo( + _scrollController.position.maxScrollExtent, + duration: const Duration(milliseconds: 200), + curve: Curves.easeOut, + ); + } + }); + } + + void _useQuickCommand(String command) { + _commandController.text = command; + _sendCommand(); + } + + void _navigateHistory(bool up) { + final commands = _commandHistory + .where((entry) => entry['type'] == 'command') + .toList() + .reversed + .toList(); + + if (commands.isEmpty) return; + + if (up) { + if (_historyIndex < commands.length - 1) { + _historyIndex++; + } + } else { + if (_historyIndex > 0) { + _historyIndex--; + } else { + _historyIndex = -1; + _commandController.clear(); + return; + } + } + + if (_historyIndex >= 0 && _historyIndex < commands.length) { + _commandController.text = commands[_historyIndex]['text'] ?? ''; + _commandController.selection = TextSelection.fromPosition( + TextPosition(offset: _commandController.text.length), + ); + } + } + + void _clearHistory() { + setState(() { + _commandHistory.clear(); + _historyIndex = -1; + }); + } + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + const Text('Repeater CLI'), + Text( + widget.repeater.name, + style: const TextStyle(fontSize: 14, fontWeight: FontWeight.normal), + ), + ], + ), + centerTitle: false, + actions: [ + IconButton( + icon: const Icon(Icons.bug_report), + tooltip: 'Debug Next Command', + onPressed: () { + // Set a flag or just send next command with debug + if (_commandController.text.trim().isNotEmpty) { + _sendCommand(showDebug: true); + } else { + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar(content: Text('Enter a command first')), + ); + } + }, + ), + IconButton( + icon: const Icon(Icons.help_outline), + tooltip: 'Command Help', + onPressed: () => _showCommandHelp(context), + ), + IconButton( + icon: const Icon(Icons.clear_all), + tooltip: 'Clear History', + onPressed: _commandHistory.isEmpty ? null : _clearHistory, + ), + ], + ), + body: Column( + children: [ + _buildQuickCommandsBar(), + const Divider(height: 1), + Expanded( + child: _commandHistory.isEmpty + ? _buildEmptyState() + : _buildCommandHistory(), + ), + const Divider(height: 1), + _buildCommandInput(), + ], + ), + ); + } + + Widget _buildQuickCommandsBar() { + return Container( + padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 8), + child: SingleChildScrollView( + scrollDirection: Axis.horizontal, + child: Row( + children: _quickCommands.map((cmd) { + return Padding( + padding: const EdgeInsets.only(right: 8), + child: ActionChip( + label: Text(cmd['label']!), + onPressed: () => _useQuickCommand(cmd['command']!), + avatar: const Icon(Icons.play_arrow, size: 16), + ), + ); + }).toList(), + ), + ), + ); + } + + Widget _buildEmptyState() { + return Center( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon(Icons.terminal, size: 64, color: Colors.grey[400]), + const SizedBox(height: 16), + Text( + 'No commands sent yet', + style: TextStyle(fontSize: 16, color: Colors.grey[600]), + ), + const SizedBox(height: 8), + Text( + 'Type a command below or use quick commands', + style: TextStyle(fontSize: 14, color: Colors.grey[500]), + ), + ], + ), + ); + } + + Widget _buildCommandHistory() { + return ListView.builder( + controller: _scrollController, + padding: const EdgeInsets.all(16), + itemCount: _commandHistory.length, + itemBuilder: (context, index) { + final entry = _commandHistory[index]; + final isCommand = entry['type'] == 'command'; + + return Padding( + padding: const EdgeInsets.only(bottom: 12), + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + padding: const EdgeInsets.all(6), + decoration: BoxDecoration( + color: isCommand + ? Theme.of(context).colorScheme.primaryContainer + : Theme.of(context).colorScheme.secondaryContainer, + borderRadius: BorderRadius.circular(4), + ), + child: Icon( + isCommand ? Icons.chevron_right : Icons.arrow_back, + size: 16, + color: isCommand + ? Theme.of(context).colorScheme.onPrimaryContainer + : Theme.of(context).colorScheme.onSecondaryContainer, + ), + ), + const SizedBox(width: 12), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SelectableText( + entry['text']!, + style: TextStyle( + fontFamily: 'monospace', + fontSize: 13, + color: isCommand + ? Theme.of(context).colorScheme.primary + : Theme.of(context).colorScheme.onSurface, + ), + ), + ], + ), + ), + ], + ), + ); + }, + ); + } + + Widget _buildCommandInput() { + return Container( + padding: const EdgeInsets.all(12), + color: Theme.of(context).colorScheme.surface, + child: SafeArea( + child: Row( + children: [ + IconButton( + icon: const Icon(Icons.arrow_upward, size: 20), + tooltip: 'Previous command', + onPressed: () => _navigateHistory(true), + ), + IconButton( + icon: const Icon(Icons.arrow_downward, size: 20), + tooltip: 'Next command', + onPressed: () => _navigateHistory(false), + ), + const SizedBox(width: 8), + Expanded( + child: TextField( + controller: _commandController, + decoration: const InputDecoration( + hintText: 'Enter command...', + border: OutlineInputBorder(), + contentPadding: EdgeInsets.symmetric(horizontal: 16, vertical: 12), + prefixText: '> ', + ), + style: const TextStyle(fontFamily: 'monospace'), + textInputAction: TextInputAction.send, + onSubmitted: (_) => _sendCommand(), + ), + ), + const SizedBox(width: 8), + IconButton.filled( + icon: const Icon(Icons.send), + onPressed: _sendCommand, + ), + ], + ), + ), + ); + } + + void _showCommandHelp(BuildContext context) { + showDialog( + context: context, + builder: (context) => AlertDialog( + title: const Text('Commands List'), + content: SingleChildScrollView( + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const Text( + 'NOTE: for the various "set ..." commands, there is also a "get ..." command.', + style: TextStyle(fontSize: 13), + ), + const SizedBox(height: 16), + _buildHelpSection('General', [ + 'advert - Sends an advertisement packet', + "reboot - Reboots the device. (note, you'll prob get 'Timeout' which is normal)", + "clock - Displays current time per device's clock.", + 'password {new-password} - Sets a new admin password for the device.', + 'ver - Shows the device version and firmware build date.', + 'clear stats - Resets various stats counters to zero.', + ]), + const SizedBox(height: 16), + _buildHelpSection('Settings', [ + 'set af {air-time-factor} - Sets the air-time-factor.', + 'set tx {tx-power-dbm} - Sets LoRa transmit power in dBm. (reboot to apply)', + 'set repeat {on|off} - Enables or disables the repeater role for this node.', + "set allow.read.only {on|off} - (Room server) If 'on', then login in blank password will be allowed, but cannot Post to room. (just read only)", + 'set flood.max {max-hops} - Sets the maximum number of hops of inbound flood packet (if >= max, packet is not forwarded)', + 'set int.thresh {db} - Sets the Interference Threshold (in DB). Default is 14. Set to 0 to disable channel interference detection.', + 'set agc.reset.interval {seconds} - Sets the interval to reset the Auto Gain Controller. Set to 0 to disable.', + "set multi.acks {0|1} - Enables or disables the 'double ACKs' feature.", + 'set advert.interval {minutes} - Sets the timer interval in minutes to send a local (zero-hop) advertisement packet. Set to 0 to disable.', + 'set flood.advert.interval {hours} - Sets the timer interval in hours to send a flood advertisement packet. Set to 0 to disable.', + 'set guest.password {guess-password} - Sets/updates the guest password. (for repeaters, guest logins can send the "Get Stats" request)', + 'set name {name} - Sets the advertisement name.', + 'set lat {latitude} - Sets the advertisement map latitude. (decimal degrees)', + 'set lon {longitude} - Sets the advertisement map longitude. (decimal degrees)', + 'set radio {freq},{bw},{sf},{cr} - Sets completely new radio params, and saves to preferences. Requires a "reboot" command to apply.', + 'set rxdelay {base} - Sets (experimental) base (must be > 1 for effect) for applying slight delay to received packets, based on signal strength/score. Set to 0 to disable.', + 'set txdelay {factor} - Sets a factor multiplied with time-on-air for a flood-mode packet and with a randomized slot system, to delay its forwarding. (to decrease likelihood of collisions)', + 'set direct.txdelay {factor} - Same as txdelay, but for applying a random delay to the forwarding of direct-mode packets.', + 'set bridge.enabled {on|off} - Enable/Disable bridge.', + 'set bridge.delay {0-10000} - Set delay before retransmitting packets.', + 'set bridge.source {rx|tx} - Choose wether the bridge will retransmit received packets or transmitted packets.', + 'set bridge.baud {speed} - Set serial link baudrate for rs232 bridges.', + 'set bridge.secret {shared-secret} - Set bridge secret for espnow bridges.', + 'set adc.multiplier {factor} - Sets custom factor to adjust reported battery voltage (only supported on select boards).', + 'tempradio {freq},{bw},{sf},{cr},{minutes} - Sets temporary radio params for the given number of {minutes}, reverting to original radio params afterward. (does NOT save to preferences).', + 'setperm {pubkey-hex} {permissions} - Modifies the ACL. Removes matching entry (by pubkey prefix) if "permissions" is zero. Adds new entry if pubkey-hex is full length and is not currently in ACL. Updates entry by matching pubkey prefix. Permission bits vary per firmware role, but low 2 bits are: 0 (Guest), 1 (Read only), 2 (Read write), 3 (Admin)', + ]), + const SizedBox(height: 16), + _buildHelpSection('Bridge', [ + 'get bridge.type - Gets bridge type none, rs232, espnow', + ]), + const SizedBox(height: 16), + _buildHelpSection('Logging', [ + 'log start - Starts packet logging to file system.', + 'log stop - Stops packet logging to file system.', + 'log erase - Erases the packet logs from file system.', + ]), + const SizedBox(height: 16), + _buildHelpSection('Neighbors (Repeater only)', [ + 'neighbors - Shows a list of other repeater nodes heard via zero-hop adverts. Each line is {id-prefix-hex}:{timestamp}:{snr-times-4}', + 'neighbor.remove {pubkey-prefix} - Removes first matching entry (by pubkey prefix (hex)), from neighbors list.', + ]), + const SizedBox(height: 16), + _buildHelpSection('Region Management (Repeater only)', [ + 'region commands have been introduced to manage region definitions and permissions.', + 'region - (serial only) Lists all defined regions and current flood permissions.', + 'region load - NOTE: this is a special multi-command invocation. Each subsequent command is a region name (indented with spaces to indicate parent hierarchy, with one space at minimum). Terminated by sending a blank line/command.', + "region get {* | name-prefix} - Searches for region with given name prefix (or '*' for the global scope). Replies with \"-> {region-name} ({parent-name}) {'F'}\"", + 'region put {name} {* | parent-name-prefix} - Adds or updates a region definition with given name.', + 'region remove {name} - Removes a region definition with given name. (must match exactly, and have no child regions)', + "region allowf {* | name-prefix} - Sets the 'F'lood permission for the given region. ('*' for the global/legacy scope)", + "region denyf {* | name-prefix} - Removes the 'F'lood permission for the given region. (NOTE: at this stage NOT advised to use this on the global/legacy scope!!)", + "region home - Replies with the current 'home' region. (Note applied anywhere yet, reserved for future)", + "region home {* | name-prefix} - Sets the 'home' region.", + 'region save - Persists the region list/map to storage.', + ]), + const SizedBox(height: 16), + _buildHelpSection('GPS Management', [ + 'gps command has been introduced to manage location related topics.', + 'gps - Gives status of gps. When gps is off, it replies only off, if on it replies with on, {status}, {fix}, {sat count}', + 'gps {on|off} - Toggles gps power state.', + 'gps sync - Syncs node time with gps clock.', + "gps setloc - Sets node's position to gps coordinates and save preferences.", + 'gps advert - Gives location advert configuration of the node:', + "none: don't include location in adverts", + 'share: share gps location (from SensorManager)', + 'prefs: advert the location stored in preferences', + 'gps advert {none|share|prefs} - Sets location advert configuration.', + ]), + ], + ), + ), + actions: [ + TextButton( + onPressed: () => Navigator.pop(context), + child: const Text('Close'), + ), + ], + ), + ); + } + + Widget _buildHelpSection(String title, List commands) { + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + title, + style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 16), + ), + const SizedBox(height: 8), + ...commands.map((cmd) => Padding( + padding: const EdgeInsets.only(left: 8, bottom: 4), + child: Text( + '• $cmd', + style: const TextStyle(fontSize: 13, fontFamily: 'monospace'), + ), + )), + ], + ); + } +} diff --git a/lib/screens/repeater_hub_screen.dart b/lib/screens/repeater_hub_screen.dart new file mode 100644 index 00000000..f28763e6 --- /dev/null +++ b/lib/screens/repeater_hub_screen.dart @@ -0,0 +1,204 @@ +import 'package:flutter/material.dart'; +import '../models/contact.dart'; +import 'repeater_status_screen.dart'; +import 'repeater_cli_screen.dart'; +import 'repeater_settings_screen.dart'; + +class RepeaterHubScreen extends StatelessWidget { + final Contact repeater; + final String password; + + const RepeaterHubScreen({ + super.key, + required this.repeater, + required this.password, + }); + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + const Text('Repeater Management'), + Text( + repeater.name, + style: const TextStyle(fontSize: 14, fontWeight: FontWeight.normal), + ), + ], + ), + centerTitle: false, + ), + body: Padding( + padding: const EdgeInsets.all(16), + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + // Repeater info card + Card( + child: Padding( + padding: const EdgeInsets.all(16), + child: Column( + children: [ + CircleAvatar( + radius: 40, + backgroundColor: Colors.orange, + child: const Icon(Icons.cell_tower, size: 40, color: Colors.white), + ), + const SizedBox(height: 16), + Text( + repeater.name, + style: const TextStyle(fontSize: 24, fontWeight: FontWeight.bold), + ), + const SizedBox(height: 8), + Text( + repeater.pathLabel, + style: TextStyle(fontSize: 14, color: Colors.grey[600]), + ), + if (repeater.hasLocation) ...[ + const SizedBox(height: 4), + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon(Icons.location_on, size: 14, color: Colors.grey[600]), + const SizedBox(width: 4), + Text( + '${repeater.latitude?.toStringAsFixed(4)}, ${repeater.longitude?.toStringAsFixed(4)}', + style: TextStyle(fontSize: 12, color: Colors.grey[600]), + ), + ], + ), + ], + ], + ), + ), + ), + const SizedBox(height: 24), + const Text( + 'Management Tools', + style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold), + ), + const SizedBox(height: 16), + // Status button + _buildManagementCard( + context, + icon: Icons.analytics, + title: 'Status', + subtitle: 'View repeater status, stats, and neighbors', + color: Colors.blue, + onTap: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => RepeaterStatusScreen( + repeater: repeater, + password: password, + ), + ), + ); + }, + ), + const SizedBox(height: 12), + // CLI button + _buildManagementCard( + context, + icon: Icons.terminal, + title: 'CLI', + subtitle: 'Send commands to the repeater', + color: Colors.green, + onTap: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => RepeaterCliScreen( + repeater: repeater, + password: password, + ), + ), + ); + }, + ), + const SizedBox(height: 12), + // Settings button + _buildManagementCard( + context, + icon: Icons.settings, + title: 'Settings', + subtitle: 'Configure repeater parameters', + color: Colors.orange, + onTap: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => RepeaterSettingsScreen( + repeater: repeater, + password: password, + ), + ), + ); + }, + ), + ], + ), + ), + ); + } + + Widget _buildManagementCard( + BuildContext context, { + required IconData icon, + required String title, + required String subtitle, + required Color color, + required VoidCallback onTap, + }) { + return Card( + elevation: 2, + child: InkWell( + onTap: onTap, + borderRadius: BorderRadius.circular(12), + child: Padding( + padding: const EdgeInsets.all(16), + child: Row( + children: [ + Container( + padding: const EdgeInsets.all(12), + decoration: BoxDecoration( + color: color.withValues(alpha: 0.1), + borderRadius: BorderRadius.circular(12), + ), + child: Icon(icon, color: color, size: 32), + ), + const SizedBox(width: 16), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + title, + style: const TextStyle( + fontSize: 18, + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 4), + Text( + subtitle, + style: TextStyle( + fontSize: 14, + color: Colors.grey[600], + ), + ), + ], + ), + ), + Icon(Icons.chevron_right, color: Colors.grey[400]), + ], + ), + ), + ), + ); + } +} diff --git a/lib/screens/repeater_settings_screen.dart b/lib/screens/repeater_settings_screen.dart new file mode 100644 index 00000000..494022d7 --- /dev/null +++ b/lib/screens/repeater_settings_screen.dart @@ -0,0 +1,1039 @@ +import 'dart:async'; +import 'dart:typed_data'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; +import '../models/contact.dart'; +import '../connector/meshcore_connector.dart'; +import '../connector/meshcore_protocol.dart'; +import '../services/repeater_command_service.dart'; + +class RepeaterSettingsScreen extends StatefulWidget { + final Contact repeater; + final String password; + + const RepeaterSettingsScreen({ + super.key, + required this.repeater, + required this.password, + }); + + @override + State createState() => _RepeaterSettingsScreenState(); +} + +class _RepeaterSettingsScreenState extends State { + bool _isLoading = false; + bool _hasChanges = false; + bool _refreshingBasic = false; + bool _refreshingRadio = false; + bool _refreshingLocation = false; + bool _refreshingFeatures = false; + bool _refreshingAdvertisement = false; + StreamSubscription? _frameSubscription; + RepeaterCommandService? _commandService; + final Map _fetchedSettings = {}; + + // Basic settings + final TextEditingController _nameController = TextEditingController(); + final TextEditingController _passwordController = TextEditingController(); + final TextEditingController _guestPasswordController = TextEditingController(); + + // Radio settings + final TextEditingController _freqController = TextEditingController(); + final TextEditingController _txPowerController = TextEditingController(); + int _bandwidth = 125000; + int _spreadingFactor = 9; + int _codingRate = 7; + + // Location settings + final TextEditingController _latController = TextEditingController(); + final TextEditingController _lonController = TextEditingController(); + + // Feature toggles + bool _repeatEnabled = true; + bool _allowReadOnly = false; + bool _privacyMode = false; + + // Advertisement settings + int _advertInterval = 120; // minutes/2 + int _floodAdvertInterval = 12; // hours + int _privAdvertInterval = 60; // minutes + + final List _bandwidthOptions = [ + 7800, + 10400, + 15600, + 20800, + 31250, + 41700, + 62500, + 125000, + 250000, + 500000, + ]; + final List _spreadingFactorOptions = [5, 6, 7, 8, 9, 10, 11, 12]; + final List _codingRateOptions = [5, 6, 7, 8]; + + @override + void initState() { + super.initState(); + final connector = Provider.of(context, listen: false); + _commandService = RepeaterCommandService(connector); + _setupMessageListener(); + _loadSettings(); + } + + @override + void dispose() { + _frameSubscription?.cancel(); + _commandService?.dispose(); + _nameController.dispose(); + _passwordController.dispose(); + _guestPasswordController.dispose(); + _freqController.dispose(); + _txPowerController.dispose(); + _latController.dispose(); + _lonController.dispose(); + super.dispose(); + } + + void _setupMessageListener() { + final connector = Provider.of(context, listen: false); + + // Listen for incoming text messages from the repeater + _frameSubscription = connector.receivedFrames.listen((frame) { + if (frame.isEmpty) return; + + // Check if it's a text message response + if (frame[0] == respCodeContactMsgRecv || + frame[0] == respCodeContactMsgRecvV3) { + _handleTextMessageResponse(frame); + } + }); + } + + void _handleTextMessageResponse(Uint8List frame) { + final parsed = parseContactMessageText(frame); + if (parsed == null) return; + if (!_matchesRepeaterPrefix(parsed.senderPrefix)) return; + + // Notify command service of response (for retry handling) + _commandService?.handleResponse(widget.repeater, parsed.text); + } + + bool _matchesRepeaterPrefix(Uint8List prefix) { + final target = widget.repeater.publicKey; + if (target.length < 6 || prefix.length < 6) return false; + for (int i = 0; i < 6; i++) { + if (prefix[i] != target[i]) return false; + } + return true; + } + + void _updateUIFromFetchedSettings() { + if (_fetchedSettings.isEmpty) return; + + setState(() { + // Update name + if (_fetchedSettings.containsKey('name')) { + _nameController.text = _fetchedSettings['name']!; + } + + // Update radio settings - parse "915.00,250.00,9,7" or unit-labeled variants + if (_fetchedSettings.containsKey('radio')) { + final radioStr = _fetchedSettings['radio']!; + final parts = radioStr.split(','); + final parsed = []; + for (final part in parts) { + final trimmed = part.trim(); + if (trimmed.isNotEmpty) { + parsed.add(trimmed); + } + } + if (parsed.isNotEmpty) { + final freqText = parsed.first + .replaceAll('MHz', '') + .replaceAll('mhz', '') + .trim(); + if (freqText.isNotEmpty) { + _freqController.text = freqText; + } + } + if (parsed.length > 1) { + final bwText = parsed[1] + .replaceAll('kHz', '') + .replaceAll('khz', '') + .trim(); + final bw = double.tryParse(bwText); + if (bw != null) { + _bandwidth = (bw * 1000).toInt(); + if (!_bandwidthOptions.contains(_bandwidth)) { + _bandwidthOptions.add(_bandwidth); + _bandwidthOptions.sort(); + } + } + } + if (parsed.length > 2) { + final sfText = parsed[2].replaceAll('SF', '').replaceAll('sf', '').trim(); + _spreadingFactor = int.tryParse(sfText) ?? _spreadingFactor; + } + if (parsed.length > 3) { + final crText = parsed[3].replaceAll('CR', '').replaceAll('cr', '').trim(); + _codingRate = int.tryParse(crText) ?? _codingRate; + } + } + + if (_fetchedSettings.containsKey('tx')) { + _txPowerController.text = _fetchedSettings['tx']!; + } + + if (_fetchedSettings.containsKey('lat')) { + _latController.text = _fetchedSettings['lat']!; + } + if (_fetchedSettings.containsKey('lon')) { + _lonController.text = _fetchedSettings['lon']!; + } + + if (_fetchedSettings.containsKey('repeat')) { + _repeatEnabled = _normalizeOnOff(_fetchedSettings['repeat']!); + } + if (_fetchedSettings.containsKey('allow.read.only')) { + _allowReadOnly = _normalizeOnOff(_fetchedSettings['allow.read.only']!); + } + if (_fetchedSettings.containsKey('privacy')) { + _privacyMode = _normalizeOnOff(_fetchedSettings['privacy']!); + } + + if (_fetchedSettings.containsKey('advert.interval')) { + _advertInterval = _parseIntWithFallback( + _fetchedSettings['advert.interval']!, + _advertInterval, + ); + } + if (_fetchedSettings.containsKey('flood.advert.interval')) { + _floodAdvertInterval = _parseIntWithFallback( + _fetchedSettings['flood.advert.interval']!, + _floodAdvertInterval, + ); + } + if (_fetchedSettings.containsKey('priv.advert.interval')) { + _privAdvertInterval = _parseIntWithFallback( + _fetchedSettings['priv.advert.interval']!, + _privAdvertInterval, + ); + } + }); + } + + bool _isAnySectionRefreshing() { + return _refreshingBasic || + _refreshingRadio || + _refreshingLocation || + _refreshingFeatures || + _refreshingAdvertisement; + } + + bool _normalizeOnOff(String value) { + final normalized = value.trim().toLowerCase(); + return normalized == 'on' || + normalized == 'true' || + normalized == '1' || + normalized == 'enabled'; + } + + int _parseIntWithFallback(String value, int fallback) { + final parsed = int.tryParse(value.replaceAll(RegExp(r'[^0-9-]'), '')); + return parsed ?? fallback; + } + + String _formatBandwidthLabel(int bandwidthHz) { + final bandwidthKHz = bandwidthHz / 1000; + var text = bandwidthKHz.toStringAsFixed(2); + text = text.replaceAll(RegExp(r'0+$'), '').replaceAll(RegExp(r'\.$'), ''); + return '$text kHz'; + } + + void _applySettingResponse(String command, String response) { + final value = _extractCliValue(response); + if (value == null) return; + + final normalized = command.trim().toLowerCase(); + if (!normalized.startsWith('get ')) return; + final key = normalized.substring(4); + + switch (key) { + case 'name': + case 'radio': + case 'tx': + case 'lat': + case 'lon': + case 'repeat': + case 'allow.read.only': + case 'privacy': + case 'advert.interval': + case 'flood.advert.interval': + case 'priv.advert.interval': + _fetchedSettings[key] = value; + break; + } + } + + String? _extractCliValue(String response) { + final lines = response.split('\n'); + for (final line in lines) { + final trimmed = line.trim(); + if (trimmed.isEmpty) continue; + if (trimmed.startsWith('>')) { + final value = trimmed.substring(1).trim(); + if (value.isNotEmpty) return value; + } + final colonIndex = trimmed.indexOf(':'); + if (colonIndex > 0) { + final value = trimmed.substring(colonIndex + 1).trim(); + if (value.isNotEmpty) return value; + } + } + return null; + } + + Future _refreshSection({ + required String label, + required List commands, + required ValueSetter setRefreshing, + }) async { + if (_commandService == null) return; + + setState(() { + setRefreshing(true); + _fetchedSettings.clear(); + }); + + var successCount = 0; + for (final command in commands) { + try { + final response = await _commandService!.sendCommand(widget.repeater, command); + _applySettingResponse(command, response); + successCount += 1; + await Future.delayed(const Duration(milliseconds: 200)); + } catch (e) { + debugPrint('Error fetching $command: $e'); + } + } + + if (mounted) { + if (successCount > 0) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text('$label refreshed'), + backgroundColor: Colors.green, + ), + ); + } else { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text('Error refreshing $label'), + backgroundColor: Colors.red, + ), + ); + } + + if (_fetchedSettings.isNotEmpty) { + _updateUIFromFetchedSettings(); + } + setState(() { + setRefreshing(false); + }); + } + } + + Future _refreshBasicSettings() async { + await _refreshSection( + label: 'Basic settings', + commands: const ['get name'], + setRefreshing: (value) => _refreshingBasic = value, + ); + } + + Future _refreshRadioSettings() async { + await _refreshSection( + label: 'Radio settings', + commands: const ['get radio', 'get tx'], + setRefreshing: (value) => _refreshingRadio = value, + ); + } + + Future _refreshLocationSettings() async { + await _refreshSection( + label: 'Location settings', + commands: const ['get lat', 'get lon'], + setRefreshing: (value) => _refreshingLocation = value, + ); + } + + Future _refreshFeatureSettings() async { + await _refreshSection( + label: 'Feature toggles', + commands: const ['get repeat', 'get allow.read.only', 'get privacy'], + setRefreshing: (value) => _refreshingFeatures = value, + ); + } + + Future _refreshAdvertisementSettings() async { + await _refreshSection( + label: 'Advertisement settings', + commands: const [ + 'get advert.interval', + 'get flood.advert.interval', + 'get priv.advert.interval', + ], + setRefreshing: (value) => _refreshingAdvertisement = value, + ); + } + + Future _loadSettings() async { + // Just populate with current repeater data on initial load + // User must click sync button to fetch from device + setState(() { + _nameController.text = widget.repeater.name; + + if (widget.repeater.hasLocation) { + _latController.text = widget.repeater.latitude?.toString() ?? ''; + _lonController.text = widget.repeater.longitude?.toString() ?? ''; + } + }); + } + + Future _saveSettings() async { + final connector = Provider.of(context, listen: false); + + setState(() { + _isLoading = true; + }); + + try { + final commands = []; + + // Build set commands for each setting + if (_nameController.text.isNotEmpty) { + commands.add('set name ${_nameController.text}'); + } + + if (_passwordController.text.isNotEmpty) { + commands.add('password ${_passwordController.text}'); + } + + if (_guestPasswordController.text.isNotEmpty) { + commands.add('set guest.password ${_guestPasswordController.text}'); + } + + // Radio parameters + final freqMHz = double.tryParse(_freqController.text) ?? 915.0; + final bwKHz = _bandwidth / 1000; + commands.add('set radio ${freqMHz.toStringAsFixed(1)} $bwKHz $_spreadingFactor $_codingRate'); + + // Location + if (_latController.text.isNotEmpty) { + commands.add('set lat ${_latController.text}'); + } + if (_lonController.text.isNotEmpty) { + commands.add('set lon ${_lonController.text}'); + } + + // Feature toggles + commands.add('set repeat ${_repeatEnabled ? "on" : "off"}'); + commands.add('set allow.read.only ${_allowReadOnly ? "on" : "off"}'); + commands.add('set privacy ${_privacyMode ? "on" : "off"}'); + + // Advertisement intervals + commands.add('set advert.interval ${_advertInterval}'); + commands.add('set flood.advert.interval ${_floodAdvertInterval}'); + if (_privacyMode) { + commands.add('set priv.advert.interval ${_privAdvertInterval}'); + } + + // Send all commands + for (final command in commands) { + final frame = buildSendCliCommandFrame(widget.repeater.publicKey, command); + await connector.sendFrame(frame); + await Future.delayed(const Duration(milliseconds: 200)); // Delay between commands + } + + setState(() { + _isLoading = false; + _hasChanges = false; + }); + + if (mounted) { + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar( + content: Text('Settings saved successfully'), + backgroundColor: Colors.green, + ), + ); + } + } catch (e) { + setState(() { + _isLoading = false; + }); + + if (mounted) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text('Error saving settings: $e'), + backgroundColor: Colors.red, + ), + ); + } + } + } + + void _markChanged() { + if (!_hasChanges) { + setState(() { + _hasChanges = true; + }); + } + } + + Widget _buildSectionHeader({ + required IconData icon, + required String title, + required bool isRefreshing, + required VoidCallback onRefresh, + }) { + return Row( + children: [ + Icon(icon, color: Theme.of(context).primaryColor), + const SizedBox(width: 8), + Text( + title, + style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold), + ), + const Spacer(), + IconButton( + icon: isRefreshing + ? const SizedBox( + width: 18, + height: 18, + child: CircularProgressIndicator(strokeWidth: 2), + ) + : const Icon(Icons.refresh), + onPressed: isRefreshing ? null : onRefresh, + tooltip: 'Refresh $title', + ), + ], + ); + } + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + const Text('Repeater Settings'), + Text( + widget.repeater.name, + style: const TextStyle(fontSize: 14, fontWeight: FontWeight.normal), + ), + ], + ), + centerTitle: false, + actions: [ + if (_hasChanges) + TextButton.icon( + onPressed: _isLoading ? null : _saveSettings, + icon: const Icon(Icons.save), + label: const Text('Save'), + ), + ], + ), + body: _isLoading && _nameController.text.isEmpty + ? const Center(child: CircularProgressIndicator()) + : ListView( + padding: const EdgeInsets.all(16), + children: [ + _buildBasicSettingsCard(), + const SizedBox(height: 16), + _buildRadioSettingsCard(), + const SizedBox(height: 16), + _buildLocationSettingsCard(), + const SizedBox(height: 16), + _buildFeatureTogglesCard(), + const SizedBox(height: 16), + _buildAdvertisementSettingsCard(), + const SizedBox(height: 32), + _buildDangerZoneCard(), + ], + ), + ); + } + + Widget _buildBasicSettingsCard() { + return Card( + child: Padding( + padding: const EdgeInsets.all(16), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + _buildSectionHeader( + icon: Icons.settings, + title: 'Basic Settings', + isRefreshing: _refreshingBasic, + onRefresh: _refreshBasicSettings, + ), + const Divider(), + TextField( + controller: _nameController, + decoration: const InputDecoration( + labelText: 'Repeater Name', + helperText: 'Display name for this repeater', + border: OutlineInputBorder(), + ), + onChanged: (_) => _markChanged(), + ), + const SizedBox(height: 16), + TextField( + controller: _passwordController, + decoration: const InputDecoration( + labelText: 'Admin Password', + helperText: 'Full access password', + border: OutlineInputBorder(), + ), + obscureText: true, + onChanged: (_) => _markChanged(), + ), + const SizedBox(height: 16), + TextField( + controller: _guestPasswordController, + decoration: const InputDecoration( + labelText: 'Guest Password', + helperText: 'Read-only access password', + border: OutlineInputBorder(), + ), + obscureText: true, + onChanged: (_) => _markChanged(), + ), + ], + ), + ), + ); + } + + Widget _buildRadioSettingsCard() { + return Card( + child: Padding( + padding: const EdgeInsets.all(16), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + _buildSectionHeader( + icon: Icons.radio, + title: 'Radio Settings', + isRefreshing: _refreshingRadio, + onRefresh: _refreshRadioSettings, + ), + const Divider(), + TextField( + controller: _freqController, + decoration: const InputDecoration( + labelText: 'Frequency (MHz)', + helperText: '300-2500 MHz', + border: OutlineInputBorder(), + suffixText: 'MHz', + ), + keyboardType: const TextInputType.numberWithOptions(decimal: true), + onChanged: (_) => _markChanged(), + ), + const SizedBox(height: 16), + TextField( + controller: _txPowerController, + decoration: const InputDecoration( + labelText: 'TX Power', + helperText: '1-30 dBm', + border: OutlineInputBorder(), + suffixText: 'dBm', + ), + keyboardType: TextInputType.number, + onChanged: (_) => _markChanged(), + ), + const SizedBox(height: 16), + DropdownButtonFormField( + value: _bandwidth, + decoration: const InputDecoration( + labelText: 'Bandwidth', + border: OutlineInputBorder(), + ), + items: _bandwidthOptions.map((bw) { + return DropdownMenuItem( + value: bw, + child: Text(_formatBandwidthLabel(bw)), + ); + }).toList(), + onChanged: (value) { + if (value != null) { + setState(() { + _bandwidth = value; + }); + _markChanged(); + } + }, + ), + const SizedBox(height: 16), + DropdownButtonFormField( + value: _spreadingFactor, + decoration: const InputDecoration( + labelText: 'Spreading Factor', + border: OutlineInputBorder(), + ), + items: _spreadingFactorOptions.map((sf) { + return DropdownMenuItem( + value: sf, + child: Text('SF$sf'), + ); + }).toList(), + onChanged: (value) { + if (value != null) { + setState(() { + _spreadingFactor = value; + }); + _markChanged(); + } + }, + ), + const SizedBox(height: 16), + DropdownButtonFormField( + value: _codingRate, + decoration: const InputDecoration( + labelText: 'Coding Rate', + border: OutlineInputBorder(), + ), + items: _codingRateOptions.map((cr) { + return DropdownMenuItem( + value: cr, + child: Text('4/$cr'), + ); + }).toList(), + onChanged: (value) { + if (value != null) { + setState(() { + _codingRate = value; + }); + _markChanged(); + } + }, + ), + ], + ), + ), + ); + } + + Widget _buildLocationSettingsCard() { + return Card( + child: Padding( + padding: const EdgeInsets.all(16), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + _buildSectionHeader( + icon: Icons.location_on, + title: 'Location Settings', + isRefreshing: _refreshingLocation, + onRefresh: _refreshLocationSettings, + ), + const Divider(), + TextField( + controller: _latController, + decoration: const InputDecoration( + labelText: 'Latitude', + helperText: 'Decimal degrees (e.g., 37.7749)', + border: OutlineInputBorder(), + ), + keyboardType: const TextInputType.numberWithOptions(decimal: true, signed: true), + onChanged: (_) => _markChanged(), + ), + const SizedBox(height: 16), + TextField( + controller: _lonController, + decoration: const InputDecoration( + labelText: 'Longitude', + helperText: 'Decimal degrees (e.g., -122.4194)', + border: OutlineInputBorder(), + ), + keyboardType: const TextInputType.numberWithOptions(decimal: true, signed: true), + onChanged: (_) => _markChanged(), + ), + ], + ), + ), + ); + } + + Widget _buildFeatureTogglesCard() { + return Card( + child: Padding( + padding: const EdgeInsets.all(16), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + _buildSectionHeader( + icon: Icons.toggle_on, + title: 'Features', + isRefreshing: _refreshingFeatures, + onRefresh: _refreshFeatureSettings, + ), + const Divider(), + SwitchListTile( + title: const Text('Packet Forwarding'), + subtitle: const Text('Enable repeater to forward packets'), + value: _repeatEnabled, + onChanged: (value) { + setState(() { + _repeatEnabled = value; + }); + _markChanged(); + }, + ), + SwitchListTile( + title: const Text('Guest Access'), + subtitle: const Text('Allow read-only guest access'), + value: _allowReadOnly, + onChanged: (value) { + setState(() { + _allowReadOnly = value; + }); + _markChanged(); + }, + ), + SwitchListTile( + title: const Text('Privacy Mode'), + subtitle: const Text('Hide name/location in advertisements'), + value: _privacyMode, + onChanged: (value) { + setState(() { + _privacyMode = value; + }); + _markChanged(); + }, + ), + ], + ), + ), + ); + } + + Widget _buildAdvertisementSettingsCard() { + return Card( + child: Padding( + padding: const EdgeInsets.all(16), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + _buildSectionHeader( + icon: Icons.broadcast_on_personal, + title: 'Advertisement Settings', + isRefreshing: _refreshingAdvertisement, + onRefresh: _refreshAdvertisementSettings, + ), + const Divider(), + ListTile( + title: const Text('Local Advertisement Interval'), + subtitle: Text('${_advertInterval} minutes'), + trailing: Text('${_advertInterval}m'), + ), + Slider( + value: _advertInterval.toDouble(), + min: 60, + max: 240, + divisions: 18, + label: '${_advertInterval}m', + onChanged: (value) { + setState(() { + _advertInterval = value.toInt(); + }); + _markChanged(); + }, + ), + const SizedBox(height: 16), + ListTile( + title: const Text('Flood Advertisement Interval'), + subtitle: Text('${_floodAdvertInterval} hours'), + trailing: Text('${_floodAdvertInterval}h'), + ), + Slider( + value: _floodAdvertInterval.toDouble(), + min: 3, + max: 48, + divisions: 45, + label: '${_floodAdvertInterval}h', + onChanged: (value) { + setState(() { + _floodAdvertInterval = value.toInt(); + }); + _markChanged(); + }, + ), + if (_privacyMode) ...[ + const SizedBox(height: 16), + ListTile( + title: const Text('Encrypted Advertisement Interval'), + subtitle: Text('${_privAdvertInterval} minutes'), + trailing: Text('${_privAdvertInterval}m'), + ), + Slider( + value: _privAdvertInterval.toDouble(), + min: 30, + max: 240, + divisions: 21, + label: '${_privAdvertInterval}m', + onChanged: (value) { + setState(() { + _privAdvertInterval = value.toInt(); + }); + _markChanged(); + }, + ), + ], + ], + ), + ), + ); + } + + Widget _buildDangerZoneCard() { + final colorScheme = Theme.of(context).colorScheme; + return Card( + color: colorScheme.errorContainer, + child: Padding( + padding: const EdgeInsets.all(16), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Icon(Icons.warning, color: colorScheme.onErrorContainer), + const SizedBox(width: 8), + Text( + 'Danger Zone', + style: TextStyle( + fontSize: 18, + fontWeight: FontWeight.bold, + color: colorScheme.onErrorContainer, + ), + ), + ], + ), + const Divider(), + ListTile( + leading: Icon(Icons.refresh, color: colorScheme.onErrorContainer), + title: Text('Reboot Repeater', style: TextStyle(color: colorScheme.onErrorContainer)), + subtitle: Text( + 'Restart the repeater device', + style: TextStyle(color: colorScheme.onErrorContainer.withValues(alpha: 0.8)), + ), + onTap: () => _confirmAction( + 'Reboot Repeater', + 'Are you sure you want to reboot this repeater?', + () => _sendDangerCommand('reboot'), + ), + ), + ListTile( + leading: Icon(Icons.vpn_key, color: colorScheme.onErrorContainer), + title: Text('Regenerate Identity Key', style: TextStyle(color: colorScheme.onErrorContainer)), + subtitle: Text( + 'Generate new public/private key pair', + style: TextStyle(color: colorScheme.onErrorContainer.withValues(alpha: 0.8)), + ), + onTap: () => _confirmAction( + 'Regenerate Identity', + 'This will generate a new identity for the repeater. Continue?', + () => _sendDangerCommand('regen key'), + ), + ), + ListTile( + leading: Icon(Icons.delete_forever, color: colorScheme.onErrorContainer), + title: Text('Erase File System', style: TextStyle(color: colorScheme.onErrorContainer)), + subtitle: Text( + 'Format the repeater file system', + style: TextStyle(color: colorScheme.onErrorContainer.withValues(alpha: 0.8)), + ), + onTap: () => _confirmAction( + 'Erase File System', + 'WARNING: This will erase all data on the repeater. This cannot be undone!', + () => _sendDangerCommand('erase'), + isDestructive: true, + ), + ), + ], + ), + ), + ); + } + + Future _sendDangerCommand(String command) async { + final connector = Provider.of(context, listen: false); + + if (command == 'erase') { + if (mounted) { + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar(content: Text('Erase is only available over serial console.')), + ); + } + return; + } + + try { + final frame = buildSendCliCommandFrame(widget.repeater.publicKey, command); + await connector.sendFrame(frame); + + if (mounted) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar(content: Text('Command sent: $command')), + ); + } + } catch (e) { + if (mounted) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text('Error sending command: $e'), + backgroundColor: Colors.red, + ), + ); + } + } + } + + void _confirmAction( + String title, + String message, + VoidCallback onConfirm, { + bool isDestructive = false, + }) { + showDialog( + context: context, + builder: (context) => AlertDialog( + title: Text(title), + content: Text(message), + actions: [ + TextButton( + onPressed: () => Navigator.pop(context), + child: const Text('Cancel'), + ), + FilledButton( + onPressed: () { + Navigator.pop(context); + onConfirm(); + }, + style: isDestructive + ? FilledButton.styleFrom(backgroundColor: Colors.red) + : null, + child: const Text('Confirm'), + ), + ], + ), + ); + } +} diff --git a/lib/screens/repeater_status_screen.dart b/lib/screens/repeater_status_screen.dart new file mode 100644 index 00000000..f27be228 --- /dev/null +++ b/lib/screens/repeater_status_screen.dart @@ -0,0 +1,508 @@ +import 'dart:async'; +import 'dart:convert'; +import 'dart:typed_data'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; +import '../models/contact.dart'; +import '../connector/meshcore_connector.dart'; +import '../connector/meshcore_protocol.dart'; +import '../services/repeater_command_service.dart'; + +class RepeaterStatusScreen extends StatefulWidget { + final Contact repeater; + final String password; + + const RepeaterStatusScreen({ + super.key, + required this.repeater, + required this.password, + }); + + @override + State createState() => _RepeaterStatusScreenState(); +} + +class _RepeaterStatusScreenState extends State { + bool _isLoading = false; + StreamSubscription? _frameSubscription; + RepeaterCommandService? _commandService; + Timer? _statusTimeout; + DateTime? _statusRequestedAt; + int? _batteryMv; + int? _uptimeSecs; + int? _queueLen; + int? _debugFlags; + int? _lastRssi; + double? _lastSnr; + int? _noiseFloor; + int? _txAirSecs; + int? _rxAirSecs; + int? _packetsSent; + int? _packetsRecv; + int? _floodTx; + int? _directTx; + int? _floodRx; + int? _directRx; + int? _dupFlood; + int? _dupDirect; + + @override + void initState() { + super.initState(); + final connector = Provider.of(context, listen: false); + _commandService = RepeaterCommandService(connector); + _setupMessageListener(); + _loadStatus(); + } + + @override + void dispose() { + _frameSubscription?.cancel(); + _commandService?.dispose(); + _statusTimeout?.cancel(); + super.dispose(); + } + + void _setupMessageListener() { + final connector = Provider.of(context, listen: false); + + // Listen for incoming text messages from the repeater + _frameSubscription = connector.receivedFrames.listen((frame) { + if (frame.isEmpty) return; + + // Check if it's a text message response + if (frame[0] == pushCodeStatusResponse) { + _handleStatusResponse(frame); + } else if (frame[0] == respCodeContactMsgRecv || + frame[0] == respCodeContactMsgRecvV3) { + _handleTextMessageResponse(frame); + } + }); + } + + void _handleTextMessageResponse(Uint8List frame) { + final parsed = parseContactMessageText(frame); + if (parsed == null) return; + if (!_matchesRepeaterPrefix(parsed.senderPrefix)) return; + + // Notify command service of response (for retry handling) + _commandService?.handleResponse(widget.repeater, parsed.text); + + // Parse status responses + _parseStatusResponse(parsed.text); + } + + void _handleStatusResponse(Uint8List frame) { + if (frame.length < 8) return; + final prefix = frame.sublist(2, 8); + if (!_matchesRepeaterPrefix(prefix)) return; + + const payloadOffset = 8; + const statsSize = 52; + if (frame.length < payloadOffset + statsSize) return; + + final data = ByteData.sublistView(frame, payloadOffset, payloadOffset + statsSize); + int offset = 0; + + final batteryMv = data.getUint16(offset, Endian.little); + offset += 2; + final queueLen = data.getUint16(offset, Endian.little); + offset += 2; + final noiseFloor = data.getInt16(offset, Endian.little); + offset += 2; + final lastRssi = data.getInt16(offset, Endian.little); + offset += 2; + final packetsRecv = data.getUint32(offset, Endian.little); + offset += 4; + final packetsSent = data.getUint32(offset, Endian.little); + offset += 4; + final txAirSecs = data.getUint32(offset, Endian.little); + offset += 4; + final uptimeSecs = data.getUint32(offset, Endian.little); + offset += 4; + final floodTx = data.getUint32(offset, Endian.little); + offset += 4; + final directTx = data.getUint32(offset, Endian.little); + offset += 4; + final floodRx = data.getUint32(offset, Endian.little); + offset += 4; + final directRx = data.getUint32(offset, Endian.little); + offset += 4; + final errEvents = data.getUint16(offset, Endian.little); + offset += 2; + final lastSnrRaw = data.getInt16(offset, Endian.little); + offset += 2; + final directDups = data.getUint16(offset, Endian.little); + offset += 2; + final floodDups = data.getUint16(offset, Endian.little); + offset += 2; + final rxAirSecs = data.getUint32(offset, Endian.little); + + _statusTimeout?.cancel(); + if (!mounted) return; + setState(() { + _isLoading = false; + _batteryMv = batteryMv; + _queueLen = queueLen; + _noiseFloor = noiseFloor; + _lastRssi = lastRssi; + _packetsRecv = packetsRecv; + _packetsSent = packetsSent; + _txAirSecs = txAirSecs; + _rxAirSecs = rxAirSecs; + _uptimeSecs = uptimeSecs; + _floodTx = floodTx; + _directTx = directTx; + _floodRx = floodRx; + _directRx = directRx; + _debugFlags = errEvents; + _lastSnr = lastSnrRaw / 4.0; + _dupDirect = directDups; + _dupFlood = floodDups; + }); + } + + bool _matchesRepeaterPrefix(Uint8List prefix) { + final target = widget.repeater.publicKey; + if (target.length < 6 || prefix.length < 6) return false; + for (int i = 0; i < 6; i++) { + if (prefix[i] != target[i]) return false; + } + return true; + } + + void _parseStatusResponse(String response) { + final trimmed = response.trim(); + if (trimmed.startsWith('{') && trimmed.endsWith('}')) { + try { + final data = jsonDecode(trimmed) as Map; + if (data.containsKey('battery_mv')) { + _batteryMv = _asInt(data['battery_mv']); + _uptimeSecs = _asInt(data['uptime_secs']); + _queueLen = _asInt(data['queue_len']); + _debugFlags = _asInt(data['errors']); + } else if (data.containsKey('noise_floor')) { + _noiseFloor = _asInt(data['noise_floor']); + _lastRssi = _asInt(data['last_rssi']); + _lastSnr = _asDouble(data['last_snr']); + _txAirSecs = _asInt(data['tx_air_secs']); + _rxAirSecs = _asInt(data['rx_air_secs']); + } else if (data.containsKey('recv') || data.containsKey('sent')) { + _packetsRecv = _asInt(data['recv']); + _packetsSent = _asInt(data['sent']); + _floodTx = _asInt(data['flood_tx']); + _directTx = _asInt(data['direct_tx']); + _floodRx = _asInt(data['flood_rx']); + _directRx = _asInt(data['direct_rx']); + _dupFlood = _asInt(data['dup_flood']); + _dupDirect = _asInt(data['dup_direct']); + } + } catch (_) { + // Ignore parse failures for non-JSON responses. + } + } + + if (mounted) { + setState(() {}); + } + } + + Future _loadStatus() async { + if (_commandService == null) return; + + setState(() { + _isLoading = true; + _statusRequestedAt = DateTime.now(); + _batteryMv = null; + _uptimeSecs = null; + _queueLen = null; + _debugFlags = null; + _lastRssi = null; + _lastSnr = null; + _noiseFloor = null; + _txAirSecs = null; + _rxAirSecs = null; + _packetsSent = null; + _packetsRecv = null; + _floodTx = null; + _directTx = null; + _floodRx = null; + _directRx = null; + _dupFlood = null; + _dupDirect = null; + }); + + try { + final connector = Provider.of(context, listen: false); + final frame = buildSendStatusRequestFrame(widget.repeater.publicKey); + await connector.sendFrame(frame); + + _statusTimeout?.cancel(); + _statusTimeout = Timer(const Duration(seconds: 12), () { + if (!mounted) return; + setState(() { + _isLoading = false; + }); + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar( + content: Text('Status request timed out.'), + backgroundColor: Colors.red, + ), + ); + }); + } catch (e) { + if (mounted) { + setState(() { + _isLoading = false; + }); + + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text('Error loading status: $e'), + backgroundColor: Colors.red, + ), + ); + } + } + } + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + const Text('Repeater Status'), + Text( + widget.repeater.name, + style: const TextStyle(fontSize: 14, fontWeight: FontWeight.normal), + ), + ], + ), + centerTitle: false, + actions: [ + IconButton( + icon: _isLoading + ? const SizedBox( + width: 20, + height: 20, + child: CircularProgressIndicator(strokeWidth: 2), + ) + : const Icon(Icons.refresh), + onPressed: _isLoading ? null : _loadStatus, + tooltip: 'Refresh', + ), + ], + ), + body: RefreshIndicator( + onRefresh: _loadStatus, + child: ListView( + padding: const EdgeInsets.all(16), + children: [ + _buildSystemInfoCard(), + const SizedBox(height: 16), + _buildRadioStatsCard(), + const SizedBox(height: 16), + _buildPacketStatsCard(), + ], + ), + ), + ); + } + + Widget _buildSystemInfoCard() { + return Card( + child: Padding( + padding: const EdgeInsets.all(16), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Icon(Icons.info_outline, color: Theme.of(context).primaryColor), + const SizedBox(width: 8), + const Text( + 'System Information', + style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold), + ), + ], + ), + const Divider(), + _buildInfoRow('Battery', _batteryText()), + _buildInfoRow('Clock (at login)', _clockText()), + _buildInfoRow('Uptime', _formatDuration(_uptimeSecs)), + _buildInfoRow('Queue Length', _formatValue(_queueLen)), + _buildInfoRow('Debug Flags', _formatValue(_debugFlags)), + ], + ), + ), + ); + } + + Widget _buildRadioStatsCard() { + return Card( + child: Padding( + padding: const EdgeInsets.all(16), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Icon(Icons.radio, color: Theme.of(context).primaryColor), + const SizedBox(width: 8), + const Text( + 'Radio Statistics', + style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold), + ), + ], + ), + const Divider(), + _buildInfoRow('Last RSSI', _formatValue(_lastRssi, suffix: ' dB')), + _buildInfoRow('Last SNR', _formatSnr(_lastSnr)), + _buildInfoRow('Noise Floor', _formatValue(_noiseFloor, suffix: ' dB')), + _buildInfoRow('TX Airtime', _formatDuration(_txAirSecs)), + _buildInfoRow('RX Airtime', _formatDuration(_rxAirSecs)), + ], + ), + ), + ); + } + + Widget _buildPacketStatsCard() { + return Card( + child: Padding( + padding: const EdgeInsets.all(16), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Icon(Icons.analytics, color: Theme.of(context).primaryColor), + const SizedBox(width: 8), + const Text( + 'Packet Statistics', + style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold), + ), + ], + ), + const Divider(), + _buildInfoRow('Sent', _packetTxText()), + _buildInfoRow('Received', _packetRxText()), + _buildInfoRow('Duplicates', _duplicateText()), + ], + ), + ), + ); + } + + Widget _buildInfoRow(String label, String value) { + return Padding( + padding: const EdgeInsets.symmetric(vertical: 6), + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox( + width: 130, + child: Text( + label, + style: TextStyle( + color: Colors.grey[600], + fontWeight: FontWeight.w500, + ), + ), + ), + Expanded( + child: Text( + value, + style: const TextStyle(fontWeight: FontWeight.w400), + ), + ), + ], + ), + ); + } + + int? _asInt(dynamic value) { + if (value == null) return null; + if (value is int) return value; + if (value is double) return value.round(); + return int.tryParse(value.toString()); + } + + double? _asDouble(dynamic value) { + if (value == null) return null; + if (value is double) return value; + if (value is int) return value.toDouble(); + return double.tryParse(value.toString()); + } + + String _batteryText() { + if (_batteryMv == null) return '—'; + final percent = _batteryPercentFromMv(_batteryMv!); + final volts = (_batteryMv! / 1000.0).toStringAsFixed(2); + return '$percent% / ${volts}V'; + } + + int _batteryPercentFromMv(int millivolts) { + const minMv = 3000; + const maxMv = 4200; + if (millivolts <= minMv) return 0; + if (millivolts >= maxMv) return 100; + return (((millivolts - minMv) * 100) / (maxMv - minMv)).round(); + } + + String _clockText() { + if (_statusRequestedAt == null) return '—'; + final dt = _statusRequestedAt!; + final date = '${dt.day}/${dt.month}/${dt.year}'; + final time = '${dt.hour.toString().padLeft(2, '0')}:${dt.minute.toString().padLeft(2, '0')}'; + return '$date $time'; + } + + String _formatDuration(int? seconds) { + if (seconds == null) return '—'; + final days = seconds ~/ 86400; + final hours = (seconds % 86400) ~/ 3600; + final minutes = (seconds % 3600) ~/ 60; + final secs = seconds % 60; + return '$days days ${hours}h ${minutes}m ${secs}s'; + } + + String _packetTxText() { + if (_packetsSent == null) return '—'; + final flood = _formatValue(_floodTx); + final direct = _formatValue(_directTx); + return 'Total: $_packetsSent, Flood: $flood, Direct: $direct'; + } + + String _packetRxText() { + if (_packetsRecv == null) return '—'; + final flood = _formatValue(_floodRx); + final direct = _formatValue(_directRx); + return 'Total: $_packetsRecv, Flood: $flood, Direct: $direct'; + } + + String _duplicateText() { + if (_dupFlood != null || _dupDirect != null) { + final flood = _formatValue(_dupFlood); + final direct = _formatValue(_dupDirect); + return 'Flood: $flood, Direct: $direct'; + } + if (_packetsRecv == null || _floodRx == null || _directRx == null) return '—'; + final dupTotal = _packetsRecv! - _floodRx! - _directRx!; + if (dupTotal < 0) return '—'; + return 'Total: $dupTotal'; + } + + String _formatValue(num? value, {String? suffix}) { + if (value == null) return '—'; + return suffix == null ? value.toString() : '$value$suffix'; + } + + String _formatSnr(double? snr) { + if (snr == null) return '—'; + return snr.toStringAsFixed(2); + } +} diff --git a/lib/screens/scanner_screen.dart b/lib/screens/scanner_screen.dart new file mode 100644 index 00000000..db3f83c9 --- /dev/null +++ b/lib/screens/scanner_screen.dart @@ -0,0 +1,176 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_blue_plus/flutter_blue_plus.dart'; +import 'package:provider/provider.dart'; + +import '../connector/meshcore_connector.dart'; +import '../widgets/device_tile.dart'; +import 'device_screen.dart'; + +/// Screen for scanning and connecting to MeshCore devices +class ScannerScreen extends StatelessWidget { + const ScannerScreen({super.key}); + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: const Text('MeshCore Open'), + centerTitle: true, + automaticallyImplyLeading: false, + ), + body: Consumer( + builder: (context, connector, child) { + return Column( + children: [ + // Status bar + _buildStatusBar(context, connector), + + // Device list + Expanded( + child: _buildDeviceList(context, connector), + ), + ], + ); + }, + ), + floatingActionButton: Consumer( + builder: (context, connector, child) { + final isScanning = connector.state == MeshCoreConnectionState.scanning; + + return FloatingActionButton.extended( + onPressed: () { + if (isScanning) { + connector.stopScan(); + } else { + connector.startScan(); + } + }, + icon: isScanning + ? const SizedBox( + width: 20, + height: 20, + child: CircularProgressIndicator( + strokeWidth: 2, + color: Colors.white, + ), + ) + : const Icon(Icons.bluetooth_searching), + label: Text(isScanning ? 'Stop' : 'Scan'), + ); + }, + ), + ); + } + + Widget _buildStatusBar(BuildContext context, MeshCoreConnector connector) { + String statusText; + Color statusColor; + + switch (connector.state) { + case MeshCoreConnectionState.scanning: + statusText = 'Scanning for devices...'; + statusColor = Colors.blue; + break; + case MeshCoreConnectionState.connecting: + statusText = 'Connecting...'; + statusColor = Colors.orange; + break; + case MeshCoreConnectionState.connected: + statusText = 'Connected to ${connector.device?.platformName}'; + statusColor = Colors.green; + break; + case MeshCoreConnectionState.disconnecting: + statusText = 'Disconnecting...'; + statusColor = Colors.orange; + break; + case MeshCoreConnectionState.disconnected: + statusText = 'Not connected'; + statusColor = Colors.grey; + break; + } + + return Container( + width: double.infinity, + padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 16), + color: statusColor.withValues(alpha: 0.1), + child: Row( + children: [ + Icon(Icons.circle, size: 12, color: statusColor), + const SizedBox(width: 8), + Text( + statusText, + style: TextStyle(color: statusColor, fontWeight: FontWeight.w500), + ), + ], + ), + ); + } + + Widget _buildDeviceList(BuildContext context, MeshCoreConnector connector) { + if (connector.scanResults.isEmpty) { + return Center( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon( + Icons.bluetooth, + size: 64, + color: Colors.grey[400], + ), + const SizedBox(height: 16), + Text( + connector.state == MeshCoreConnectionState.scanning + ? 'Searching for MeshCore devices...' + : 'Tap Scan to find MeshCore devices', + style: TextStyle( + fontSize: 16, + color: Colors.grey[600], + ), + ), + ], + ), + ); + } + + return ListView.separated( + padding: const EdgeInsets.all(8), + itemCount: connector.scanResults.length, + separatorBuilder: (context, index) => const Divider(), + itemBuilder: (context, index) { + final result = connector.scanResults[index]; + return DeviceTile( + scanResult: result, + onTap: () => _connectToDevice(context, connector, result), + ); + }, + ); + } + + Future _connectToDevice( + BuildContext context, + MeshCoreConnector connector, + ScanResult result, + ) async { + try { + await connector.connect(result.device); + + if (context.mounted && connector.isConnected) { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => const DeviceScreen(), + ), + ); + } + } catch (e) { + if (context.mounted) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text('Connection failed: $e'), + backgroundColor: Colors.red, + ), + ); + } + } + } +} diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dart new file mode 100644 index 00000000..cee2237e --- /dev/null +++ b/lib/screens/settings_screen.dart @@ -0,0 +1,693 @@ +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +import '../connector/meshcore_connector.dart'; +import '../connector/meshcore_protocol.dart'; +import '../models/radio_settings.dart'; +import '../services/app_settings_service.dart'; +import 'app_settings_screen.dart'; +import 'ble_debug_log_screen.dart'; + +class SettingsScreen extends StatelessWidget { + const SettingsScreen({super.key}); + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: const Text('Settings'), + centerTitle: true, + ), + body: Consumer( + builder: (context, connector, child) { + return ListView( + padding: const EdgeInsets.all(16), + children: [ + _buildDeviceInfoCard(connector), + const SizedBox(height: 16), + _buildAppSettingsCard(context), + const SizedBox(height: 16), + _buildNodeSettingsCard(context, connector), + const SizedBox(height: 16), + _buildActionsCard(context, connector), + const SizedBox(height: 16), + _buildDebugCard(context), + const SizedBox(height: 16), + _buildAboutCard(context), + ], + ); + }, + ), + ); + } + + Widget _buildDeviceInfoCard(MeshCoreConnector connector) { + return Card( + child: Padding( + padding: const EdgeInsets.all(16), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const Text( + 'Device Info', + style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold), + ), + const SizedBox(height: 16), + _buildInfoRow('Name', connector.device?.platformName ?? 'Unknown'), + _buildInfoRow('ID', connector.device?.remoteId.toString() ?? 'Unknown'), + _buildInfoRow('Status', connector.isConnected ? 'Connected' : 'Disconnected'), + if (connector.selfName != null) + _buildInfoRow('Node Name', connector.selfName!), + if (connector.selfPublicKey != null) + _buildInfoRow('Public Key', '${pubKeyToHex(connector.selfPublicKey!).substring(0, 16)}...'), + ], + ), + ), + ); + } + + Widget _buildAppSettingsCard(BuildContext context) { + return Card( + child: ListTile( + leading: const Icon(Icons.settings_outlined), + title: const Text('App Settings'), + subtitle: const Text('Notifications, messaging, and map preferences'), + trailing: const Icon(Icons.chevron_right), + onTap: () { + Navigator.push( + context, + MaterialPageRoute(builder: (context) => const AppSettingsScreen()), + ); + }, + ), + ); + } + + Widget _buildNodeSettingsCard(BuildContext context, MeshCoreConnector connector) { + return Card( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const Padding( + padding: EdgeInsets.fromLTRB(16, 16, 16, 8), + child: Text( + 'Node Settings', + style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold), + ), + ), + ListTile( + leading: const Icon(Icons.person_outline), + title: const Text('Node Name'), + subtitle: Text(connector.selfName ?? 'Not set'), + trailing: const Icon(Icons.chevron_right), + onTap: () => _editNodeName(context, connector), + ), + const Divider(height: 1), + ListTile( + leading: const Icon(Icons.radio), + title: const Text('Radio Settings'), + subtitle: const Text('Frequency, power, spreading factor'), + trailing: const Icon(Icons.chevron_right), + onTap: () => _showRadioSettings(context, connector), + ), + const Divider(height: 1), + ListTile( + leading: const Icon(Icons.location_on_outlined), + title: const Text('Location'), + subtitle: const Text('GPS coordinates'), + trailing: const Icon(Icons.chevron_right), + onTap: () => _editLocation(context, connector), + ), + const Divider(height: 1), + ListTile( + leading: const Icon(Icons.visibility_off_outlined), + title: const Text('Privacy Mode'), + subtitle: const Text('Hide name/location in advertisements'), + trailing: const Icon(Icons.chevron_right), + onTap: () => _togglePrivacy(context, connector), + ), + ], + ), + ); + } + + Widget _buildActionsCard(BuildContext context, MeshCoreConnector connector) { + return Card( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const Padding( + padding: EdgeInsets.fromLTRB(16, 16, 16, 8), + child: Text( + 'Actions', + style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold), + ), + ), + ListTile( + leading: const Icon(Icons.cell_tower), + title: const Text('Send Advertisement'), + subtitle: const Text('Broadcast presence now'), + onTap: () => _sendAdvert(context, connector), + ), + const Divider(height: 1), + ListTile( + leading: const Icon(Icons.sync), + title: const Text('Sync Time'), + subtitle: const Text('Set device clock to phone time'), + onTap: () => _syncTime(context, connector), + ), + const Divider(height: 1), + ListTile( + leading: const Icon(Icons.refresh), + title: const Text('Refresh Contacts'), + subtitle: const Text('Reload contact list from device'), + onTap: () => connector.getContacts(), + ), + const Divider(height: 1), + ListTile( + leading: const Icon(Icons.restart_alt, color: Colors.orange), + title: const Text('Reboot Device'), + subtitle: const Text('Restart the MeshCore device'), + onTap: () => _confirmReboot(context, connector), + ), + ], + ), + ); + } + + Widget _buildAboutCard(BuildContext context) { + return Card( + child: ListTile( + leading: const Icon(Icons.info_outline), + title: const Text('About'), + subtitle: const Text('MeshCore Open v0.1.0'), + onTap: () => _showAbout(context), + ), + ); + } + + Widget _buildDebugCard(BuildContext context) { + return Card( + child: ListTile( + leading: const Icon(Icons.bug_report_outlined), + title: const Text('BLE Debug Log'), + subtitle: const Text('Commands, responses, and status'), + trailing: const Icon(Icons.chevron_right), + onTap: () { + Navigator.push( + context, + MaterialPageRoute(builder: (context) => const BleDebugLogScreen()), + ); + }, + ), + ); + } + + Widget _buildInfoRow(String label, String value) { + return Padding( + padding: const EdgeInsets.symmetric(vertical: 4), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text(label, style: TextStyle(color: Colors.grey[600])), + Flexible( + child: Text( + value, + style: const TextStyle(fontWeight: FontWeight.w500), + overflow: TextOverflow.ellipsis, + ), + ), + ], + ), + ); + } + + void _editNodeName(BuildContext context, MeshCoreConnector connector) { + final controller = TextEditingController(text: connector.selfName ?? ''); + showDialog( + context: context, + builder: (context) => AlertDialog( + title: const Text('Node Name'), + content: TextField( + controller: controller, + decoration: const InputDecoration( + hintText: 'Enter node name', + border: OutlineInputBorder(), + ), + maxLength: 31, + ), + actions: [ + TextButton( + onPressed: () => Navigator.pop(context), + child: const Text('Cancel'), + ), + TextButton( + onPressed: () async { + Navigator.pop(context); + await connector.sendCliCommand('set name ${controller.text}'); + await connector.refreshDeviceInfo(); + if (!context.mounted) return; + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar(content: Text('Name updated')), + ); + }, + child: const Text('Save'), + ), + ], + ), + ); + } + + void _showRadioSettings(BuildContext context, MeshCoreConnector connector) { + showDialog( + context: context, + builder: (context) => _RadioSettingsDialog(connector: connector), + ); + } + + void _editLocation(BuildContext context, MeshCoreConnector connector) { + final latController = TextEditingController(); + final lonController = TextEditingController(); + showDialog( + context: context, + builder: (context) => AlertDialog( + title: const Text('Location'), + content: Column( + mainAxisSize: MainAxisSize.min, + children: [ + TextField( + controller: latController, + decoration: const InputDecoration( + labelText: 'Latitude', + border: OutlineInputBorder(), + ), + keyboardType: const TextInputType.numberWithOptions(decimal: true, signed: true), + ), + const SizedBox(height: 16), + TextField( + controller: lonController, + decoration: const InputDecoration( + labelText: 'Longitude', + border: OutlineInputBorder(), + ), + keyboardType: const TextInputType.numberWithOptions(decimal: true, signed: true), + ), + ], + ), + actions: [ + TextButton( + onPressed: () => Navigator.pop(context), + child: const Text('Cancel'), + ), + TextButton( + onPressed: () async { + Navigator.pop(context); + var updated = false; + if (latController.text.isNotEmpty) { + await connector.sendCliCommand('set lat ${latController.text}'); + updated = true; + } + if (lonController.text.isNotEmpty) { + await connector.sendCliCommand('set lon ${lonController.text}'); + updated = true; + } + if (updated) { + await connector.refreshDeviceInfo(); + } + if (!context.mounted) return; + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar(content: Text('Location updated')), + ); + }, + child: const Text('Save'), + ), + ], + ), + ); + } + + void _togglePrivacy(BuildContext context, MeshCoreConnector connector) { + showDialog( + context: context, + builder: (context) => AlertDialog( + title: const Text('Privacy Mode'), + content: const Text('Toggle privacy mode to hide your name and location in advertisements.'), + actions: [ + TextButton( + onPressed: () => Navigator.pop(context), + child: const Text('Cancel'), + ), + TextButton( + onPressed: () async { + Navigator.pop(context); + await connector.sendCliCommand('set privacy on'); + await connector.refreshDeviceInfo(); + if (!context.mounted) return; + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar(content: Text('Privacy mode enabled')), + ); + }, + child: const Text('Enable'), + ), + TextButton( + onPressed: () async { + Navigator.pop(context); + await connector.sendCliCommand('set privacy off'); + await connector.refreshDeviceInfo(); + if (!context.mounted) return; + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar(content: Text('Privacy mode disabled')), + ); + }, + child: const Text('Disable'), + ), + ], + ), + ); + } + + void _sendAdvert(BuildContext context, MeshCoreConnector connector) { + connector.sendCliCommand('advert'); + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar(content: Text('Advertisement sent')), + ); + } + + void _syncTime(BuildContext context, MeshCoreConnector connector) { + connector.syncTime(); + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar(content: Text('Time synchronized')), + ); + } + + void _confirmReboot(BuildContext context, MeshCoreConnector connector) { + showDialog( + context: context, + builder: (context) => AlertDialog( + title: const Text('Reboot Device'), + content: const Text('Are you sure you want to reboot the device? You will be disconnected.'), + actions: [ + TextButton( + onPressed: () => Navigator.pop(context), + child: const Text('Cancel'), + ), + TextButton( + onPressed: () { + Navigator.pop(context); + connector.sendCliCommand('reboot'); + }, + child: const Text('Reboot', style: TextStyle(color: Colors.orange)), + ), + ], + ), + ); + } + + void _showAbout(BuildContext context) { + showAboutDialog( + context: context, + applicationName: 'MeshCore Open', + applicationVersion: '0.1.0', + applicationLegalese: '2024 MeshCore Open Source Project', + children: [ + const SizedBox(height: 16), + const Text( + 'An open-source Flutter client for MeshCore LoRa mesh networking devices.', + ), + ], + ); + } +} + +class _RadioSettingsDialog extends StatefulWidget { + final MeshCoreConnector connector; + + const _RadioSettingsDialog({required this.connector}); + + @override + State<_RadioSettingsDialog> createState() => _RadioSettingsDialogState(); +} + +class _RadioSettingsDialogState extends State<_RadioSettingsDialog> { + final _frequencyController = TextEditingController(); + LoRaBandwidth _bandwidth = LoRaBandwidth.bw125; + LoRaSpreadingFactor _spreadingFactor = LoRaSpreadingFactor.sf7; + LoRaCodingRate _codingRate = LoRaCodingRate.cr4_5; + final _txPowerController = TextEditingController(text: '20'); + + @override + void initState() { + super.initState(); + + // Populate with current settings if available + if (widget.connector.currentFreqHz != null) { + _frequencyController.text = (widget.connector.currentFreqHz! / 1000.0).toStringAsFixed(3); + } else { + _frequencyController.text = '915.0'; + } + + if (widget.connector.currentBwHz != null) { + // Find matching bandwidth enum + final bwValue = widget.connector.currentBwHz!; + for (var bw in LoRaBandwidth.values) { + if (bw.hz == bwValue) { + _bandwidth = bw; + break; + } + } + } + + if (widget.connector.currentSf != null) { + // Find matching spreading factor enum + final sfValue = widget.connector.currentSf!; + for (var sf in LoRaSpreadingFactor.values) { + if (sf.value == sfValue) { + _spreadingFactor = sf; + break; + } + } + } + + if (widget.connector.currentCr != null) { + // Find matching coding rate enum + final crValue = _toUiCodingRate(widget.connector.currentCr!); + for (var cr in LoRaCodingRate.values) { + if (cr.value == crValue) { + _codingRate = cr; + break; + } + } + } + + if (widget.connector.currentTxPower != null) { + _txPowerController.text = widget.connector.currentTxPower.toString(); + } + } + + @override + void dispose() { + _frequencyController.dispose(); + _txPowerController.dispose(); + super.dispose(); + } + + void _applyPreset(RadioSettings preset) { + setState(() { + _frequencyController.text = preset.frequencyMHz.toString(); + _bandwidth = preset.bandwidth; + _spreadingFactor = preset.spreadingFactor; + _codingRate = preset.codingRate; + _txPowerController.text = preset.txPowerDbm.toString(); + }); + } + + Future _saveSettings() async { + final freqMHz = double.tryParse(_frequencyController.text); + final txPower = int.tryParse(_txPowerController.text); + + if (freqMHz == null || freqMHz < 300 || freqMHz > 2500) { + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar(content: Text('Invalid frequency (300-2500 MHz)')), + ); + return; + } + + if (txPower == null || txPower < 0 || txPower > 22) { + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar(content: Text('Invalid TX power (0-22 dBm)')), + ); + return; + } + + final freqHz = (freqMHz * 1000).round(); + final bwHz = _bandwidth.hz; + final sf = _spreadingFactor.value; + final cr = _toDeviceCodingRate(_codingRate.value, widget.connector.currentCr); + + try { + await widget.connector.sendFrame(buildSetRadioParamsFrame(freqHz, bwHz, sf, cr)); + await widget.connector.sendFrame(buildSetRadioTxPowerFrame(txPower)); + await widget.connector.refreshDeviceInfo(); + + if (!mounted) return; + Navigator.pop(context); + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar(content: Text('Radio settings updated')), + ); + } catch (e) { + if (!mounted) return; + ScaffoldMessenger.of(context).showSnackBar( + SnackBar(content: Text('Error: $e')), + ); + } + } + + int _toUiCodingRate(int deviceCr) { + return deviceCr <= 4 ? deviceCr + 4 : deviceCr; + } + + int _toDeviceCodingRate(int uiCr, int? deviceCr) { + if (deviceCr != null && deviceCr <= 4) { + return uiCr - 4; + } + return uiCr; + } + + @override + Widget build(BuildContext context) { + return AlertDialog( + title: const Text('Radio Settings'), + content: SingleChildScrollView( + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const Text('Presets', style: TextStyle(fontWeight: FontWeight.bold)), + const SizedBox(height: 8), + Wrap( + spacing: 8, + children: [ + _PresetChip( + label: '915 MHz', + onTap: () => _applyPreset(RadioSettings.preset915MHz), + ), + _PresetChip( + label: '868 MHz', + onTap: () => _applyPreset(RadioSettings.preset868MHz), + ), + _PresetChip( + label: '433 MHz', + onTap: () => _applyPreset(RadioSettings.preset433MHz), + ), + _PresetChip( + label: 'Long Range', + onTap: () => _applyPreset(RadioSettings.presetLongRange), + ), + _PresetChip( + label: 'Fast Speed', + onTap: () => _applyPreset(RadioSettings.presetFastSpeed), + ), + ], + ), + const SizedBox(height: 24), + TextField( + controller: _frequencyController, + decoration: const InputDecoration( + labelText: 'Frequency (MHz)', + border: OutlineInputBorder(), + helperText: '300.0 - 2500.0', + ), + keyboardType: const TextInputType.numberWithOptions(decimal: true), + ), + const SizedBox(height: 16), + DropdownButtonFormField( + value: _bandwidth, + decoration: const InputDecoration( + labelText: 'Bandwidth', + border: OutlineInputBorder(), + ), + items: LoRaBandwidth.values + .map((bw) => DropdownMenuItem( + value: bw, + child: Text(bw.label), + )) + .toList(), + onChanged: (value) { + if (value != null) setState(() => _bandwidth = value); + }, + ), + const SizedBox(height: 16), + DropdownButtonFormField( + value: _spreadingFactor, + decoration: const InputDecoration( + labelText: 'Spreading Factor', + border: OutlineInputBorder(), + ), + items: LoRaSpreadingFactor.values + .map((sf) => DropdownMenuItem( + value: sf, + child: Text(sf.label), + )) + .toList(), + onChanged: (value) { + if (value != null) setState(() => _spreadingFactor = value); + }, + ), + const SizedBox(height: 16), + DropdownButtonFormField( + value: _codingRate, + decoration: const InputDecoration( + labelText: 'Coding Rate', + border: OutlineInputBorder(), + ), + items: LoRaCodingRate.values + .map((cr) => DropdownMenuItem( + value: cr, + child: Text(cr.label), + )) + .toList(), + onChanged: (value) { + if (value != null) setState(() => _codingRate = value); + }, + ), + const SizedBox(height: 16), + TextField( + controller: _txPowerController, + decoration: const InputDecoration( + labelText: 'TX Power (dBm)', + border: OutlineInputBorder(), + helperText: '0 - 22', + ), + keyboardType: TextInputType.number, + ), + ], + ), + ), + actions: [ + TextButton( + onPressed: () => Navigator.pop(context), + child: const Text('Cancel'), + ), + FilledButton( + onPressed: _saveSettings, + child: const Text('Save'), + ), + ], + ); + } +} + +class _PresetChip extends StatelessWidget { + final String label; + final VoidCallback onTap; + + const _PresetChip({required this.label, required this.onTap}); + + @override + Widget build(BuildContext context) { + return ActionChip( + label: Text(label), + onPressed: onTap, + ); + } +} diff --git a/lib/services/app_settings_service.dart b/lib/services/app_settings_service.dart new file mode 100644 index 00000000..ac8e64c0 --- /dev/null +++ b/lib/services/app_settings_service.dart @@ -0,0 +1,101 @@ +import 'dart:convert'; +import 'package:flutter/foundation.dart'; +import 'package:shared_preferences/shared_preferences.dart'; +import '../models/app_settings.dart'; + +class AppSettingsService extends ChangeNotifier { + static const String _settingsKey = 'app_settings'; + + AppSettings _settings = AppSettings(); + + AppSettings get settings => _settings; + + String batteryChemistryForDevice(String deviceId) { + final stored = _settings.batteryChemistryByDeviceId[deviceId]; + if (stored == 'liion') return 'nmc'; + return stored ?? 'nmc'; + } + + Future loadSettings() async { + final prefs = await SharedPreferences.getInstance(); + final jsonStr = prefs.getString(_settingsKey); + + if (jsonStr != null) { + try { + final json = jsonDecode(jsonStr) as Map; + _settings = AppSettings.fromJson(json); + notifyListeners(); + } catch (e) { + // If parsing fails, use defaults + _settings = AppSettings(); + } + } + } + + Future updateSettings(AppSettings newSettings) async { + _settings = newSettings; + notifyListeners(); + + final prefs = await SharedPreferences.getInstance(); + final jsonStr = jsonEncode(_settings.toJson()); + await prefs.setString(_settingsKey, jsonStr); + } + + Future setClearPathOnMaxRetry(bool value) async { + await updateSettings(_settings.copyWith(clearPathOnMaxRetry: value)); + } + + Future setMapShowRepeaters(bool value) async { + await updateSettings(_settings.copyWith(mapShowRepeaters: value)); + } + + Future setMapShowChatNodes(bool value) async { + await updateSettings(_settings.copyWith(mapShowChatNodes: value)); + } + + Future setMapShowOtherNodes(bool value) async { + await updateSettings(_settings.copyWith(mapShowOtherNodes: value)); + } + + Future setMapTimeFilterHours(double value) async { + await updateSettings(_settings.copyWith(mapTimeFilterHours: value)); + } + + Future setMapKeyPrefixEnabled(bool value) async { + await updateSettings(_settings.copyWith(mapKeyPrefixEnabled: value)); + } + + Future setMapKeyPrefix(String value) async { + await updateSettings(_settings.copyWith(mapKeyPrefix: value)); + } + + Future setMapShowMarkers(bool value) async { + await updateSettings(_settings.copyWith(mapShowMarkers: value)); + } + + Future setNotificationsEnabled(bool value) async { + await updateSettings(_settings.copyWith(notificationsEnabled: value)); + } + + Future setNotifyOnNewMessage(bool value) async { + await updateSettings(_settings.copyWith(notifyOnNewMessage: value)); + } + + Future setNotifyOnNewAdvert(bool value) async { + await updateSettings(_settings.copyWith(notifyOnNewAdvert: value)); + } + + Future setAutoRouteRotationEnabled(bool value) async { + await updateSettings(_settings.copyWith(autoRouteRotationEnabled: value)); + } + + Future setThemeMode(String value) async { + await updateSettings(_settings.copyWith(themeMode: value)); + } + + Future setBatteryChemistryForDevice(String deviceId, String chemistry) async { + final updated = Map.from(_settings.batteryChemistryByDeviceId); + updated[deviceId] = chemistry; + await updateSettings(_settings.copyWith(batteryChemistryByDeviceId: updated)); + } +} diff --git a/lib/services/ble_debug_log_service.dart b/lib/services/ble_debug_log_service.dart new file mode 100644 index 00000000..b52aebb5 --- /dev/null +++ b/lib/services/ble_debug_log_service.dart @@ -0,0 +1,220 @@ +import 'dart:typed_data'; +import 'package:flutter/foundation.dart'; +import '../connector/meshcore_protocol.dart'; + +class BleDebugLogEntry { + final DateTime timestamp; + final bool outgoing; + final String description; + final Uint8List payload; + + BleDebugLogEntry({ + required this.timestamp, + required this.outgoing, + required this.description, + required this.payload, + }); + + String get hexPreview { + const maxBytes = 64; + final bytes = payload.length > maxBytes ? payload.sublist(0, maxBytes) : payload; + final hex = bytes.map((b) => b.toRadixString(16).padLeft(2, '0')).join(' '); + return payload.length > maxBytes ? '$hex …' : hex; + } +} + +class BleRawLogRxEntry { + final DateTime timestamp; + final Uint8List payload; + + BleRawLogRxEntry({ + required this.timestamp, + required this.payload, + }); + + String get hexPreview { + const maxBytes = 64; + final bytes = payload.length > maxBytes ? payload.sublist(0, maxBytes) : payload; + final hex = bytes.map((b) => b.toRadixString(16).padLeft(2, '0')).join(' '); + return payload.length > maxBytes ? '$hex …' : hex; + } +} + +class BleDebugLogService extends ChangeNotifier { + static const int maxEntries = 500; + final List _entries = []; + final List _rawLogRxEntries = []; + + List get entries => List.unmodifiable(_entries); + List get rawLogRxEntries => List.unmodifiable(_rawLogRxEntries); + + void logFrame(Uint8List frame, {required bool outgoing, String? note}) { + if (frame.isEmpty) return; + final code = frame[0]; + final description = _describeFrame(code, frame, outgoing, note); + _entries.add( + BleDebugLogEntry( + timestamp: DateTime.now(), + outgoing: outgoing, + description: description, + payload: Uint8List.fromList(frame), + ), + ); + + if (_entries.length > maxEntries) { + _entries.removeRange(0, _entries.length - maxEntries); + } + + if (!outgoing && code == pushCodeLogRxData && frame.length > 3) { + _rawLogRxEntries.add( + BleRawLogRxEntry( + timestamp: DateTime.now(), + payload: Uint8List.fromList(frame.sublist(3)), + ), + ); + if (_rawLogRxEntries.length > maxEntries) { + _rawLogRxEntries.removeRange(0, _rawLogRxEntries.length - maxEntries); + } + } + + notifyListeners(); + } + + void clear() { + _entries.clear(); + _rawLogRxEntries.clear(); + notifyListeners(); + } + + String _describeFrame(int code, Uint8List frame, bool outgoing, String? note) { + final label = _codeLabel(code); + final prefix = outgoing ? 'TX' : 'RX'; + final extra = _frameDetail(code, frame); + final noteText = note != null ? ' • $note' : ''; + return '$prefix $label$extra$noteText'; + } + + String _codeLabel(int code) { + switch (code) { + case cmdAppStart: + return 'CMD_APP_START'; + case cmdSendTxtMsg: + return 'CMD_SEND_TXT_MSG'; + case cmdSendChannelTxtMsg: + return 'CMD_SEND_CHANNEL_TXT_MSG'; + case cmdGetContacts: + return 'CMD_GET_CONTACTS'; + case cmdGetDeviceTime: + return 'CMD_GET_DEVICE_TIME'; + case cmdSetDeviceTime: + return 'CMD_SET_DEVICE_TIME'; + case cmdSendSelfAdvert: + return 'CMD_SEND_SELF_ADVERT'; + case cmdSetAdvertName: + return 'CMD_SET_ADVERT_NAME'; + case cmdAddUpdateContact: + return 'CMD_ADD_UPDATE_CONTACT'; + case cmdSyncNextMessage: + return 'CMD_SYNC_NEXT_MESSAGE'; + case cmdSetRadioParams: + return 'CMD_SET_RADIO_PARAMS'; + case cmdSetRadioTxPower: + return 'CMD_SET_RADIO_TX_POWER'; + case cmdResetPath: + return 'CMD_RESET_PATH'; + case cmdRemoveContact: + return 'CMD_REMOVE_CONTACT'; + case cmdReboot: + return 'CMD_REBOOT'; + case cmdGetBattAndStorage: + return 'CMD_GET_BATT_AND_STORAGE'; + case cmdSendLogin: + return 'CMD_SEND_LOGIN'; + case cmdGetChannel: + return 'CMD_GET_CHANNEL'; + case cmdSetChannel: + return 'CMD_SET_CHANNEL'; + case cmdGetRadioSettings: + return 'CMD_GET_RADIO_SETTINGS'; + case respCodeOk: + return 'RESP_CODE_OK'; + case respCodeErr: + return 'RESP_CODE_ERR'; + case respCodeContactsStart: + return 'RESP_CODE_CONTACTS_START'; + case respCodeContact: + return 'RESP_CODE_CONTACT'; + case respCodeEndOfContacts: + return 'RESP_CODE_END_OF_CONTACTS'; + case respCodeSelfInfo: + return 'RESP_CODE_SELF_INFO'; + case respCodeSent: + return 'RESP_CODE_SENT'; + case respCodeContactMsgRecv: + return 'RESP_CODE_CONTACT_MSG_RECV'; + case respCodeChannelMsgRecv: + return 'RESP_CODE_CHANNEL_MSG_RECV'; + case respCodeCurrTime: + return 'RESP_CODE_CURR_TIME'; + case respCodeNoMoreMessages: + return 'RESP_CODE_NO_MORE_MESSAGES'; + case respCodeBattAndStorage: + return 'RESP_CODE_BATT_AND_STORAGE'; + case respCodeContactMsgRecvV3: + return 'RESP_CODE_CONTACT_MSG_RECV_V3'; + case respCodeChannelMsgRecvV3: + return 'RESP_CODE_CHANNEL_MSG_RECV_V3'; + case respCodeChannelInfo: + return 'RESP_CODE_CHANNEL_INFO'; + case respCodeRadioSettings: + return 'RESP_CODE_RADIO_SETTINGS'; + case pushCodeAdvert: + return 'PUSH_CODE_ADVERT'; + case pushCodePathUpdated: + return 'PUSH_CODE_PATH_UPDATED'; + case pushCodeSendConfirmed: + return 'PUSH_CODE_SEND_CONFIRMED'; + case pushCodeMsgWaiting: + return 'PUSH_CODE_MSG_WAITING'; + case pushCodeLoginSuccess: + return 'PUSH_CODE_LOGIN_SUCCESS'; + case pushCodeLoginFail: + return 'PUSH_CODE_LOGIN_FAIL'; + case pushCodeLogRxData: + return 'PUSH_CODE_LOG_RX_DATA'; + case pushCodeNewAdvert: + return 'PUSH_CODE_NEW_ADVERT'; + default: + return 'CODE_$code'; + } + } + + String _frameDetail(int code, Uint8List frame) { + switch (code) { + case respCodeSent: + if (frame.length >= 10) { + final timeoutMs = readUint32LE(frame, 6); + return ' • timeout=${timeoutMs}ms'; + } + return ''; + case pushCodeSendConfirmed: + if (frame.length >= 9) { + final tripMs = readUint32LE(frame, 5); + return ' • trip=${tripMs}ms'; + } + return ''; + case pushCodeLoginSuccess: + return ' • login ok'; + case pushCodeLoginFail: + return ' • login fail'; + case respCodeBattAndStorage: + if (frame.length >= 3) { + final mv = readUint16LE(frame, 1); + return ' • ${mv}mV'; + } + return ''; + default: + return ''; + } + } +} diff --git a/lib/services/map_marker_service.dart b/lib/services/map_marker_service.dart new file mode 100644 index 00000000..9ae109e5 --- /dev/null +++ b/lib/services/map_marker_service.dart @@ -0,0 +1,16 @@ +import 'package:shared_preferences/shared_preferences.dart'; + +class MapMarkerService { + static const String _removedKey = 'map_removed_marker_ids'; + + Future> loadRemovedIds() async { + final prefs = await SharedPreferences.getInstance(); + final items = prefs.getStringList(_removedKey) ?? const []; + return items.toSet(); + } + + Future saveRemovedIds(Set ids) async { + final prefs = await SharedPreferences.getInstance(); + await prefs.setStringList(_removedKey, ids.toList()); + } +} diff --git a/lib/services/message_retry_service.dart b/lib/services/message_retry_service.dart new file mode 100644 index 00000000..34433639 --- /dev/null +++ b/lib/services/message_retry_service.dart @@ -0,0 +1,348 @@ +import 'dart:async'; +import 'dart:typed_data'; +import 'package:flutter/foundation.dart'; +import 'package:uuid/uuid.dart'; +import '../models/contact.dart'; +import '../models/message.dart'; +import '../models/path_selection.dart'; +import 'storage_service.dart'; +import 'app_settings_service.dart'; + +class MessageRetryService extends ChangeNotifier { + static const int maxRetries = 5; + + final StorageService _storage; + final Map _timeoutTimers = {}; + final Map _pendingMessages = {}; + final Map _pendingContacts = {}; + final Map _pendingPathSelections = {}; + + Function(Contact, String, bool, int, int)? _sendMessageCallback; + Function(String, Message)? _addMessageCallback; + Function(Message)? _updateMessageCallback; + Function(Contact)? _clearContactPathCallback; + Function(int, int)? _calculateTimeoutCallback; + AppSettingsService? _appSettingsService; + Function(String, PathSelection, bool, int?)? _recordPathResultCallback; + + MessageRetryService(this._storage); + + void initialize({ + required Function(Contact, String, bool, int, int) sendMessageCallback, + required Function(String, Message) addMessageCallback, + required Function(Message) updateMessageCallback, + Function(Contact)? clearContactPathCallback, + Function(int pathLength, int messageBytes)? calculateTimeoutCallback, + AppSettingsService? appSettingsService, + Function(String, PathSelection, bool, int?)? recordPathResultCallback, + }) { + _sendMessageCallback = sendMessageCallback; + _addMessageCallback = addMessageCallback; + _updateMessageCallback = updateMessageCallback; + _clearContactPathCallback = clearContactPathCallback; + _calculateTimeoutCallback = calculateTimeoutCallback; + _appSettingsService = appSettingsService; + _recordPathResultCallback = recordPathResultCallback; + } + + Future sendMessageWithRetry({ + required Contact contact, + required String text, + bool forceFlood = false, + PathSelection? pathSelection, + Uint8List? pathBytes, + int? pathLength, + }) async { + final messageId = const Uuid().v4(); + final effectiveForceFlood = forceFlood || (pathSelection?.useFlood ?? false); + final messagePathBytes = + pathBytes ?? _resolveMessagePathBytes(contact, effectiveForceFlood, pathSelection); + final messagePathLength = + pathLength ?? _resolveMessagePathLength(contact, effectiveForceFlood, pathSelection); + final message = Message( + senderKey: contact.publicKey, + text: text, + timestamp: DateTime.now(), + isOutgoing: true, + status: MessageStatus.pending, + messageId: messageId, + retryCount: 0, + forceFlood: effectiveForceFlood, + pathLength: messagePathLength, + pathBytes: messagePathBytes, + ); + + _pendingMessages[messageId] = message; + _pendingContacts[messageId] = contact; + if (pathSelection != null) { + _pendingPathSelections[messageId] = pathSelection; + } + + if (_addMessageCallback != null) { + _addMessageCallback!(contact.publicKeyHex, message); + } + + await _attemptSend(messageId); + } + + Future _attemptSend(String messageId) async { + final message = _pendingMessages[messageId]; + final contact = _pendingContacts[messageId]; + + if (message == null || contact == null) return; + + Contact sendContact = contact; + final attempt = message.retryCount.clamp(0, 3); + + if (message.forceFlood && contact.pathLength >= 0) { + sendContact = Contact( + publicKey: contact.publicKey, + name: contact.name, + type: contact.type, + pathLength: -1, + path: contact.path, + latitude: contact.latitude, + longitude: contact.longitude, + lastSeen: contact.lastSeen, + ); + } + + if (_sendMessageCallback != null) { + final timestampSeconds = message.timestamp.millisecondsSinceEpoch ~/ 1000; + _sendMessageCallback!( + sendContact, + message.text, + message.forceFlood, + attempt, + timestampSeconds, + ); + } + } + + void updateMessageFromSent(Uint8List ackHash, int timeoutMs) { + for (var entry in _pendingMessages.entries) { + final message = entry.value; + if (message.status == MessageStatus.pending) { + final contact = _pendingContacts[entry.key]; + final selection = _pendingPathSelections[entry.key]; + + // Use device-provided timeout, or calculate from radio settings if timeout is 0 or invalid + int actualTimeout = timeoutMs; + if (timeoutMs <= 0 && _calculateTimeoutCallback != null && contact != null) { + int pathLengthValue; + if (selection != null) { + pathLengthValue = selection.useFlood ? -1 : selection.hopCount; + if (pathLengthValue < 0) pathLengthValue = contact.pathLength; + } else if (message.pathLength != null) { + pathLengthValue = message.pathLength!; + } else { + pathLengthValue = message.forceFlood ? -1 : contact.pathLength; + } + actualTimeout = _calculateTimeoutCallback!(pathLengthValue, message.text.length); + debugPrint('Using calculated timeout: ${actualTimeout}ms for ${contact.pathLength} hops'); + } + + final updatedMessage = message.copyWith( + status: MessageStatus.sent, + expectedAckHash: ackHash, + estimatedTimeoutMs: actualTimeout, + sentAt: DateTime.now(), + ); + + _pendingMessages[entry.key] = updatedMessage; + + if (_updateMessageCallback != null) { + _updateMessageCallback!(updatedMessage); + } + + _startTimeoutTimer(entry.key, actualTimeout); + return; + } + } + } + + void _startTimeoutTimer(String messageId, int timeoutMs) { + _timeoutTimers[messageId]?.cancel(); + _timeoutTimers[messageId] = Timer(Duration(milliseconds: timeoutMs), () { + _handleTimeout(messageId); + }); + } + + void _handleTimeout(String messageId) { + final message = _pendingMessages[messageId]; + final contact = _pendingContacts[messageId]; + final selection = _pendingPathSelections[messageId]; + + if (message == null || contact == null) return; + + if (message.retryCount < maxRetries - 1) { + final backoffMs = 1000 * (1 << message.retryCount); + + final updatedMessage = message.copyWith( + retryCount: message.retryCount + 1, + status: MessageStatus.pending, + ); + + _pendingMessages[messageId] = updatedMessage; + + if (_updateMessageCallback != null) { + _updateMessageCallback!(updatedMessage); + } + + Timer(Duration(milliseconds: backoffMs), () { + _attemptSend(messageId); + }); + } else { + // Max retries reached - mark as failed + final failedMessage = message.copyWith(status: MessageStatus.failed); + + _pendingMessages.remove(messageId); + _pendingContacts.remove(messageId); + _pendingPathSelections.remove(messageId); + _timeoutTimers[messageId]?.cancel(); + _timeoutTimers.remove(messageId); + + // Check if we should clear the path on max retry + if (_appSettingsService?.settings.clearPathOnMaxRetry == true && + _clearContactPathCallback != null) { + _clearContactPathCallback!(contact); + } + + _recordPathResultFromMessage(contact.publicKeyHex, message, selection, false, null); + + if (_updateMessageCallback != null) { + _updateMessageCallback!(failedMessage); + } + + notifyListeners(); + } + } + + void handleAckReceived(Uint8List ackHash, int tripTimeMs) { + String? matchedMessageId; + + for (var entry in _pendingMessages.entries) { + final message = entry.value; + if (message.expectedAckHash != null && + listEquals(message.expectedAckHash, ackHash)) { + matchedMessageId = entry.key; + break; + } + } + + if (matchedMessageId != null) { + final message = _pendingMessages[matchedMessageId]!; + final contact = _pendingContacts[matchedMessageId]; + final selection = _pendingPathSelections[matchedMessageId]; + _timeoutTimers[matchedMessageId]?.cancel(); + _timeoutTimers.remove(matchedMessageId); + + final deliveredMessage = message.copyWith( + status: MessageStatus.delivered, + deliveredAt: DateTime.now(), + tripTimeMs: tripTimeMs, + ); + + _pendingMessages.remove(matchedMessageId); + _pendingContacts.remove(matchedMessageId); + _pendingPathSelections.remove(matchedMessageId); + + if (_updateMessageCallback != null) { + _updateMessageCallback!(deliveredMessage); + } + + if (contact != null) { + _recordPathResultFromMessage(contact.publicKeyHex, message, selection, true, tripTimeMs); + } + + notifyListeners(); + } + } + + Uint8List _resolveMessagePathBytes( + Contact contact, + bool forceFlood, + PathSelection? selection, + ) { + if (forceFlood || contact.pathLength < 0 || selection?.useFlood == true) { + return Uint8List(0); + } + if (selection != null && selection.pathBytes.isNotEmpty) { + return Uint8List.fromList(selection.pathBytes); + } + return contact.path; + } + + int? _resolveMessagePathLength( + Contact contact, + bool forceFlood, + PathSelection? selection, + ) { + if (forceFlood || contact.pathLength < 0 || selection?.useFlood == true) { + return -1; + } + if (selection != null && selection.pathBytes.isNotEmpty) { + return selection.hopCount; + } + return contact.pathLength; + } + + String? getContactKeyForAckHash(Uint8List ackHash) { + for (var entry in _pendingMessages.entries) { + final message = entry.value; + if (message.expectedAckHash != null && + listEquals(message.expectedAckHash, ackHash)) { + final contact = _pendingContacts[entry.key]; + return contact?.publicKeyHex; + } + } + return null; + } + + int calculateDefaultTimeout(Contact contact) { + if (contact.pathLength < 0) { + return 15000; + } else { + return 3000 + (3000 * contact.pathLength); + } + } + + void _recordPathResultFromMessage( + String contactKey, + Message message, + PathSelection? selection, + bool success, + int? tripTimeMs, + ) { + if (_recordPathResultCallback == null) return; + final recordSelection = selection ?? _selectionFromMessage(message); + if (recordSelection == null) return; + _recordPathResultCallback!(contactKey, recordSelection, success, tripTimeMs); + } + + PathSelection? _selectionFromMessage(Message message) { + if (message.forceFlood || (message.pathLength != null && message.pathLength! < 0)) { + return const PathSelection(pathBytes: [], hopCount: -1, useFlood: true); + } + if (message.pathBytes.isEmpty && message.pathLength == null) { + return null; + } + return PathSelection( + pathBytes: message.pathBytes, + hopCount: message.pathLength ?? message.pathBytes.length, + useFlood: false, + ); + } + + @override + void dispose() { + for (var timer in _timeoutTimers.values) { + timer.cancel(); + } + _timeoutTimers.clear(); + _pendingMessages.clear(); + _pendingContacts.clear(); + _pendingPathSelections.clear(); + super.dispose(); + } +} diff --git a/lib/services/notification_service.dart b/lib/services/notification_service.dart new file mode 100644 index 00000000..24610818 --- /dev/null +++ b/lib/services/notification_service.dart @@ -0,0 +1,158 @@ +import 'package:flutter_local_notifications/flutter_local_notifications.dart'; +import 'package:flutter/foundation.dart'; + +class NotificationService { + static final NotificationService _instance = NotificationService._internal(); + factory NotificationService() => _instance; + NotificationService._internal(); + + final FlutterLocalNotificationsPlugin _notifications = FlutterLocalNotificationsPlugin(); + bool _isInitialized = false; + + Future initialize() async { + if (_isInitialized) return; + + const androidSettings = AndroidInitializationSettings('@mipmap/ic_launcher'); + const iosSettings = DarwinInitializationSettings( + requestAlertPermission: true, + requestBadgePermission: true, + requestSoundPermission: true, + ); + + const initSettings = InitializationSettings( + android: androidSettings, + iOS: iosSettings, + ); + + try { + await _notifications.initialize( + initSettings, + onDidReceiveNotificationResponse: _onNotificationTapped, + ); + _isInitialized = true; + } catch (e) { + debugPrint('Error initializing notifications: $e'); + } + } + + Future requestPermissions() async { + if (!_isInitialized) { + await initialize(); + } + + // Request Android 13+ notification permission + final androidPlugin = _notifications.resolvePlatformSpecificImplementation< + AndroidFlutterLocalNotificationsPlugin>(); + if (androidPlugin != null) { + final granted = await androidPlugin.requestNotificationsPermission(); + return granted ?? false; + } + + // iOS permissions are requested during initialization + final iosPlugin = _notifications.resolvePlatformSpecificImplementation< + IOSFlutterLocalNotificationsPlugin>(); + if (iosPlugin != null) { + final granted = await iosPlugin.requestPermissions( + alert: true, + badge: true, + sound: true, + ); + return granted ?? false; + } + + return true; + } + + Future showMessageNotification({ + required String contactName, + required String message, + String? contactId, + }) async { + if (!_isInitialized) { + await initialize(); + } + + const androidDetails = AndroidNotificationDetails( + 'messages', + 'Messages', + channelDescription: 'New message notifications', + importance: Importance.high, + priority: Priority.high, + icon: '@mipmap/ic_launcher', + ); + + const iosDetails = DarwinNotificationDetails( + presentAlert: true, + presentBadge: true, + presentSound: true, + ); + + const notificationDetails = NotificationDetails( + android: androidDetails, + iOS: iosDetails, + ); + + await _notifications.show( + contactId?.hashCode ?? 0, + 'New message from $contactName', + message.length > 100 ? '${message.substring(0, 100)}...' : message, + notificationDetails, + payload: 'message:$contactId', + ); + } + + Future showAdvertNotification({ + required String contactName, + required String contactType, + String? contactId, + }) async { + if (!_isInitialized) { + await initialize(); + } + + const androidDetails = AndroidNotificationDetails( + 'adverts', + 'Advertisements', + channelDescription: 'New node advertisement notifications', + importance: Importance.defaultImportance, + priority: Priority.defaultPriority, + icon: '@mipmap/ic_launcher', + ); + + const iosDetails = DarwinNotificationDetails( + presentAlert: true, + presentBadge: true, + presentSound: true, + ); + + const notificationDetails = NotificationDetails( + android: androidDetails, + iOS: iosDetails, + ); + + await _notifications.show( + contactId?.hashCode ?? DateTime.now().millisecondsSinceEpoch, + 'New $contactType discovered', + contactName, + notificationDetails, + payload: 'advert:$contactId', + ); + } + + void _onNotificationTapped(NotificationResponse response) { + final payload = response.payload; + if (payload != null) { + debugPrint('Notification tapped: $payload'); + // Handle navigation based on payload + // This can be extended to navigate to specific screens + } + } + + Future cancelAll() async { + await _notifications.cancelAll(); + } + + Future cancel(int id) async { + await _notifications.cancel(id); + } +} diff --git a/lib/services/path_history_service.dart b/lib/services/path_history_service.dart new file mode 100644 index 00000000..9c8d8041 --- /dev/null +++ b/lib/services/path_history_service.dart @@ -0,0 +1,324 @@ +import 'package:flutter/foundation.dart'; +import '../models/contact.dart'; +import '../models/path_history.dart'; +import '../models/path_selection.dart'; +import 'storage_service.dart'; + +class PathHistoryService extends ChangeNotifier { + final StorageService _storage; + final Map _cache = {}; + final Map _autoRotationIndex = {}; + final Map _floodStats = {}; + + static const int _maxHistoryEntries = 100; + static const int _autoRotationTopCount = 3; + + PathHistoryService(this._storage); + + Future initialize() async { + // Load cached path histories on startup if needed + } + + void handlePathUpdated(Contact contact) { + if (contact.pathLength < 0) return; + + _addPathRecord( + contactPubKeyHex: contact.publicKeyHex, + hopCount: contact.pathLength, + tripTimeMs: 0, + wasFloodDiscovery: true, + pathBytes: contact.path, + successCount: 0, + failureCount: 0, + ); + } + + void recordPathAttempt(String contactPubKeyHex, PathSelection selection) { + if (selection.useFlood) { + _updateFloodStats(contactPubKeyHex); + return; + } + + _addPathRecord( + contactPubKeyHex: contactPubKeyHex, + hopCount: selection.hopCount, + tripTimeMs: 0, + wasFloodDiscovery: false, + pathBytes: selection.pathBytes, + successCount: 0, + failureCount: 0, + ); + } + + void recordPathResult( + String contactPubKeyHex, + PathSelection selection, { + required bool success, + int? tripTimeMs, + }) { + if (selection.useFlood) { + final stats = _floodStats.putIfAbsent(contactPubKeyHex, () => _FloodStats()); + if (success) { + stats.successCount += 1; + if (tripTimeMs != null) stats.lastTripTimeMs = tripTimeMs; + } else { + stats.failureCount += 1; + } + stats.lastUsed = DateTime.now(); + return; + } + + final existing = _findPathRecord(contactPubKeyHex, selection.pathBytes); + final successCount = (existing?.successCount ?? 0) + (success ? 1 : 0); + final failureCount = (existing?.failureCount ?? 0) + (success ? 0 : 1); + + _addPathRecord( + contactPubKeyHex: contactPubKeyHex, + hopCount: selection.hopCount, + tripTimeMs: success ? (tripTimeMs ?? 0) : (existing?.tripTimeMs ?? 0), + wasFloodDiscovery: existing?.wasFloodDiscovery ?? false, + pathBytes: selection.pathBytes, + successCount: successCount, + failureCount: failureCount, + ); + } + + PathSelection getNextAutoPathSelection(String contactPubKeyHex) { + final ranked = _getRankedPaths(contactPubKeyHex) + .take(_autoRotationTopCount) + .toList(); + if (ranked.isEmpty) { + return const PathSelection(pathBytes: [], hopCount: -1, useFlood: true); + } + + final selections = ranked + .map((path) => PathSelection( + pathBytes: path.pathBytes, + hopCount: path.hopCount, + useFlood: false, + )) + .toList() + ..add(const PathSelection(pathBytes: [], hopCount: -1, useFlood: true)); + + final currentIndex = _autoRotationIndex[contactPubKeyHex] ?? 0; + final selection = selections[currentIndex % selections.length]; + _autoRotationIndex[contactPubKeyHex] = currentIndex + 1; + return selection; + } + + void _addPathRecord({ + required String contactPubKeyHex, + required int hopCount, + required int tripTimeMs, + required bool wasFloodDiscovery, + required List pathBytes, + required int successCount, + required int failureCount, + }) { + var history = _cache[contactPubKeyHex]; + + if (history == null) { + _loadHistoryFromStorage(contactPubKeyHex).then((loaded) { + if (loaded != null) { + _cache[contactPubKeyHex] = loaded; + _addPathRecordInternal( + contactPubKeyHex, + hopCount, + tripTimeMs, + wasFloodDiscovery, + pathBytes, + successCount, + failureCount, + ); + } else { + _cache[contactPubKeyHex] = ContactPathHistory( + contactPubKeyHex: contactPubKeyHex, + recentPaths: [], + ); + _addPathRecordInternal( + contactPubKeyHex, + hopCount, + tripTimeMs, + wasFloodDiscovery, + pathBytes, + successCount, + failureCount, + ); + } + }); + return; + } + + _addPathRecordInternal( + contactPubKeyHex, + hopCount, + tripTimeMs, + wasFloodDiscovery, + pathBytes, + successCount, + failureCount, + ); + } + + void _addPathRecordInternal( + String contactPubKeyHex, + int hopCount, + int tripTimeMs, + bool wasFloodDiscovery, + List pathBytes, + int successCount, + int failureCount, + ) { + var history = _cache[contactPubKeyHex]; + if (history == null) return; + + final existing = _findPathRecord(contactPubKeyHex, pathBytes); + if (existing != null) { + successCount = successCount == 0 ? existing.successCount : successCount; + failureCount = failureCount == 0 ? existing.failureCount : failureCount; + if (tripTimeMs == 0) { + tripTimeMs = existing.tripTimeMs; + } + wasFloodDiscovery = existing.wasFloodDiscovery || wasFloodDiscovery; + } + + final newRecord = PathRecord( + hopCount: hopCount, + tripTimeMs: tripTimeMs, + timestamp: DateTime.now(), + wasFloodDiscovery: wasFloodDiscovery, + pathBytes: pathBytes, + successCount: successCount, + failureCount: failureCount, + ); + + final updatedPaths = List.from(history.recentPaths); + + updatedPaths.removeWhere((p) => _pathsEqual(p.pathBytes, pathBytes)); + + if (existing == null && updatedPaths.length >= _maxHistoryEntries) { + return; + } + + updatedPaths.insert(0, newRecord); + + final updatedHistory = ContactPathHistory( + contactPubKeyHex: contactPubKeyHex, + recentPaths: updatedPaths, + ); + + _cache[contactPubKeyHex] = updatedHistory; + _storage.savePathHistory(contactPubKeyHex, updatedHistory); + + notifyListeners(); + } + + List getRecentPaths(String contactPubKeyHex) { + final history = _cache[contactPubKeyHex]; + if (history != null) { + return history.recentPaths; + } + + _loadHistoryFromStorage(contactPubKeyHex).then((loaded) { + if (loaded != null) { + _cache[contactPubKeyHex] = loaded; + notifyListeners(); + } + }); + + return []; + } + + Future _loadHistoryFromStorage( + String contactPubKeyHex) async { + return await _storage.loadPathHistory(contactPubKeyHex); + } + + PathRecord? getFastestPath(String contactPubKeyHex) { + final history = _cache[contactPubKeyHex]; + return history?.fastest; + } + + PathRecord? getMostRecentPath(String contactPubKeyHex) { + final history = _cache[contactPubKeyHex]; + return history?.mostRecent; + } + + Future clearPathHistory(String contactPubKeyHex) async { + _cache.remove(contactPubKeyHex); + _autoRotationIndex.remove(contactPubKeyHex); + _floodStats.remove(contactPubKeyHex); + await _storage.clearPathHistory(contactPubKeyHex); + notifyListeners(); + } + + Future removePathRecord( + String contactPubKeyHex, + List pathBytes, + ) async { + final history = _cache[contactPubKeyHex]; + if (history == null) return; + + final updatedPaths = List.from(history.recentPaths) + ..removeWhere((p) => _pathsEqual(p.pathBytes, pathBytes)); + + _cache[contactPubKeyHex] = ContactPathHistory( + contactPubKeyHex: contactPubKeyHex, + recentPaths: updatedPaths, + ); + + await _storage.savePathHistory(contactPubKeyHex, _cache[contactPubKeyHex]!); + notifyListeners(); + } + + PathRecord? _findPathRecord(String contactPubKeyHex, List pathBytes) { + final history = _cache[contactPubKeyHex]; + if (history == null) return null; + for (final record in history.recentPaths) { + if (_pathsEqual(record.pathBytes, pathBytes)) { + return record; + } + } + return null; + } + + List _getRankedPaths(String contactPubKeyHex) { + final history = _cache[contactPubKeyHex]; + if (history == null) return []; + + final ranked = List.from(history.recentPaths) + ..removeWhere((p) => p.pathBytes.isEmpty); + + ranked.sort((a, b) { + final aRate = (a.successCount + 1) / (a.successCount + a.failureCount + 2); + final bRate = (b.successCount + 1) / (b.successCount + b.failureCount + 2); + if (aRate != bRate) return bRate.compareTo(aRate); + if (a.successCount != b.successCount) { + return b.successCount.compareTo(a.successCount); + } + + final aTrip = a.tripTimeMs == 0 ? 999999 : a.tripTimeMs; + final bTrip = b.tripTimeMs == 0 ? 999999 : b.tripTimeMs; + if (aTrip != bTrip) return aTrip.compareTo(bTrip); + return b.timestamp.compareTo(a.timestamp); + }); + + return ranked; + } + + bool _pathsEqual(List a, List b) { + return listEquals(a, b); + } + + void _updateFloodStats(String contactPubKeyHex) { + final stats = _floodStats.putIfAbsent(contactPubKeyHex, () => _FloodStats()); + stats.lastUsed = DateTime.now(); + } +} + +class _FloodStats { + int successCount = 0; + int failureCount = 0; + int lastTripTimeMs = 0; + DateTime? lastUsed; +} diff --git a/lib/services/repeater_command_service.dart b/lib/services/repeater_command_service.dart new file mode 100644 index 00000000..f1fd1574 --- /dev/null +++ b/lib/services/repeater_command_service.dart @@ -0,0 +1,133 @@ +import 'dart:async'; +import 'dart:typed_data'; +import '../models/contact.dart'; +import '../connector/meshcore_connector.dart'; +import '../connector/meshcore_protocol.dart'; + +class RepeaterCommandService { + final MeshCoreConnector _connector; + final Map> _pendingCommands = {}; + final Map _commandTimeouts = {}; + final Map _commandPrefixes = {}; + final Map _pendingByPrefix = {}; + int _prefixCounter = 0; + + static const int timeoutSeconds = 10; // Flood mode timeout + static const int maxRetries = 5; + + RepeaterCommandService(this._connector); + + /// Send a CLI command to a repeater with automatic retries + /// Returns a future that completes when a response is received or after max retries + Future sendCommand( + Contact repeater, + String command, { + Function(String)? onResponse, + Function(int)? onAttempt, + }) async { + final repeaterKey = repeater.publicKeyHex; + final hasPending = _pendingCommands.keys.any((id) => id.startsWith(repeaterKey)); + if (hasPending) { + throw Exception('Another command is still awaiting a response.'); + } + + // Create completer for this command + final commandId = '${repeaterKey}_${DateTime.now().millisecondsSinceEpoch}'; + final completer = Completer(); + _pendingCommands[commandId] = completer; + + onAttempt?.call(0); + + // Send frame once (no retries) + try { + final prefix = _nextPrefixToken(); + _commandPrefixes[commandId] = prefix; + _pendingByPrefix[prefix] = commandId; + final framedCommand = '$prefix$command'; + final frame = buildSendCliCommandFrame(repeater.publicKey, framedCommand, attempt: 0); + await _connector.sendFrame(frame); + } catch (e) { + _cleanup(commandId); + throw Exception('Failed to send command: $e'); + } + + // Set timeout for this attempt + _commandTimeouts[commandId]?.cancel(); + _commandTimeouts[commandId] = Timer( + Duration(seconds: timeoutSeconds), + () { + final completer = _pendingCommands[commandId]; + if (completer != null && !completer.isCompleted) { + completer.completeError('Command timeout after $timeoutSeconds seconds'); + _cleanup(commandId); + } + }, + ); + + // Wait for response or timeout + try { + final response = await completer.future; + return response; + } finally { + _cleanup(commandId); + } + } + + /// Call this when a text message response is received from a repeater + void handleResponse(Contact repeater, String responseText) { + // Find pending command for this repeater and complete it + final repeaterKey = repeater.publicKeyHex; + + String? commandId; + String responsePayload = responseText; + if (responseText.length >= 3 && responseText[2] == '|') { + final prefix = responseText.substring(0, 3); + commandId = _pendingByPrefix[prefix]; + responsePayload = responseText.substring(3).trimLeft(); + } + + commandId ??= _pendingCommands.keys.firstWhere( + (id) => id.startsWith(repeaterKey), + orElse: () => '', + ); + + if (commandId.isEmpty) return; + + final completer = _pendingCommands[commandId]; + if (completer != null && !completer.isCompleted) { + completer.complete(responsePayload); + _cleanup(commandId); + } + } + + void _cleanup(String commandId) { + _commandTimeouts[commandId]?.cancel(); + _commandTimeouts.remove(commandId); + _pendingCommands.remove(commandId); + final prefix = _commandPrefixes.remove(commandId); + if (prefix != null) { + _pendingByPrefix.remove(prefix); + } + } + + void dispose() { + for (final timer in _commandTimeouts.values) { + timer.cancel(); + } + _commandTimeouts.clear(); + _pendingCommands.clear(); + _commandPrefixes.clear(); + _pendingByPrefix.clear(); + } + + String _nextPrefixToken() { + for (var i = 0; i < 256; i++) { + final value = _prefixCounter++ & 0xFF; + final token = '${value.toRadixString(16).padLeft(2, '0').toUpperCase()}|'; + if (!_pendingByPrefix.containsKey(token)) { + return token; + } + } + return '00|'; + } +} diff --git a/lib/services/storage_service.dart b/lib/services/storage_service.dart new file mode 100644 index 00000000..052f0c8d --- /dev/null +++ b/lib/services/storage_service.dart @@ -0,0 +1,120 @@ +import 'dart:convert'; +import 'package:shared_preferences/shared_preferences.dart'; +import '../models/path_history.dart'; + +class StorageService { + static const String _pathHistoryPrefix = 'path_history_'; + static const String _pendingMessagesKey = 'pending_messages'; + static const String _repeaterPasswordsKey = 'repeater_passwords'; + + Future savePathHistory( + String contactPubKeyHex, ContactPathHistory history) async { + final prefs = await SharedPreferences.getInstance(); + final key = '$_pathHistoryPrefix$contactPubKeyHex'; + final jsonStr = jsonEncode(history.toJson()); + await prefs.setString(key, jsonStr); + } + + Future loadPathHistory(String contactPubKeyHex) async { + final prefs = await SharedPreferences.getInstance(); + final key = '$_pathHistoryPrefix$contactPubKeyHex'; + final jsonStr = prefs.getString(key); + + if (jsonStr == null) return null; + + try { + final json = jsonDecode(jsonStr) as Map; + return ContactPathHistory.fromJson(contactPubKeyHex, json); + } catch (e) { + return null; + } + } + + Future clearPathHistory(String contactPubKeyHex) async { + final prefs = await SharedPreferences.getInstance(); + final key = '$_pathHistoryPrefix$contactPubKeyHex'; + await prefs.remove(key); + } + + Future clearAllPathHistories() async { + final prefs = await SharedPreferences.getInstance(); + final keys = prefs.getKeys(); + final pathHistoryKeys = + keys.where((key) => key.startsWith(_pathHistoryPrefix)); + + for (final key in pathHistoryKeys) { + await prefs.remove(key); + } + } + + Future> loadPendingMessages() async { + final prefs = await SharedPreferences.getInstance(); + final jsonStr = prefs.getString(_pendingMessagesKey); + + if (jsonStr == null) return {}; + + try { + final json = jsonDecode(jsonStr) as Map; + return json.map((key, value) => MapEntry(key, value as String)); + } catch (e) { + return {}; + } + } + + Future savePendingMessages(Map pending) async { + final prefs = await SharedPreferences.getInstance(); + final jsonStr = jsonEncode(pending); + await prefs.setString(_pendingMessagesKey, jsonStr); + } + + Future clearPendingMessages() async { + final prefs = await SharedPreferences.getInstance(); + await prefs.remove(_pendingMessagesKey); + } + + /// Save a repeater password by public key hex + Future saveRepeaterPassword( + String repeaterPubKeyHex, String password) async { + final prefs = await SharedPreferences.getInstance(); + final passwords = await loadRepeaterPasswords(); + passwords[repeaterPubKeyHex] = password; + final jsonStr = jsonEncode(passwords); + await prefs.setString(_repeaterPasswordsKey, jsonStr); + } + + /// Load all saved repeater passwords (map of pubKeyHex -> password) + Future> loadRepeaterPasswords() async { + final prefs = await SharedPreferences.getInstance(); + final jsonStr = prefs.getString(_repeaterPasswordsKey); + + if (jsonStr == null) return {}; + + try { + final json = jsonDecode(jsonStr) as Map; + return json.map((key, value) => MapEntry(key, value as String)); + } catch (e) { + return {}; + } + } + + /// Get a specific repeater's saved password + Future getRepeaterPassword(String repeaterPubKeyHex) async { + final passwords = await loadRepeaterPasswords(); + return passwords[repeaterPubKeyHex]; + } + + /// Remove a saved repeater password + Future removeRepeaterPassword(String repeaterPubKeyHex) async { + final prefs = await SharedPreferences.getInstance(); + final passwords = await loadRepeaterPasswords(); + passwords.remove(repeaterPubKeyHex); + final jsonStr = jsonEncode(passwords); + await prefs.setString(_repeaterPasswordsKey, jsonStr); + } + + /// Clear all saved repeater passwords + Future clearAllRepeaterPasswords() async { + final prefs = await SharedPreferences.getInstance(); + await prefs.remove(_repeaterPasswordsKey); + } +} diff --git a/lib/storage/channel_message_store.dart b/lib/storage/channel_message_store.dart new file mode 100644 index 00000000..f40377e1 --- /dev/null +++ b/lib/storage/channel_message_store.dart @@ -0,0 +1,119 @@ +import 'dart:convert'; +import 'dart:typed_data'; +import 'package:shared_preferences/shared_preferences.dart'; +import '../models/channel_message.dart'; +import '../helpers/smaz.dart'; + +class ChannelMessageStore { + static const String _keyPrefix = 'channel_messages_'; + + /// Save messages for a specific channel + Future saveChannelMessages(int channelIndex, List messages) async { + final prefs = await SharedPreferences.getInstance(); + final key = '$_keyPrefix$channelIndex'; + + // Convert messages to JSON + final jsonList = messages.map((msg) => _messageToJson(msg)).toList(); + final jsonString = jsonEncode(jsonList); + + await prefs.setString(key, jsonString); + } + + /// Load messages for a specific channel + Future> loadChannelMessages(int channelIndex) async { + final prefs = await SharedPreferences.getInstance(); + final key = '$_keyPrefix$channelIndex'; + + final jsonString = prefs.getString(key); + if (jsonString == null) return []; + + try { + final jsonList = jsonDecode(jsonString) as List; + return jsonList.map((json) => _messageFromJson(json)).toList(); + } catch (e) { + // If parsing fails, return empty list + return []; + } + } + + /// Clear messages for a specific channel + Future clearChannelMessages(int channelIndex) async { + final prefs = await SharedPreferences.getInstance(); + final key = '$_keyPrefix$channelIndex'; + await prefs.remove(key); + } + + /// Clear all channel messages + Future clearAllChannelMessages() async { + final prefs = await SharedPreferences.getInstance(); + final keys = prefs.getKeys().where((k) => k.startsWith(_keyPrefix)); + for (var key in keys) { + await prefs.remove(key); + } + } + + /// Convert ChannelMessage to JSON map + Map _messageToJson(ChannelMessage msg) { + return { + 'senderKey': msg.senderKey != null ? base64Encode(msg.senderKey!) : null, + 'senderName': msg.senderName, + 'text': msg.text, + 'timestamp': msg.timestamp.millisecondsSinceEpoch, + 'isOutgoing': msg.isOutgoing, + 'status': msg.status.index, + 'channelIndex': msg.channelIndex, + 'repeatCount': msg.repeatCount, + 'pathLength': msg.pathLength, + 'pathBytes': base64Encode(msg.pathBytes), + 'repeats': msg.repeats.map(_repeatToJson).toList(), + }; + } + + /// Convert JSON map to ChannelMessage + ChannelMessage _messageFromJson(Map json) { + final rawText = json['text'] as String; + final decodedText = Smaz.tryDecodePrefixed(rawText) ?? rawText; + return ChannelMessage( + senderKey: json['senderKey'] != null + ? Uint8List.fromList(base64Decode(json['senderKey'])) + : null, + senderName: json['senderName'] as String, + text: decodedText, + timestamp: DateTime.fromMillisecondsSinceEpoch(json['timestamp'] as int), + isOutgoing: json['isOutgoing'] as bool, + status: ChannelMessageStatus.values[json['status'] as int], + repeatCount: (json['repeatCount'] as int?) ?? 0, + pathLength: json['pathLength'] as int?, + pathBytes: json['pathBytes'] != null + ? Uint8List.fromList(base64Decode(json['pathBytes'] as String)) + : Uint8List(0), + repeats: (json['repeats'] as List?) + ?.map((entry) => _repeatFromJson(entry as Map)) + .toList() ?? + const [], + channelIndex: json['channelIndex'] as int?, + ); + } + + Map _repeatToJson(Repeat repeat) { + return { + 'repeaterKey': repeat.repeaterKey != null ? base64Encode(repeat.repeaterKey!) : null, + 'repeaterName': repeat.repeaterName, + 'tripTimeMs': repeat.tripTimeMs, + 'path': repeat.path?.map((bytes) => base64Encode(bytes)).toList() ?? [], + }; + } + + Repeat _repeatFromJson(Map json) { + return Repeat( + repeaterKey: json['repeaterKey'] != null + ? Uint8List.fromList(base64Decode(json['repeaterKey'])) + : null, + repeaterName: json['repeaterName'] as String? ?? 'Unknown', + tripTimeMs: json['tripTimeMs'] as int? ?? 0, + path: (json['path'] as List?) + ?.map((entry) => Uint8List.fromList(base64Decode(entry as String))) + .toList(), + ); + } +} diff --git a/lib/storage/channel_order_store.dart b/lib/storage/channel_order_store.dart new file mode 100644 index 00000000..510061ac --- /dev/null +++ b/lib/storage/channel_order_store.dart @@ -0,0 +1,30 @@ +import 'dart:convert'; +import 'package:shared_preferences/shared_preferences.dart'; + +class ChannelOrderStore { + static const String _key = 'channel_order'; + + Future saveChannelOrder(List order) async { + final prefs = await SharedPreferences.getInstance(); + await prefs.setString(_key, jsonEncode(order)); + } + + Future> loadChannelOrder() async { + final prefs = await SharedPreferences.getInstance(); + final raw = prefs.getString(_key); + if (raw == null || raw.isEmpty) return []; + try { + final decoded = jsonDecode(raw); + if (decoded is List) { + return decoded.map((value) => value is int ? value : int.tryParse('$value')).whereType().toList(); + } + } catch (_) { + // fall through to legacy parse + } + return raw + .split(',') + .map((value) => int.tryParse(value)) + .whereType() + .toList(); + } +} diff --git a/lib/storage/channel_settings_store.dart b/lib/storage/channel_settings_store.dart new file mode 100644 index 00000000..17358378 --- /dev/null +++ b/lib/storage/channel_settings_store.dart @@ -0,0 +1,17 @@ +import 'package:shared_preferences/shared_preferences.dart'; + +class ChannelSettingsStore { + static const String _smazKeyPrefix = 'channel_smaz_'; + + Future loadSmazEnabled(int channelIndex) async { + final prefs = await SharedPreferences.getInstance(); + final key = '$_smazKeyPrefix$channelIndex'; + return prefs.getBool(key) ?? false; + } + + Future saveSmazEnabled(int channelIndex, bool enabled) async { + final prefs = await SharedPreferences.getInstance(); + final key = '$_smazKeyPrefix$channelIndex'; + await prefs.setBool(key, enabled); + } +} diff --git a/lib/storage/contact_group_store.dart b/lib/storage/contact_group_store.dart new file mode 100644 index 00000000..53582ee2 --- /dev/null +++ b/lib/storage/contact_group_store.dart @@ -0,0 +1,32 @@ +import 'dart:convert'; +import 'package:shared_preferences/shared_preferences.dart'; +import '../models/contact_group.dart'; + +class ContactGroupStore { + static const String _key = 'contact_groups'; + + Future> loadGroups() async { + final prefs = await SharedPreferences.getInstance(); + final raw = prefs.getString(_key); + if (raw == null || raw.isEmpty) return []; + + try { + final decoded = jsonDecode(raw); + if (decoded is List) { + return decoded + .whereType>() + .map(ContactGroup.fromJson) + .toList(); + } + } catch (_) { + // Return empty list on parse errors. + } + return []; + } + + Future saveGroups(List groups) async { + final prefs = await SharedPreferences.getInstance(); + final encoded = jsonEncode(groups.map((group) => group.toJson()).toList()); + await prefs.setString(_key, encoded); + } +} diff --git a/lib/storage/contact_store.dart b/lib/storage/contact_store.dart new file mode 100644 index 00000000..18ce056d --- /dev/null +++ b/lib/storage/contact_store.dart @@ -0,0 +1,57 @@ +import 'dart:convert'; +import 'dart:typed_data'; + +import 'package:shared_preferences/shared_preferences.dart'; + +import '../models/contact.dart'; + +class ContactStore { + static const String _key = 'contacts'; + + Future> loadContacts() async { + final prefs = await SharedPreferences.getInstance(); + final jsonStr = prefs.getString(_key); + if (jsonStr == null) return []; + + try { + final jsonList = jsonDecode(jsonStr) as List; + return jsonList.map((entry) => _fromJson(entry as Map)).toList(); + } catch (_) { + return []; + } + } + + Future saveContacts(List contacts) async { + final prefs = await SharedPreferences.getInstance(); + final jsonList = contacts.map(_toJson).toList(); + await prefs.setString(_key, jsonEncode(jsonList)); + } + + Map _toJson(Contact contact) { + return { + 'publicKey': base64Encode(contact.publicKey), + 'name': contact.name, + 'type': contact.type, + 'pathLength': contact.pathLength, + 'path': base64Encode(contact.path), + 'latitude': contact.latitude, + 'longitude': contact.longitude, + 'lastSeen': contact.lastSeen.millisecondsSinceEpoch, + }; + } + + Contact _fromJson(Map json) { + return Contact( + publicKey: Uint8List.fromList(base64Decode(json['publicKey'] as String)), + name: json['name'] as String? ?? 'Unknown', + type: json['type'] as int? ?? 0, + pathLength: json['pathLength'] as int? ?? -1, + path: json['path'] != null + ? Uint8List.fromList(base64Decode(json['path'] as String)) + : Uint8List(0), + latitude: (json['latitude'] as num?)?.toDouble(), + longitude: (json['longitude'] as num?)?.toDouble(), + lastSeen: DateTime.fromMillisecondsSinceEpoch(json['lastSeen'] as int? ?? 0), + ); + } +} diff --git a/lib/storage/message_store.dart b/lib/storage/message_store.dart new file mode 100644 index 00000000..9bc1cdec --- /dev/null +++ b/lib/storage/message_store.dart @@ -0,0 +1,85 @@ +import 'dart:convert'; +import 'dart:typed_data'; +import 'package:shared_preferences/shared_preferences.dart'; +import '../models/message.dart'; + +class MessageStore { + static const String _keyPrefix = 'messages_'; + + Future saveMessages(String contactKeyHex, List messages) async { + final prefs = await SharedPreferences.getInstance(); + final key = '$_keyPrefix$contactKeyHex'; + final jsonList = messages.map(_messageToJson).toList(); + await prefs.setString(key, jsonEncode(jsonList)); + } + + Future> loadMessages(String contactKeyHex) async { + final prefs = await SharedPreferences.getInstance(); + final key = '$_keyPrefix$contactKeyHex'; + final jsonString = prefs.getString(key); + if (jsonString == null) return []; + + try { + final jsonList = jsonDecode(jsonString) as List; + return jsonList.map((json) => _messageFromJson(json)).toList(); + } catch (e) { + return []; + } + } + + Future clearMessages(String contactKeyHex) async { + final prefs = await SharedPreferences.getInstance(); + final key = '$_keyPrefix$contactKeyHex'; + await prefs.remove(key); + } + + Map _messageToJson(Message msg) { + return { + 'senderKey': base64Encode(msg.senderKey), + 'text': msg.text, + 'timestamp': msg.timestamp.millisecondsSinceEpoch, + 'isOutgoing': msg.isOutgoing, + 'isCli': msg.isCli, + 'status': msg.status.index, + 'messageId': msg.messageId, + 'retryCount': msg.retryCount, + 'estimatedTimeoutMs': msg.estimatedTimeoutMs, + 'expectedAckHash': msg.expectedAckHash != null ? base64Encode(msg.expectedAckHash!) : null, + 'sentAt': msg.sentAt?.millisecondsSinceEpoch, + 'deliveredAt': msg.deliveredAt?.millisecondsSinceEpoch, + 'tripTimeMs': msg.tripTimeMs, + 'forceFlood': msg.forceFlood, + 'pathLength': msg.pathLength, + 'pathBytes': msg.pathBytes.isNotEmpty ? base64Encode(msg.pathBytes) : null, + }; + } + + Message _messageFromJson(Map json) { + return Message( + senderKey: Uint8List.fromList(base64Decode(json['senderKey'] as String)), + text: json['text'] as String, + timestamp: DateTime.fromMillisecondsSinceEpoch(json['timestamp'] as int), + isOutgoing: json['isOutgoing'] as bool, + isCli: json['isCli'] as bool? ?? false, + status: MessageStatus.values[json['status'] as int], + messageId: json['messageId'] as String?, + retryCount: json['retryCount'] as int? ?? 0, + estimatedTimeoutMs: json['estimatedTimeoutMs'] as int?, + expectedAckHash: json['expectedAckHash'] != null + ? Uint8List.fromList(base64Decode(json['expectedAckHash'] as String)) + : null, + sentAt: json['sentAt'] != null + ? DateTime.fromMillisecondsSinceEpoch(json['sentAt'] as int) + : null, + deliveredAt: json['deliveredAt'] != null + ? DateTime.fromMillisecondsSinceEpoch(json['deliveredAt'] as int) + : null, + tripTimeMs: json['tripTimeMs'] as int?, + forceFlood: json['forceFlood'] as bool? ?? false, + pathLength: json['pathLength'] as int?, + pathBytes: json['pathBytes'] != null + ? Uint8List.fromList(base64Decode(json['pathBytes'] as String)) + : Uint8List(0), + ); + } +} diff --git a/lib/utils/emoji_utils.dart b/lib/utils/emoji_utils.dart new file mode 100644 index 00000000..d2b8bebf --- /dev/null +++ b/lib/utils/emoji_utils.dart @@ -0,0 +1,33 @@ +import 'package:characters/characters.dart'; + +String? firstEmoji(String name) { + if (name.isEmpty) return null; + for (final cluster in name.characters) { + if (_containsEmoji(cluster)) { + return cluster; + } + } + return null; +} + +bool _containsEmoji(String cluster) { + for (final rune in cluster.runes) { + if (_isEmojiRune(rune)) return true; + } + return false; +} + +bool _isEmojiRune(int rune) { + if (rune == 0x00A9 || rune == 0x00AE) return true; + if (rune == 0x203C || rune == 0x2049) return true; + if (rune == 0x2122 || rune == 0x2139) return true; + if (rune >= 0x2194 && rune <= 0x21AA) return true; + if (rune >= 0x2300 && rune <= 0x23FF) return true; + if (rune >= 0x2460 && rune <= 0x24FF) return true; + if (rune >= 0x25A0 && rune <= 0x27BF) return true; + if (rune >= 0x2900 && rune <= 0x297F) return true; + if (rune >= 0x2B00 && rune <= 0x2BFF) return true; + if (rune >= 0x1F000 && rune <= 0x1FAFF) return true; + if (rune >= 0x1FC00 && rune <= 0x1FFFD) return true; + return false; +} diff --git a/lib/widgets/debug_frame_viewer.dart b/lib/widgets/debug_frame_viewer.dart new file mode 100644 index 00000000..7c417f9c --- /dev/null +++ b/lib/widgets/debug_frame_viewer.dart @@ -0,0 +1,68 @@ +import 'dart:typed_data'; +import 'package:flutter/material.dart'; +import '../connector/meshcore_protocol.dart'; + +/// Debug widget to show the hex dump of a frame +class DebugFrameViewer { + static void showFrameDebug(BuildContext context, Uint8List frame, String title) { + final hexString = frame + .map((b) => b.toRadixString(16).padLeft(2, '0')) + .join(' '); + + final details = StringBuffer(); + details.writeln('Frame Length: ${frame.length} bytes\n'); + details.writeln('Command: 0x${frame[0].toRadixString(16).padLeft(2, '0')}'); + + if (frame[0] == cmdSendTxtMsg && frame.length > 37) { + details.writeln('\nText Message Frame:'); + details.writeln('- Destination PubKey: ${pubKeyToHex(frame.sublist(1, 33))}'); + details.writeln('- Timestamp: ${readUint32LE(frame, 33)}'); + details.writeln('- Flags: 0x${frame[37].toRadixString(16).padLeft(2, '0')}'); + final txtType = (frame[37] >> 2) & 0x03; + details.writeln('- Text Type: $txtType ${txtType == txtTypeCliData ? "(CLI)" : "(Plain)"}'); + if (frame.length > 38) { + final textBytes = frame.sublist(38); + final nullIdx = textBytes.indexOf(0); + final text = String.fromCharCodes( + nullIdx >= 0 ? textBytes.sublist(0, nullIdx) : textBytes + ); + details.writeln('- Text: "$text"'); + } + } + + showDialog( + context: context, + builder: (context) => AlertDialog( + title: Text(title), + content: SingleChildScrollView( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Text( + details.toString(), + style: const TextStyle(fontFamily: 'monospace', fontSize: 12), + ), + const Divider(), + const Text( + 'Hex Dump:', + style: TextStyle(fontWeight: FontWeight.bold), + ), + const SizedBox(height: 8), + Text( + hexString, + style: const TextStyle(fontFamily: 'monospace', fontSize: 11), + ), + ], + ), + ), + actions: [ + TextButton( + onPressed: () => Navigator.pop(context), + child: const Text('Close'), + ), + ], + ), + ); + } +} diff --git a/lib/widgets/device_tile.dart b/lib/widgets/device_tile.dart new file mode 100644 index 00000000..2d6de8da --- /dev/null +++ b/lib/widgets/device_tile.dart @@ -0,0 +1,68 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_blue_plus/flutter_blue_plus.dart'; + +/// A reusable tile widget for displaying a MeshCore device in a list +class DeviceTile extends StatelessWidget { + final ScanResult scanResult; + final VoidCallback onTap; + + const DeviceTile({ + super.key, + required this.scanResult, + required this.onTap, + }); + + @override + Widget build(BuildContext context) { + final device = scanResult.device; + final rssi = scanResult.rssi; + final name = device.platformName.isNotEmpty + ? device.platformName + : scanResult.advertisementData.advName; + + return ListTile( + leading: _buildSignalIcon(rssi), + title: Text( + name.isNotEmpty ? name : 'Unknown Device', + style: const TextStyle(fontWeight: FontWeight.w500), + ), + subtitle: Text(device.remoteId.toString()), + trailing: ElevatedButton( + onPressed: onTap, + child: const Text('Connect'), + ), + onTap: onTap, + ); + } + + Widget _buildSignalIcon(int rssi) { + IconData icon; + Color color; + + if (rssi >= -60) { + icon = Icons.signal_cellular_4_bar; + color = Colors.green; + } else if (rssi >= -70) { + icon = Icons.signal_cellular_alt; + color = Colors.lightGreen; + } else if (rssi >= -80) { + icon = Icons.signal_cellular_alt_2_bar; + color = Colors.orange; + } else { + icon = Icons.signal_cellular_alt_1_bar; + color = Colors.red; + } + + return Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon(icon, color: color), + Text( + '$rssi dBm', + style: TextStyle(fontSize: 10, color: color), + ), + ], + ); + } +} + diff --git a/lib/widgets/gif_message.dart b/lib/widgets/gif_message.dart new file mode 100644 index 00000000..402565f1 --- /dev/null +++ b/lib/widgets/gif_message.dart @@ -0,0 +1,185 @@ +import 'dart:ui' as ui; + +import 'package:flutter/material.dart'; + +class GifMessage extends StatefulWidget { + final String url; + final Color backgroundColor; + final Color fallbackTextColor; + final double width; + final double height; + + const GifMessage({ + super.key, + required this.url, + required this.backgroundColor, + required this.fallbackTextColor, + this.width = 200, + this.height = 140, + }); + + @override + State createState() => _GifMessageState(); +} + +class _GifMessageState extends State { + ImageStream? _imageStream; + ImageStreamListener? _listener; + ui.Image? _image; + Object? _error; + bool _isLoading = true; + bool _isPaused = false; + + @override + void initState() { + super.initState(); + _resolveImage(); + } + + @override + void didUpdateWidget(covariant GifMessage oldWidget) { + super.didUpdateWidget(oldWidget); + if (oldWidget.url != widget.url) { + _unsubscribe(); + _image = null; + _error = null; + _isLoading = true; + _isPaused = false; + _resolveImage(); + } + } + + @override + void dispose() { + _unsubscribe(); + super.dispose(); + } + + void _resolveImage() { + setState(() { + _isLoading = true; + _error = null; + }); + final provider = NetworkImage(widget.url); + final stream = provider.resolve(ImageConfiguration.empty); + _imageStream = stream; + _listener = ImageStreamListener( + (imageInfo, _) { + if (_isPaused) { + return; + } + setState(() { + _image = imageInfo.image; + _isLoading = false; + }); + }, + onError: (error, _) { + setState(() { + _error = error; + _isLoading = false; + }); + }, + ); + stream.addListener(_listener!); + } + + void _retryLoad() { + _unsubscribe(); + _image = null; + _isPaused = false; + _resolveImage(); + } + + void _unsubscribe() { + if (_imageStream != null && _listener != null) { + _imageStream!.removeListener(_listener!); + } + } + + void _togglePause() { + if (_error != null) { + _retryLoad(); + return; + } + if (_image == null) { + if (!_isLoading) { + _retryLoad(); + } + return; + } + setState(() { + _isPaused = !_isPaused; + }); + if (_listener == null || _imageStream == null) { + return; + } + if (_isPaused) { + _imageStream!.removeListener(_listener!); + } else { + _imageStream!.addListener(_listener!); + } + } + + @override + Widget build(BuildContext context) { + Widget content; + + if (_error != null) { + content = Center( + child: Text( + "Can't load GIF\nTap to retry", + textAlign: TextAlign.center, + style: TextStyle(fontSize: 12, color: widget.fallbackTextColor), + ), + ); + } else if (_isLoading && _image == null) { + content = const Center( + child: SizedBox( + width: 18, + height: 18, + child: CircularProgressIndicator(strokeWidth: 2), + ), + ); + } else if (_image == null) { + content = Center( + child: Text( + 'Tap to load GIF', + textAlign: TextAlign.center, + style: TextStyle(fontSize: 12, color: widget.fallbackTextColor), + ), + ); + } else { + content = RawImage( + image: _image, + fit: BoxFit.cover, + width: widget.width, + height: widget.height, + ); + } + + return GestureDetector( + onTap: _togglePause, + child: ClipRRect( + borderRadius: BorderRadius.circular(10), + child: Container( + color: widget.backgroundColor, + width: widget.width, + height: widget.height, + child: Stack( + fit: StackFit.expand, + children: [ + content, + if (_isPaused && _image != null) + Container( + color: Colors.black.withValues(alpha: 0.2), + child: const Center( + child: Icon(Icons.pause, color: Colors.white70, size: 28), + ), + ), + ], + ), + ), + ), + ); + } +} diff --git a/lib/widgets/gif_picker.dart b/lib/widgets/gif_picker.dart new file mode 100644 index 00000000..94a75bfe --- /dev/null +++ b/lib/widgets/gif_picker.dart @@ -0,0 +1,283 @@ +import 'dart:convert'; + +import 'package:flutter/material.dart'; +import 'package:http/http.dart' as http; + +class GifPicker extends StatefulWidget { + final Function(String gifId) onGifSelected; + + const GifPicker({ + super.key, + required this.onGifSelected, + }); + + @override + State createState() => _GifPickerState(); +} + +class _GifPickerState extends State { + final TextEditingController _searchController = TextEditingController(); + List> _gifs = []; + bool _isLoading = false; + String? _error; + + // Giphy API key - Using public beta key (limited usage) + // For production, replace with your own Giphy API key from developers.giphy.com + static const String _giphyApiKey = 'sXpGFDGZs0Dv1mmNFvYaGUvYwKX0PWIh'; + + @override + void initState() { + super.initState(); + _loadTrendingGifs(); + } + + @override + void dispose() { + _searchController.dispose(); + super.dispose(); + } + + Future _loadTrendingGifs() async { + setState(() { + _isLoading = true; + _error = null; + }); + + try { + final response = await http.get( + Uri.parse( + 'https://api.giphy.com/v1/gifs/trending?api_key=$_giphyApiKey&limit=25&rating=g', + ), + ).timeout(const Duration(seconds: 10)); + + if (response.statusCode == 200) { + final data = json.decode(response.body); + setState(() { + _gifs = List>.from(data['data']); + _isLoading = false; + }); + } else { + setState(() { + _error = 'Failed to load GIFs'; + _isLoading = false; + }); + } + } catch (e) { + setState(() { + _error = 'No internet connection'; + _isLoading = false; + }); + } + } + + Future _searchGifs(String query) async { + if (query.trim().isEmpty) { + _loadTrendingGifs(); + return; + } + + setState(() { + _isLoading = true; + _error = null; + }); + + try { + final response = await http.get( + Uri.parse( + 'https://api.giphy.com/v1/gifs/search?api_key=$_giphyApiKey&q=${Uri.encodeComponent(query)}&limit=25&rating=g', + ), + ).timeout(const Duration(seconds: 10)); + + if (response.statusCode == 200) { + final data = json.decode(response.body); + setState(() { + _gifs = List>.from(data['data']); + _isLoading = false; + }); + } else { + setState(() { + _error = 'Failed to search GIFs'; + _isLoading = false; + }); + } + } catch (e) { + setState(() { + _error = 'No internet connection'; + _isLoading = false; + }); + } + } + + @override + Widget build(BuildContext context) { + return Container( + height: MediaQuery.of(context).size.height * 0.7, + padding: const EdgeInsets.all(16), + child: Column( + children: [ + // Header + Row( + children: [ + const Icon(Icons.gif_box, size: 28), + const SizedBox(width: 8), + const Text( + 'Choose a GIF', + style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold), + ), + const Spacer(), + IconButton( + icon: const Icon(Icons.close), + onPressed: () => Navigator.pop(context), + ), + ], + ), + const SizedBox(height: 16), + + // Search bar + TextField( + controller: _searchController, + decoration: InputDecoration( + hintText: 'Search GIFs...', + prefixIcon: const Icon(Icons.search), + suffixIcon: _searchController.text.isNotEmpty + ? IconButton( + icon: const Icon(Icons.clear), + onPressed: () { + _searchController.clear(); + _loadTrendingGifs(); + }, + ) + : null, + border: OutlineInputBorder( + borderRadius: BorderRadius.circular(12), + ), + contentPadding: const EdgeInsets.symmetric( + horizontal: 16, + vertical: 12, + ), + ), + textInputAction: TextInputAction.search, + onSubmitted: _searchGifs, + onChanged: (value) { + setState(() {}); // Update to show/hide clear button + }, + ), + const SizedBox(height: 16), + + // GIF grid + Expanded( + child: _buildContent(), + ), + + // Powered by Giphy attribution + const SizedBox(height: 8), + Text( + 'Powered by GIPHY', + style: TextStyle( + fontSize: 11, + color: Colors.grey[600], + ), + ), + ], + ), + ); + } + + Widget _buildContent() { + if (_isLoading) { + return const Center( + child: CircularProgressIndicator(), + ); + } + + if (_error != null) { + return Center( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon(Icons.error_outline, size: 64, color: Colors.grey[400]), + const SizedBox(height: 16), + Text( + _error!, + style: TextStyle(fontSize: 16, color: Colors.grey[600]), + ), + const SizedBox(height: 16), + ElevatedButton.icon( + onPressed: _loadTrendingGifs, + icon: const Icon(Icons.refresh), + label: const Text('Retry'), + ), + ], + ), + ); + } + + if (_gifs.isEmpty) { + return Center( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon(Icons.search_off, size: 64, color: Colors.grey[400]), + const SizedBox(height: 16), + Text( + 'No GIFs found', + style: TextStyle(fontSize: 16, color: Colors.grey[600]), + ), + ], + ), + ); + } + + return GridView.builder( + gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount( + crossAxisCount: 2, + crossAxisSpacing: 8, + mainAxisSpacing: 8, + childAspectRatio: 1.0, + ), + itemCount: _gifs.length, + itemBuilder: (context, index) { + final gif = _gifs[index]; + final gifId = gif['id'] as String; + final previewUrl = gif['images']?['fixed_height_small']?['url'] as String?; + + return GestureDetector( + onTap: () { + widget.onGifSelected(gifId); + Navigator.pop(context); + }, + child: ClipRRect( + borderRadius: BorderRadius.circular(8), + child: Container( + color: Theme.of(context).colorScheme.surfaceContainerHighest, + child: previewUrl != null + ? Image.network( + previewUrl, + fit: BoxFit.cover, + loadingBuilder: (context, child, loadingProgress) { + if (loadingProgress == null) return child; + return Center( + child: CircularProgressIndicator( + value: loadingProgress.expectedTotalBytes != null + ? loadingProgress.cumulativeBytesLoaded / + loadingProgress.expectedTotalBytes! + : null, + ), + ); + }, + errorBuilder: (context, error, stackTrace) { + return const Center( + child: Icon(Icons.error_outline), + ); + }, + ) + : const Center( + child: Icon(Icons.gif_box), + ), + ), + ), + ); + }, + ); + } +} diff --git a/lib/widgets/repeater_login_dialog.dart b/lib/widgets/repeater_login_dialog.dart new file mode 100644 index 00000000..8dab1608 --- /dev/null +++ b/lib/widgets/repeater_login_dialog.dart @@ -0,0 +1,286 @@ +import 'dart:async'; +import 'dart:typed_data'; + +import 'package:flutter/material.dart'; +import 'package:flutter/foundation.dart'; +import 'package:provider/provider.dart'; +import '../models/contact.dart'; +import '../services/storage_service.dart'; +import '../services/repeater_command_service.dart'; +import '../connector/meshcore_connector.dart'; +import '../connector/meshcore_protocol.dart'; + +class RepeaterLoginDialog extends StatefulWidget { + final Contact repeater; + final Function(String password) onLogin; + + const RepeaterLoginDialog({ + super.key, + required this.repeater, + required this.onLogin, + }); + + @override + State createState() => _RepeaterLoginDialogState(); +} + +class _RepeaterLoginDialogState extends State { + final TextEditingController _passwordController = TextEditingController(); + final StorageService _storage = StorageService(); + bool _savePassword = false; + bool _isLoading = true; + bool _obscurePassword = true; + late MeshCoreConnector _connector; + int _currentAttempt = 0; + final int _maxAttempts = RepeaterCommandService.maxRetries; + static const int _loginTimeoutSeconds = 10; + + @override + void initState() { + super.initState(); + _connector = Provider.of(context, listen: false); + _loadSavedPassword(); + } + + Future _loadSavedPassword() async { + final savedPassword = + await _storage.getRepeaterPassword(widget.repeater.publicKeyHex); + if (savedPassword != null) { + setState(() { + _passwordController.text = savedPassword; + _savePassword = true; + _isLoading = false; + }); + } else { + setState(() { + _isLoading = false; + }); + } + } + + @override + void dispose() { + _passwordController.dispose(); + super.dispose(); + } + + bool _isLoggingIn = false; + + Future _handleLogin() async { + if (_isLoggingIn) return; + + setState(() { + _isLoggingIn = true; + _currentAttempt = 0; + }); + + try { + final password = _passwordController.text; + bool? loginResult; + for (int attempt = 0; attempt < _maxAttempts; attempt++) { + if (!mounted) return; + setState(() { + _currentAttempt = attempt + 1; + }); + + await _connector.sendFrame( + buildSendLoginFrame(widget.repeater.publicKey, password), + ); + + loginResult = await _awaitLoginResponse(); + if (loginResult == true) { + break; + } + if (loginResult == false) { + throw Exception('Wrong password or node is unreachable'); + } + } + + if (loginResult != true) { + throw Exception('Wrong password or node is unreachable'); + } + + // If we got a response, login succeeded + if (mounted) { + // Save password if requested + if (_savePassword) { + await _storage.saveRepeaterPassword( + widget.repeater.publicKeyHex, password); + } else { + // Remove saved password if user unchecked the box + await _storage.removeRepeaterPassword(widget.repeater.publicKeyHex); + } + + Navigator.pop(context, password); + Future.microtask(() => widget.onLogin(password)); + } + } catch (e) { + if (mounted) { + setState(() { + _isLoggingIn = false; + }); + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text('Login failed: $e'), + backgroundColor: Colors.red, + ), + ); + } + } + } + + Future _awaitLoginResponse() async { + final completer = Completer(); + Timer? timer; + StreamSubscription? subscription; + final targetPrefix = widget.repeater.publicKey.sublist(0, 6); + + subscription = _connector.receivedFrames.listen((frame) { + if (frame.isEmpty) return; + final code = frame[0]; + if (code != pushCodeLoginSuccess && code != pushCodeLoginFail) return; + if (frame.length < 8) return; + final prefix = frame.sublist(2, 8); + if (!listEquals(prefix, targetPrefix)) return; + + completer.complete(code == pushCodeLoginSuccess); + subscription?.cancel(); + timer?.cancel(); + }); + + timer = Timer(const Duration(seconds: _loginTimeoutSeconds), () { + if (!completer.isCompleted) { + completer.complete(null); + subscription?.cancel(); + } + }); + + final result = await completer.future; + timer?.cancel(); + await subscription?.cancel(); + return result; + } + + @override + Widget build(BuildContext context) { + return AlertDialog( + title: Row( + children: [ + const Icon(Icons.cell_tower, color: Colors.orange), + const SizedBox(width: 8), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const Text('Repeater Login'), + Text( + widget.repeater.name, + style: TextStyle( + fontSize: 14, + fontWeight: FontWeight.normal, + color: Colors.grey[600], + ), + ), + ], + ), + ), + ], + ), + content: _isLoading + ? const Center( + child: Padding( + padding: EdgeInsets.all(20.0), + child: CircularProgressIndicator(), + ), + ) + : Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const Text( + 'Enter the repeater password to access settings and status.', + style: TextStyle(fontSize: 14), + ), + const SizedBox(height: 16), + TextField( + controller: _passwordController, + obscureText: _obscurePassword, + decoration: InputDecoration( + labelText: 'Password', + hintText: 'Enter password', + border: const OutlineInputBorder(), + prefixIcon: const Icon(Icons.lock), + suffixIcon: IconButton( + icon: Icon( + _obscurePassword + ? Icons.visibility + : Icons.visibility_off, + ), + onPressed: () { + setState(() { + _obscurePassword = !_obscurePassword; + }); + }, + ), + ), + onSubmitted: (_) => _handleLogin(), + autofocus: _passwordController.text.isEmpty, + ), + const SizedBox(height: 12), + CheckboxListTile( + value: _savePassword, + onChanged: (value) { + setState(() { + _savePassword = value ?? false; + }); + }, + title: const Text( + 'Save password', + style: TextStyle(fontSize: 14), + ), + subtitle: const Text( + 'Password will be stored securely on this device', + style: TextStyle(fontSize: 12), + ), + controlAffinity: ListTileControlAffinity.leading, + contentPadding: EdgeInsets.zero, + ), + ], + ), + actions: [ + TextButton( + onPressed: () => Navigator.pop(context), + child: const Text('Cancel'), + ), + if (_isLoggingIn) + SizedBox( + width: double.infinity, + child: FilledButton( + onPressed: null, + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + const SizedBox( + width: 16, + height: 16, + child: CircularProgressIndicator( + strokeWidth: 2, + color: Colors.white, + ), + ), + const SizedBox(width: 12), + Text('Retries $_currentAttempt/$_maxAttempts'), + ], + ), + ), + ) + else + FilledButton.icon( + onPressed: _isLoading ? null : _handleLogin, + icon: const Icon(Icons.login, size: 18), + label: const Text('Login'), + ), + ], + ); + } +} diff --git a/linux/.gitignore b/linux/.gitignore new file mode 100644 index 00000000..d3896c98 --- /dev/null +++ b/linux/.gitignore @@ -0,0 +1 @@ +flutter/ephemeral diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt new file mode 100644 index 00000000..6867349b --- /dev/null +++ b/linux/CMakeLists.txt @@ -0,0 +1,128 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.13) +project(runner LANGUAGES CXX) + +# The name of the executable created for the application. Change this to change +# the on-disk name of your application. +set(BINARY_NAME "meshcore_open") +# The unique GTK application identifier for this application. See: +# https://wiki.gnome.org/HowDoI/ChooseApplicationID +set(APPLICATION_ID "com.meshcore.meshcore_open") + +# Explicitly opt in to modern CMake behaviors to avoid warnings with recent +# versions of CMake. +cmake_policy(SET CMP0063 NEW) + +# Load bundled libraries from the lib/ directory relative to the binary. +set(CMAKE_INSTALL_RPATH "$ORIGIN/lib") + +# Root filesystem for cross-building. +if(FLUTTER_TARGET_PLATFORM_SYSROOT) + set(CMAKE_SYSROOT ${FLUTTER_TARGET_PLATFORM_SYSROOT}) + set(CMAKE_FIND_ROOT_PATH ${CMAKE_SYSROOT}) + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) + set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +endif() + +# Define build configuration options. +if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE "Debug" CACHE + STRING "Flutter build mode" FORCE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Profile" "Release") +endif() + +# Compilation settings that should be applied to most targets. +# +# Be cautious about adding new options here, as plugins use this function by +# default. In most cases, you should add new options to specific targets instead +# of modifying this function. +function(APPLY_STANDARD_SETTINGS TARGET) + target_compile_features(${TARGET} PUBLIC cxx_std_14) + target_compile_options(${TARGET} PRIVATE -Wall -Werror) + target_compile_options(${TARGET} PRIVATE "$<$>:-O3>") + target_compile_definitions(${TARGET} PRIVATE "$<$>:NDEBUG>") +endfunction() + +# Flutter library and tool build rules. +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# System-level dependencies. +find_package(PkgConfig REQUIRED) +pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) + +# Application build; see runner/CMakeLists.txt. +add_subdirectory("runner") + +# Run the Flutter tool portions of the build. This must not be removed. +add_dependencies(${BINARY_NAME} flutter_assemble) + +# Only the install-generated bundle's copy of the executable will launch +# correctly, since the resources must in the right relative locations. To avoid +# people trying to run the unbundled copy, put it in a subdirectory instead of +# the default top-level location. +set_target_properties(${BINARY_NAME} + PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intermediates_do_not_run" +) + + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# By default, "installing" just makes a relocatable bundle in the build +# directory. +set(BUILD_BUNDLE_DIR "${PROJECT_BINARY_DIR}/bundle") +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +endif() + +# Start with a clean build bundle directory every time. +install(CODE " + file(REMOVE_RECURSE \"${BUILD_BUNDLE_DIR}/\") + " COMPONENT Runtime) + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib") + +install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +foreach(bundled_library ${PLUGIN_BUNDLED_LIBRARIES}) + install(FILES "${bundled_library}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endforeach(bundled_library) + +# Copy the native assets provided by the build.dart from all packages. +set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/linux/") +install(DIRECTORY "${NATIVE_ASSETS_DIR}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +# Fully re-copy the assets directory on each build to avoid having stale files +# from a previous install. +set(FLUTTER_ASSET_DIR_NAME "flutter_assets") +install(CODE " + file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") + " COMPONENT Runtime) +install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" + DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) + +# Install the AOT library on non-Debug builds only. +if(NOT CMAKE_BUILD_TYPE MATCHES "Debug") + install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() diff --git a/linux/flutter/CMakeLists.txt b/linux/flutter/CMakeLists.txt new file mode 100644 index 00000000..d5bd0164 --- /dev/null +++ b/linux/flutter/CMakeLists.txt @@ -0,0 +1,88 @@ +# This file controls Flutter-level build steps. It should not be edited. +cmake_minimum_required(VERSION 3.10) + +set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") + +# Configuration provided via flutter tool. +include(${EPHEMERAL_DIR}/generated_config.cmake) + +# TODO: Move the rest of this into files in ephemeral. See +# https://github.com/flutter/flutter/issues/57146. + +# Serves the same purpose as list(TRANSFORM ... PREPEND ...), +# which isn't available in 3.10. +function(list_prepend LIST_NAME PREFIX) + set(NEW_LIST "") + foreach(element ${${LIST_NAME}}) + list(APPEND NEW_LIST "${PREFIX}${element}") + endforeach(element) + set(${LIST_NAME} "${NEW_LIST}" PARENT_SCOPE) +endfunction() + +# === Flutter Library === +# System-level dependencies. +find_package(PkgConfig REQUIRED) +pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) +pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0) +pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0) + +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so") + +# Published to parent scope for install step. +set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) +set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) +set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) +set(AOT_LIBRARY "${PROJECT_DIR}/build/lib/libapp.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "fl_basic_message_channel.h" + "fl_binary_codec.h" + "fl_binary_messenger.h" + "fl_dart_project.h" + "fl_engine.h" + "fl_json_message_codec.h" + "fl_json_method_codec.h" + "fl_message_codec.h" + "fl_method_call.h" + "fl_method_channel.h" + "fl_method_codec.h" + "fl_method_response.h" + "fl_plugin_registrar.h" + "fl_plugin_registry.h" + "fl_standard_message_codec.h" + "fl_standard_method_codec.h" + "fl_string_codec.h" + "fl_value.h" + "fl_view.h" + "flutter_linux.h" +) +list_prepend(FLUTTER_LIBRARY_HEADERS "${EPHEMERAL_DIR}/flutter_linux/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}") +target_link_libraries(flutter INTERFACE + PkgConfig::GTK + PkgConfig::GLIB + PkgConfig::GIO +) +add_dependencies(flutter flutter_assemble) + +# === Flutter tool backend === +# _phony_ is a non-existent file to force this command to run every time, +# since currently there's no way to get a full input/output list from the +# flutter tool. +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CMAKE_CURRENT_BINARY_DIR}/_phony_ + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.sh" + ${FLUTTER_TARGET_PLATFORM} ${CMAKE_BUILD_TYPE} + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} +) diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc new file mode 100644 index 00000000..e71a16d2 --- /dev/null +++ b/linux/flutter/generated_plugin_registrant.cc @@ -0,0 +1,11 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + + +void fl_register_plugins(FlPluginRegistry* registry) { +} diff --git a/linux/flutter/generated_plugin_registrant.h b/linux/flutter/generated_plugin_registrant.h new file mode 100644 index 00000000..e0f0a47b --- /dev/null +++ b/linux/flutter/generated_plugin_registrant.h @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void fl_register_plugins(FlPluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake new file mode 100644 index 00000000..2e1de87a --- /dev/null +++ b/linux/flutter/generated_plugins.cmake @@ -0,0 +1,23 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/linux plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/linux/runner/CMakeLists.txt b/linux/runner/CMakeLists.txt new file mode 100644 index 00000000..e97dabc7 --- /dev/null +++ b/linux/runner/CMakeLists.txt @@ -0,0 +1,26 @@ +cmake_minimum_required(VERSION 3.13) +project(runner LANGUAGES CXX) + +# Define the application target. To change its name, change BINARY_NAME in the +# top-level CMakeLists.txt, not the value here, or `flutter run` will no longer +# work. +# +# Any new source files that you add to the application should be added here. +add_executable(${BINARY_NAME} + "main.cc" + "my_application.cc" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" +) + +# Apply the standard set of build settings. This can be removed for applications +# that need different build settings. +apply_standard_settings(${BINARY_NAME}) + +# Add preprocessor definitions for the application ID. +add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}") + +# Add dependency libraries. Add any application-specific dependencies here. +target_link_libraries(${BINARY_NAME} PRIVATE flutter) +target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK) + +target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}") diff --git a/linux/runner/main.cc b/linux/runner/main.cc new file mode 100644 index 00000000..e7c5c543 --- /dev/null +++ b/linux/runner/main.cc @@ -0,0 +1,6 @@ +#include "my_application.h" + +int main(int argc, char** argv) { + g_autoptr(MyApplication) app = my_application_new(); + return g_application_run(G_APPLICATION(app), argc, argv); +} diff --git a/linux/runner/my_application.cc b/linux/runner/my_application.cc new file mode 100644 index 00000000..1d9a9edd --- /dev/null +++ b/linux/runner/my_application.cc @@ -0,0 +1,144 @@ +#include "my_application.h" + +#include +#ifdef GDK_WINDOWING_X11 +#include +#endif + +#include "flutter/generated_plugin_registrant.h" + +struct _MyApplication { + GtkApplication parent_instance; + char** dart_entrypoint_arguments; +}; + +G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION) + +// Called when first Flutter frame received. +static void first_frame_cb(MyApplication* self, FlView *view) +{ + gtk_widget_show(gtk_widget_get_toplevel(GTK_WIDGET(view))); +} + +// Implements GApplication::activate. +static void my_application_activate(GApplication* application) { + MyApplication* self = MY_APPLICATION(application); + GtkWindow* window = + GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application))); + + // Use a header bar when running in GNOME as this is the common style used + // by applications and is the setup most users will be using (e.g. Ubuntu + // desktop). + // If running on X and not using GNOME then just use a traditional title bar + // in case the window manager does more exotic layout, e.g. tiling. + // If running on Wayland assume the header bar will work (may need changing + // if future cases occur). + gboolean use_header_bar = TRUE; +#ifdef GDK_WINDOWING_X11 + GdkScreen* screen = gtk_window_get_screen(window); + if (GDK_IS_X11_SCREEN(screen)) { + const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen); + if (g_strcmp0(wm_name, "GNOME Shell") != 0) { + use_header_bar = FALSE; + } + } +#endif + if (use_header_bar) { + GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); + gtk_widget_show(GTK_WIDGET(header_bar)); + gtk_header_bar_set_title(header_bar, "meshcore_open"); + gtk_header_bar_set_show_close_button(header_bar, TRUE); + gtk_window_set_titlebar(window, GTK_WIDGET(header_bar)); + } else { + gtk_window_set_title(window, "meshcore_open"); + } + + gtk_window_set_default_size(window, 1280, 720); + + g_autoptr(FlDartProject) project = fl_dart_project_new(); + fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments); + + FlView* view = fl_view_new(project); + GdkRGBA background_color; + // Background defaults to black, override it here if necessary, e.g. #00000000 for transparent. + gdk_rgba_parse(&background_color, "#000000"); + fl_view_set_background_color(view, &background_color); + gtk_widget_show(GTK_WIDGET(view)); + gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view)); + + // Show the window when Flutter renders. + // Requires the view to be realized so we can start rendering. + g_signal_connect_swapped(view, "first-frame", G_CALLBACK(first_frame_cb), self); + gtk_widget_realize(GTK_WIDGET(view)); + + fl_register_plugins(FL_PLUGIN_REGISTRY(view)); + + gtk_widget_grab_focus(GTK_WIDGET(view)); +} + +// Implements GApplication::local_command_line. +static gboolean my_application_local_command_line(GApplication* application, gchar*** arguments, int* exit_status) { + MyApplication* self = MY_APPLICATION(application); + // Strip out the first argument as it is the binary name. + self->dart_entrypoint_arguments = g_strdupv(*arguments + 1); + + g_autoptr(GError) error = nullptr; + if (!g_application_register(application, nullptr, &error)) { + g_warning("Failed to register: %s", error->message); + *exit_status = 1; + return TRUE; + } + + g_application_activate(application); + *exit_status = 0; + + return TRUE; +} + +// Implements GApplication::startup. +static void my_application_startup(GApplication* application) { + //MyApplication* self = MY_APPLICATION(object); + + // Perform any actions required at application startup. + + G_APPLICATION_CLASS(my_application_parent_class)->startup(application); +} + +// Implements GApplication::shutdown. +static void my_application_shutdown(GApplication* application) { + //MyApplication* self = MY_APPLICATION(object); + + // Perform any actions required at application shutdown. + + G_APPLICATION_CLASS(my_application_parent_class)->shutdown(application); +} + +// Implements GObject::dispose. +static void my_application_dispose(GObject* object) { + MyApplication* self = MY_APPLICATION(object); + g_clear_pointer(&self->dart_entrypoint_arguments, g_strfreev); + G_OBJECT_CLASS(my_application_parent_class)->dispose(object); +} + +static void my_application_class_init(MyApplicationClass* klass) { + G_APPLICATION_CLASS(klass)->activate = my_application_activate; + G_APPLICATION_CLASS(klass)->local_command_line = my_application_local_command_line; + G_APPLICATION_CLASS(klass)->startup = my_application_startup; + G_APPLICATION_CLASS(klass)->shutdown = my_application_shutdown; + G_OBJECT_CLASS(klass)->dispose = my_application_dispose; +} + +static void my_application_init(MyApplication* self) {} + +MyApplication* my_application_new() { + // Set the program name to the application ID, which helps various systems + // like GTK and desktop environments map this running application to its + // corresponding .desktop file. This ensures better integration by allowing + // the application to be recognized beyond its binary name. + g_set_prgname(APPLICATION_ID); + + return MY_APPLICATION(g_object_new(my_application_get_type(), + "application-id", APPLICATION_ID, + "flags", G_APPLICATION_NON_UNIQUE, + nullptr)); +} diff --git a/linux/runner/my_application.h b/linux/runner/my_application.h new file mode 100644 index 00000000..72271d5e --- /dev/null +++ b/linux/runner/my_application.h @@ -0,0 +1,18 @@ +#ifndef FLUTTER_MY_APPLICATION_H_ +#define FLUTTER_MY_APPLICATION_H_ + +#include + +G_DECLARE_FINAL_TYPE(MyApplication, my_application, MY, APPLICATION, + GtkApplication) + +/** + * my_application_new: + * + * Creates a new Flutter-based application. + * + * Returns: a new #MyApplication. + */ +MyApplication* my_application_new(); + +#endif // FLUTTER_MY_APPLICATION_H_ diff --git a/macos/.gitignore b/macos/.gitignore new file mode 100644 index 00000000..746adbb6 --- /dev/null +++ b/macos/.gitignore @@ -0,0 +1,7 @@ +# Flutter-related +**/Flutter/ephemeral/ +**/Pods/ + +# Xcode-related +**/dgph +**/xcuserdata/ diff --git a/macos/Flutter/Flutter-Debug.xcconfig b/macos/Flutter/Flutter-Debug.xcconfig new file mode 100644 index 00000000..c2efd0b6 --- /dev/null +++ b/macos/Flutter/Flutter-Debug.xcconfig @@ -0,0 +1 @@ +#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/macos/Flutter/Flutter-Release.xcconfig b/macos/Flutter/Flutter-Release.xcconfig new file mode 100644 index 00000000..c2efd0b6 --- /dev/null +++ b/macos/Flutter/Flutter-Release.xcconfig @@ -0,0 +1 @@ +#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift new file mode 100644 index 00000000..7b9bdcf8 --- /dev/null +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -0,0 +1,16 @@ +// +// Generated file. Do not edit. +// + +import FlutterMacOS +import Foundation + +import flutter_blue_plus_darwin +import flutter_local_notifications +import shared_preferences_foundation + +func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { + FlutterBluePlusPlugin.register(with: registry.registrar(forPlugin: "FlutterBluePlusPlugin")) + FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin")) + SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) +} diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj new file mode 100644 index 00000000..6a856469 --- /dev/null +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,705 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 54; + objects = { + +/* Begin PBXAggregateTarget section */ + 33CC111A2044C6BA0003C045 /* Flutter Assemble */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */; + buildPhases = ( + 33CC111E2044C6BF0003C045 /* ShellScript */, + ); + dependencies = ( + ); + name = "Flutter Assemble"; + productName = FLX; + }; +/* End PBXAggregateTarget section */ + +/* Begin PBXBuildFile section */ + 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; }; + 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; }; + 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; }; + 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 */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 331C80D9294CF71000263BE5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 33CC10E52044A3C60003C045 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 33CC10EC2044A3C60003C045; + remoteInfo = Runner; + }; + 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 33CC10E52044A3C60003C045 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 33CC111A2044C6BA0003C045; + remoteInfo = FLX; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 33CC110E2044A8840003C045 /* Bundle Framework */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + ); + name = "Bundle Framework"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 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 /* meshcore_open.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "meshcore_open.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 = ""; }; + 33CC10F72044A3C60003C045 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Runner/Info.plist; sourceTree = ""; }; + 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainFlutterWindow.swift; sourceTree = ""; }; + 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Debug.xcconfig"; sourceTree = ""; }; + 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Release.xcconfig"; sourceTree = ""; }; + 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Flutter-Generated.xcconfig"; path = "ephemeral/Flutter-Generated.xcconfig"; sourceTree = ""; }; + 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 = ""; }; + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; + 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 331C80D2294CF70F00263BE5 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 33CC10EA2044A3C60003C045 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 331C80D6294CF71000263BE5 /* RunnerTests */ = { + isa = PBXGroup; + children = ( + 331C80D7294CF71000263BE5 /* RunnerTests.swift */, + ); + path = RunnerTests; + sourceTree = ""; + }; + 33BA886A226E78AF003329D5 /* Configs */ = { + isa = PBXGroup; + children = ( + 33E5194F232828860026EE4D /* AppInfo.xcconfig */, + 9740EEB21CF90195004384FC /* Debug.xcconfig */, + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, + 333000ED22D3DE5D00554162 /* Warnings.xcconfig */, + ); + path = Configs; + sourceTree = ""; + }; + 33CC10E42044A3C60003C045 = { + isa = PBXGroup; + children = ( + 33FAB671232836740065AC1E /* Runner */, + 33CEB47122A05771004F2AC0 /* Flutter */, + 331C80D6294CF71000263BE5 /* RunnerTests */, + 33CC10EE2044A3C60003C045 /* Products */, + D73912EC22F37F3D000D13A0 /* Frameworks */, + ); + sourceTree = ""; + }; + 33CC10EE2044A3C60003C045 /* Products */ = { + isa = PBXGroup; + children = ( + 33CC10ED2044A3C60003C045 /* meshcore_open.app */, + 331C80D5294CF71000263BE5 /* RunnerTests.xctest */, + ); + name = Products; + sourceTree = ""; + }; + 33CC11242044D66E0003C045 /* Resources */ = { + isa = PBXGroup; + children = ( + 33CC10F22044A3C60003C045 /* Assets.xcassets */, + 33CC10F42044A3C60003C045 /* MainMenu.xib */, + 33CC10F72044A3C60003C045 /* Info.plist */, + ); + name = Resources; + path = ..; + sourceTree = ""; + }; + 33CEB47122A05771004F2AC0 /* Flutter */ = { + isa = PBXGroup; + children = ( + 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */, + 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */, + 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */, + 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */, + ); + path = Flutter; + sourceTree = ""; + }; + 33FAB671232836740065AC1E /* Runner */ = { + isa = PBXGroup; + children = ( + 33CC10F02044A3C60003C045 /* AppDelegate.swift */, + 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */, + 33E51913231747F40026EE4D /* DebugProfile.entitlements */, + 33E51914231749380026EE4D /* Release.entitlements */, + 33CC11242044D66E0003C045 /* Resources */, + 33BA886A226E78AF003329D5 /* Configs */, + ); + path = Runner; + sourceTree = ""; + }; + D73912EC22F37F3D000D13A0 /* Frameworks */ = { + isa = PBXGroup; + children = ( + ); + name = Frameworks; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 331C80D4294CF70F00263BE5 /* RunnerTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; + buildPhases = ( + 331C80D1294CF70F00263BE5 /* Sources */, + 331C80D2294CF70F00263BE5 /* Frameworks */, + 331C80D3294CF70F00263BE5 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 331C80DA294CF71000263BE5 /* PBXTargetDependency */, + ); + name = RunnerTests; + productName = RunnerTests; + productReference = 331C80D5294CF71000263BE5 /* RunnerTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; + 33CC10EC2044A3C60003C045 /* Runner */ = { + isa = PBXNativeTarget; + buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; + buildPhases = ( + 33CC10E92044A3C60003C045 /* Sources */, + 33CC10EA2044A3C60003C045 /* Frameworks */, + 33CC10EB2044A3C60003C045 /* Resources */, + 33CC110E2044A8840003C045 /* Bundle Framework */, + 3399D490228B24CF009A79C7 /* ShellScript */, + ); + buildRules = ( + ); + dependencies = ( + 33CC11202044C79F0003C045 /* PBXTargetDependency */, + ); + name = Runner; + productName = Runner; + productReference = 33CC10ED2044A3C60003C045 /* meshcore_open.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 33CC10E52044A3C60003C045 /* Project object */ = { + isa = PBXProject; + attributes = { + BuildIndependentTargetsInParallel = YES; + LastSwiftUpdateCheck = 0920; + LastUpgradeCheck = 1510; + ORGANIZATIONNAME = ""; + TargetAttributes = { + 331C80D4294CF70F00263BE5 = { + CreatedOnToolsVersion = 14.0; + TestTargetID = 33CC10EC2044A3C60003C045; + }; + 33CC10EC2044A3C60003C045 = { + CreatedOnToolsVersion = 9.2; + LastSwiftMigration = 1100; + ProvisioningStyle = Automatic; + SystemCapabilities = { + com.apple.Sandbox = { + enabled = 1; + }; + }; + }; + 33CC111A2044C6BA0003C045 = { + CreatedOnToolsVersion = 9.2; + ProvisioningStyle = Manual; + }; + }; + }; + buildConfigurationList = 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 33CC10E42044A3C60003C045; + productRefGroup = 33CC10EE2044A3C60003C045 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 33CC10EC2044A3C60003C045 /* Runner */, + 331C80D4294CF70F00263BE5 /* RunnerTests */, + 33CC111A2044C6BA0003C045 /* Flutter Assemble */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 331C80D3294CF70F00263BE5 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 33CC10EB2044A3C60003C045 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */, + 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 3399D490228B24CF009A79C7 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh embed\n"; + }; + 33CC111E2044C6BF0003C045 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + Flutter/ephemeral/FlutterInputs.xcfilelist, + ); + inputPaths = ( + Flutter/ephemeral/tripwire, + ); + outputFileListPaths = ( + Flutter/ephemeral/FlutterOutputs.xcfilelist, + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 331C80D1294CF70F00263BE5 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 33CC10E92044A3C60003C045 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */, + 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */, + 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 331C80DA294CF71000263BE5 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 33CC10EC2044A3C60003C045 /* Runner */; + targetProxy = 331C80D9294CF71000263BE5 /* PBXContainerItemProxy */; + }; + 33CC11202044C79F0003C045 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 33CC111A2044C6BA0003C045 /* Flutter Assemble */; + targetProxy = 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 33CC10F42044A3C60003C045 /* MainMenu.xib */ = { + isa = PBXVariantGroup; + children = ( + 33CC10F52044A3C60003C045 /* Base */, + ); + name = MainMenu.xib; + path = Runner; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 331C80DB294CF71000263BE5 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.meshcore.meshcoreOpen.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/meshcore_open.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/meshcore_open"; + }; + name = Debug; + }; + 331C80DC294CF71000263BE5 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.meshcore.meshcoreOpen.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/meshcore_open.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/meshcore_open"; + }; + name = Release; + }; + 331C80DD294CF71000263BE5 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.meshcore.meshcoreOpen.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/meshcore_open.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/meshcore_open"; + }; + name = Profile; + }; + 338D0CE9231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.15; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + }; + name = Profile; + }; + 338D0CEA231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; + }; + name = Profile; + }; + 338D0CEB231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Manual; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Profile; + }; + 33CC10F92044A3C60003C045 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.15; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + 33CC10FA2044A3C60003C045 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.15; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + }; + name = Release; + }; + 33CC10FC2044A3C60003C045 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + }; + name = Debug; + }; + 33CC10FD2044A3C60003C045 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; + }; + name = Release; + }; + 33CC111C2044C6BA0003C045 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Manual; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 33CC111D2044C6BA0003C045 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 331C80DB294CF71000263BE5 /* Debug */, + 331C80DC294CF71000263BE5 /* Release */, + 331C80DD294CF71000263BE5 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC10F92044A3C60003C045 /* Debug */, + 33CC10FA2044A3C60003C045 /* Release */, + 338D0CE9231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC10FC2044A3C60003C045 /* Debug */, + 33CC10FD2044A3C60003C045 /* Release */, + 338D0CEA231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC111C2044C6BA0003C045 /* Debug */, + 33CC111D2044C6BA0003C045 /* Release */, + 338D0CEB231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 33CC10E52044A3C60003C045 /* Project object */; +} diff --git a/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /dev/null +++ b/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme new file mode 100644 index 00000000..fd43b250 --- /dev/null +++ b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/macos/Runner.xcworkspace/contents.xcworkspacedata b/macos/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..1d526a16 --- /dev/null +++ b/macos/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /dev/null +++ b/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/macos/Runner/AppDelegate.swift b/macos/Runner/AppDelegate.swift new file mode 100644 index 00000000..b3c17614 --- /dev/null +++ b/macos/Runner/AppDelegate.swift @@ -0,0 +1,13 @@ +import Cocoa +import FlutterMacOS + +@main +class AppDelegate: FlutterAppDelegate { + override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool { + return true + } + + override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool { + return true + } +} diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 00000000..a2ec33f1 --- /dev/null +++ b/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,68 @@ +{ + "images" : [ + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "app_icon_16.png", + "scale" : "1x" + }, + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "app_icon_32.png", + "scale" : "2x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "app_icon_32.png", + "scale" : "1x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "app_icon_64.png", + "scale" : "2x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "app_icon_128.png", + "scale" : "1x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "app_icon_256.png", + "scale" : "2x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "app_icon_256.png", + "scale" : "1x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "app_icon_512.png", + "scale" : "2x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "app_icon_512.png", + "scale" : "1x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "app_icon_1024.png", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png new file mode 100644 index 0000000000000000000000000000000000000000..82b6f9d9a33e198f5747104729e1fcef999772a5 GIT binary patch literal 102994 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ⅅ8MglG&ER{i5lN315cO?EdHNLrg? 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 z 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 Pe7HEdAEg|=c=LY&YVNkY literal 0 HcmV?d00001 diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png new file mode 100644 index 0000000000000000000000000000000000000000..13b35eba55c6dabc3aac36f33d859266c18fa0d0 GIT binary patch literal 5680 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 literal 0 HcmV?d00001 diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png new file mode 100644 index 0000000000000000000000000000000000000000..0a3f5fa40fb3d1e0710331a48de5d256da3f275d GIT binary patch literal 520 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|Tv8)E(|mmy zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uuz(rC1}QWNE&K#jR^;j87-Auq zoUlN^K{r-Q+XN;zI ze|?*NFmgt#V#GwrSWaz^2G&@SBmck6ZcIFMww~vE<1E?M2#KUn1CzsB6D2+0SuRV@ zV2kK5HvIGB{HX-hQzs0*AB%5$9RJ@a;)Ahq#p$GSP91^&hi#6sg*;a~dt}4AclK>h z_3MoPRQ{i;==;*1S-mY<(JFzhAxMI&<61&m$J0NDHdJ3tYx~j0%M-uN6Zl8~_0DOkGXc0001@sz3l12C6Xg{AT~( zm6w64BA|AX`Ve)YY-glyudNN>MAfkXz-T7`_`fEolM;0T0BA)(02-OaW z0*cW7Z~ec94o8&g0D$N>b!COu{=m}^%oXZ4?T8ZyPZuGGBPBA7pbQMoV5HYhiT?%! zcae~`(QAN4&}-=#2f5fkn!SWGWmSeCISBcS=1-U|MEoKq=k?_x3apK>9((R zuu$9X?^8?@(a{qMS%J8SJPq))v}Q-ZyDm6Gbie0m92=`YlwnQPQP1kGSm(N2UJ3P6 z^{p-u)SSCTW~c1rw;cM)-uL2{->wCn2{#%;AtCQ!m%AakVs1K#v@(*-6QavyY&v&*wO_rCJXJuq$c$7ZjsW+pJo-$L^@!7X04CvaOpPyfw|FKvu;e(&Iw>Tbg zL}#8e^?X%TReXTt>gsBByt0kSU20oQx*~P=4`&tcZ7N6t-6LiK{LxX*p6}9c<0Pu^ zLx1w_P4P2V>bX=`F%v$#{sUDdF|;rbI{p#ZW`00Bgh(eB(nOIhy8W9T>3aQ=k8Z9% zB+TusFABF~J?N~fAd}1Rme=@4+1=M{^P`~se7}e3;mY0!%#MJf!XSrUC{0uZqMAd7%q zQY#$A>q}noIB4g54Ue)x>ofVm3DKBbUmS4Z-bm7KdKsUixva)1*&z5rgAG2gxG+_x zqT-KNY4g7eM!?>==;uD9Y4iI(Hu$pl8!LrK_Zb}5nv(XKW{9R144E!cFf36p{i|8pRL~p`_^iNo z{mf7y`#hejw#^#7oKPlN_Td{psNpNnM?{7{R-ICBtYxk>?3}OTH_8WkfaTLw)ZRTfxjW+0>gMe zpKg~`Bc$Y>^VX;ks^J0oKhB#6Ukt{oQhN+o2FKGZx}~j`cQB%vVsMFnm~R_1Y&Ml? zwFfb~d|dW~UktY@?zkau>Owe zRroi(<)c4Ux&wJfY=3I=vg)uh;sL(IYY9r$WK1$F;jYqq1>xT{LCkIMb3t2jN8d`9 z=4(v-z7vHucc_fjkpS}mGC{ND+J-hc_0Ix4kT^~{-2n|;Jmn|Xf9wGudDk7bi*?^+ z7fku8z*mbkGm&xf&lmu#=b5mp{X(AwtLTf!N`7FmOmX=4xwbD=fEo8CaB1d1=$|)+ z+Dlf^GzGOdlqTO8EwO?8;r+b;gkaF^$;+#~2_YYVH!hD6r;PaWdm#V=BJ1gH9ZK_9 zrAiIC-)z)hRq6i5+$JVmR!m4P>3yJ%lH)O&wtCyum3A*})*fHODD2nq!1@M>t@Za+ zH6{(Vf>_7!I-APmpsGLYpl7jww@s5hHOj5LCQXh)YAp+y{gG(0UMm(Ur z3o3n36oFwCkn+H*GZ-c6$Y!5r3z*@z0`NrB2C^q#LkOuooUM8Oek2KBk}o1PU8&2L z4iNkb5CqJWs58aR394iCU^ImDqV;q_Pp?pl=RB2372(Io^GA^+oKguO1(x$0<7w3z z)j{vnqEB679Rz4i4t;8|&Zg77UrklxY9@GDq(ZphH6=sW`;@uIt5B?7Oi?A0-BL}(#1&R;>2aFdq+E{jsvpNHjLx2t{@g1}c~DQcPNmVmy| zNMO@ewD^+T!|!DCOf}s9dLJU}(KZy@Jc&2Nq3^;vHTs}Hgcp`cw&gd7#N}nAFe3cM1TF%vKbKSffd&~FG9y$gLyr{#to)nxz5cCASEzQ}gz8O)phtHuKOW6p z@EQF(R>j%~P63Wfosrz8p(F=D|Mff~chUGn(<=CQbSiZ{t!e zeDU-pPsLgtc#d`3PYr$i*AaT!zF#23htIG&?QfcUk+@k$LZI}v+js|yuGmE!PvAV3 ztzh90rK-0L6P}s?1QH`Ot@ilbgMBzWIs zIs6K<_NL$O4lwR%zH4oJ+}JJp-bL6~%k&p)NGDMNZX7)0kni&%^sH|T?A)`z z=adV?!qnWx^B$|LD3BaA(G=ePL1+}8iu^SnnD;VE1@VLHMVdSN9$d)R(Wk{JEOp(P zm3LtAL$b^*JsQ0W&eLaoYag~=fRRdI>#FaELCO7L>zXe6w*nxN$Iy*Q*ftHUX0+N- zU>{D_;RRVPbQ?U+$^%{lhOMKyE5>$?U1aEPist+r)b47_LehJGTu>TcgZe&J{ z{q&D{^Ps~z7|zj~rpoh2I_{gAYNoCIJmio3B}$!5vTF*h$Q*vFj~qbo%bJCCRy509 zHTdDh_HYH8Zb9`}D5;;J9fkWOQi%Y$B1!b9+ESj+B@dtAztlY2O3NE<6HFiqOF&p_ zW-K`KiY@RPSY-p9Q99}Hcd05DT79_pfb{BV7r~?9pWh=;mcKBLTen%THFPo2NN~Nf zriOtFnqx}rtO|A6k!r6 zf-z?y-UD{dT0kT9FJ`-oWuPHbo+3wBS(}?2ql(+e@VTExmfnB*liCb zmeI+v5*+W_L;&kQN^ChW{jE0Mw#0Tfs}`9bk3&7UjxP^Ke(%eJu2{VnW?tu7Iqecm zB5|=-QdzK$=h50~{X3*w4%o1FS_u(dG2s&427$lJ?6bkLet}yYXCy)u_Io1&g^c#( z-$yYmSpxz{>BL;~c+~sxJIe1$7eZI_9t`eB^Pr0)5CuA}w;;7#RvPq|H6!byRzIJG ziQ7a4y_vhj(AL`8PhIm9edCv|%TX#f50lt8+&V+D4<}IA@S@#f4xId80oH$!_!q?@ zFRGGg2mTv&@76P7aTI{)Hu%>3QS_d)pQ%g8BYi58K~m-Ov^7r8BhX7YC1D3vwz&N8{?H*_U7DI?CI)+et?q|eGu>42NJ?K4SY zD?kc>h@%4IqNYuQ8m10+8xr2HYg2qFNdJl=Tmp&ybF>1>pqVfa%SsV*BY$d6<@iJA ziyvKnZ(~F9xQNokBgMci#pnZ}Igh0@S~cYcU_2Jfuf|d3tuH?ZSSYBfM(Y3-JBsC|S9c;# zyIMkPxgrq};0T09pjj#X?W^TFCMf1-9P{)g88;NDI+S4DXe>7d3Mb~i-h&S|Jy{J< zq3736$bH?@{!amD!1Ys-X)9V=#Z={fzsjVYMX5BG6%}tkzwC#1nQLj1y1f#}8**4Y zAvDZHw8)N)8~oWC88CgzbwOrL9HFbk4}h85^ptuu7A+uc#$f^9`EWv1Vr{5+@~@Uv z#B<;-nt;)!k|fRIg;2DZ(A2M2aC65kOIov|?Mhi1Sl7YOU4c$T(DoRQIGY`ycfkn% zViHzL;E*A{`&L?GP06Foa38+QNGA zw3+Wqs(@q+H{XLJbwZzE(omw%9~LPZfYB|NF5%j%E5kr_xE0u;i?IOIchn~VjeDZ) zAqsqhP0vu2&Tbz3IgJvMpKbThC-@=nk)!|?MIPP>MggZg{cUcKsP8|N#cG5 zUXMXxcXBF9`p>09IR?x$Ry3;q@x*%}G#lnB1}r#!WL88I@uvm}X98cZ8KO&cqT1p> z+gT=IxPsq%n4GWgh-Bk8E4!~`r@t>DaQKsjDqYc&h$p~TCh8_Mck5UB84u6Jl@kUZCU9BA-S!*bf>ZotFX9?a_^y%)yH~rsAz0M5#^Di80_tgoKw(egN z`)#(MqAI&A84J#Z<|4`Co8`iY+Cv&iboMJ^f9ROUK0Lm$;-T*c;TCTED_0|qfhlcS zv;BD*$Zko#nWPL}2K8T-?4}p{u)4xon!v_(yVW8VMpxg4Kh^J6WM{IlD{s?%XRT8P|yCU`R&6gwB~ zg}{At!iWCzOH37!ytcPeC`(({ovP7M5Y@bYYMZ}P2Z3=Y_hT)4DRk}wfeIo%q*M9UvXYJq!-@Ly79m5aLD{hf@BzQB>FdQ4mw z6$@vzSKF^Gnzc9vbccii)==~9H#KW<6)Uy1wb~auBn6s`ct!ZEos`WK8e2%<00b%# zY9Nvnmj@V^K(a_38dw-S*;G-(i(ETuIwyirs?$FFW@|66a38k+a%GLmucL%Wc8qk3 z?h_4!?4Y-xt)ry)>J`SuY**fuq2>u+)VZ+_1Egzctb*xJ6+7q`K$^f~r|!i?(07CD zH!)C_uerf-AHNa?6Y61D_MjGu*|wcO+ZMOo4q2bWpvjEWK9yASk%)QhwZS%N2_F4& z16D18>e%Q1mZb`R;vW{+IUoKE`y3(7p zplg5cBB)dtf^SdLd4n60oWie|(ZjgZa6L*VKq02Aij+?Qfr#1z#fwh92aV-HGd^_w zsucG24j8b|pk>BO7k8dS86>f-jBP^Sa}SF{YNn=^NU9mLOdKcAstv&GV>r zLxKHPkFxpvE8^r@MSF6UA}cG`#yFL8;kA7ccH9D=BGBtW2;H>C`FjnF^P}(G{wU;G z!LXLCbPfsGeLCQ{Ep$^~)@?v`q(uI`CxBY44osPcq@(rR-633!qa zsyb>?v%@X+e|Mg`+kRL*(;X>^BNZz{_kw5+K;w?#pReiw7eU8_Z^hhJ&fj80XQkuU z39?-z)6Fy$I`bEiMheS(iB6uLmiMd1i)cbK*9iPpl+h4x9ch7x- z1h4H;W_G?|)i`z??KNJVwgfuAM=7&Apd3vm#AT8uzQZ!NII}}@!j)eIfn53h{NmN7 zAKG6SnKP%^k&R~m5#@_4B@V?hYyHkm>0SQ@PPiw*@Tp@UhP-?w@jW?nxXuCipMW=L zH*5l*d@+jXm0tIMP_ec6Jcy6$w(gKK@xBX8@%oPaSyG;13qkFb*LuVx3{AgIyy&n3 z@R2_DcEn|75_?-v5_o~%xEt~ONB>M~tpL!nOVBLPN&e5bn5>+7o0?Nm|EGJ5 zmUbF{u|Qn?cu5}n4@9}g(G1JxtzkKv(tqwm_?1`?YSVA2IS4WI+*(2D*wh&6MIEhw z+B+2U<&E&|YA=3>?^i6)@n1&&;WGHF-pqi_sN&^C9xoxME5UgorQ_hh1__zzR#zVC zOQt4q6>ME^iPJ37*(kg4^=EFqyKH@6HEHXy79oLj{vFqZGY?sVjk!BX^h$SFJlJnv z5uw~2jLpA)|0=tp>qG*tuLru?-u`khGG2)o{+iDx&nC}eWj3^zx|T`xn5SuR;Aw8U z`p&>dJw`F17@J8YAuW4=;leBE%qagVTG5SZdh&d)(#ZhowZ|cvWvGMMrfVsbg>_~! z19fRz8CSJdrD|Rl)w!uznBF&2-dg{>y4l+6(L(vzbLA0Bk&`=;oQQ>(M8G=3kto_) zP8HD*n4?MySO2YrG6fwSrVmnesW+D&fxjfEmp=tPd?RKLZJcH&K(-S+x)2~QZ$c(> zru?MND7_HPZJVF%wX(49H)+~!7*!I8w72v&{b={#l9yz+S_aVPc_So%iF8>$XD1q1 zFtucO=rBj0Ctmi0{njN8l@}!LX}@dwl>3yMxZ;7 z0Ff2oh8L)YuaAGOuZ5`-p%Z4H@H$;_XRJQ|&(MhO78E|nyFa158gAxG^SP(vGi^+< zChY}o(_=ci3Wta#|K6MVljNe0T$%Q5ylx-v`R)r8;3+VUpp-)7T`-Y&{Zk z*)1*2MW+_eOJtF5tCMDV`}jg-R(_IzeE9|MBKl;a7&(pCLz}5<Zf+)T7bgNUQ_!gZtMlw=8doE}#W+`Xp~1DlE=d5SPT?ymu!r4z%&#A-@x^=QfvDkfx5-jz+h zoZ1OK)2|}_+UI)i9%8sJ9X<7AA?g&_Wd7g#rttHZE;J*7!e5B^zdb%jBj&dUDg4&B zMMYrJ$Z%t!5z6=pMGuO-VF~2dwjoXY+kvR>`N7UYfIBMZGP|C7*O=tU z2Tg_xi#Q3S=1|=WRfZD;HT<1D?GMR%5kI^KWwGrC@P2@R>mDT^3qsmbBiJc21kip~ zZp<7;^w{R;JqZ)C4z-^wL=&dBYj9WJBh&rd^A^n@07qM$c+kGv^f+~mU5_*|eePF| z3wDo-qaoRjmIw<2DjMTG4$HP{z54_te_{W^gu8$r=q0JgowzgQPct2JNtWPUsjF8R zvit&V8$(;7a_m%%9TqPkCXYUp&k*MRcwr*24>hR! z$4c#E=PVE=P4MLTUBM z7#*RDe0}=B)(3cvNpOmWa*eH#2HR?NVqXdJ=hq);MGD07JIQQ7Y0#iD!$C+mk7x&B zMwkS@H%>|fmSu#+ zI!}Sb(%o29Vkp_Th>&&!k7O>Ba#Om~B_J{pT7BHHd8(Ede(l`7O#`_}19hr_?~JP9 z`q(`<)y>%)x;O7)#-wfCP{?llFMoH!)ZomgsOYFvZ1DxrlYhkWRw#E-#Qf*z@Y-EQ z1~?_=c@M4DO@8AzZ2hKvw8CgitzI9yFd&N1-{|vP#4IqYb*#S0e3hrjsEGlnc4xwk z4o!0rxpUt8j&`mJ8?+P8G{m^jbk)bo_UPM+ifW*y-A*et`#_Ja_3nYyRa9fAG1Xr5 z>#AM_@PY|*u)DGRWJihZvgEh#{*joJN28uN7;i5{kJ*Gb-TERfN{ERe_~$Es~NJCpdKLRvdj4658uYYx{ng7I<6j~w@p%F<7a(Ssib|j z51;=Py(Nu*#hnLx@w&8X%=jrADn3TW>kplnb zYbFIWWVQXN7%Cwn6KnR)kYePEBmvM45I)UJb$)ninpdYg3a5N6pm_7Q+9>!_^xy?k za8@tJ@OOs-pRAAfT>Nc2x=>sZUs2!9Dwa%TTmDggH4fq(x^MW>mcRyJINlAqK$YQCMgR8`>6=Sg$ zFnJZsA8xUBXIN3i70Q%8px@yQPMgVP=>xcPI38jNJK<=6hC={a07+n@R|$bnhB)X$ z(Zc%tadp70vBTnW{OUIjTMe38F}JIH$#A}PB&RosPyFZMD}q}5W%$rh>5#U;m`z2K zc(&WRxx7DQLM-+--^w*EWAIS%bi>h587qkwu|H=hma3T^bGD&Z!`u(RKLeNZ&pI=q$|HOcji(0P1QC!YkAp*u z3%S$kumxR}jU<@6`;*-9=5-&LYRA<~uFrwO3U0k*4|xUTp4ZY7;Zbjx|uw&BWU$zK(w55pWa~#=f$c zNDW0O68N!xCy>G}(CX=;8hJLxAKn@Aj(dbZxO8a$+L$jK8$N-h@4$i8)WqD_%Snh4 zR?{O%k}>lr>w$b$g=VP8mckcCrjnp>uQl5F_6dPM8FWRqs}h`DpfCv20uZhyY~tr8 zkAYW4#yM;*je)n=EAb(q@5BWD8b1_--m$Q-3wbh1hM{8ihq7UUQfg@)l06}y+#=$( z$x>oVYJ47zAC^>HLRE-!HitjUixP6!R98WU+h>zct7g4eD;Mj#FL*a!VW!v-@b(Jv zj@@xM5noCp5%Vk3vY{tyI#oyDV7<$`KG`tktVyC&0DqxA#>V;-3oH%NW|Q&=UQ&zU zXNIT67J4D%5R1k#bW0F}TD`hlW7b)-=-%X4;UxQ*u4bK$mTAp%y&-(?{sXF%e_VH6 zTkt(X)SSN|;8q@8XX6qfR;*$r#HbIrvOj*-5ND8RCrcw4u8D$LXm5zlj@E5<3S0R# z??=E$p{tOk96$SloZ~ARe5`J=dB|Nj?u|zy2r(-*(q^@YwZiTF@QzQyPx_l=IDKa) zqD@0?IHJqSqZ_5`)81?4^~`yiGh6>7?|dKa8!e|}5@&qV!Iu9<@G?E}Vx9EzomB3t zEbMEm$TKGwkHDpirp;FZD#6P5qIlQJ8}rf;lHoz#h4TFFPYmS3+8(13_Mx2`?^=8S z|0)0&dQLJTU6{b%*yrpQe#OKKCrL8}YKw+<#|m`SkgeoN69TzIBQOl_Yg)W*w?NW) z*WxhEp$zQBBazJSE6ygu@O^!@Fr46j=|K`Mmb~xbggw7<)BuC@cT@Bwb^k?o-A zKX^9AyqR?zBtW5UA#siILztgOp?r4qgC`9jYJG_fxlsVSugGprremg-W(K0{O!Nw-DN%=FYCyfYA3&p*K>+|Q}s4rx#CQK zNj^U;sLM#q8}#|PeC$p&jAjqMu(lkp-_50Y&n=qF9`a3`Pr9f;b`-~YZ+Bb0r~c+V z*JJ&|^T{}IHkwjNAaM^V*IQ;rk^hnnA@~?YL}7~^St}XfHf6OMMCd9!vhk#gRA*{L zp?&63axj|Si%^NW05#87zpU_>QpFNb+I00v@cHwvdBn+Un)n2Egdt~LcWOeBW4Okm zD$-e~RD+W|UB;KQ;a7GOU&%p*efGu2$@wR74+&iP8|6#_fmnh^WcJLs)rtz{46);F z4v0OL{ZP9550>2%FE(;SbM*#sqMl*UXOb>ch`fJ|(*bOZ9=EB1+V4fkQ)hjsm3-u^Pk-4ji_uDDHdD>84tER!MvbH`*tG zzvbhBR@}Yd`azQGavooV=<WbvWLlO#x`hyO34mKcxrGv=`{ssnP=0Be5#1B;Co9 zh{TR>tjW2Ny$ZxJpYeg57#0`GP#jxDCU0!H15nL@@G*HLQcRdcsUO3sO9xvtmUcc{F*>FQZcZ5bgwaS^k-j5mmt zI7Z{Xnoml|A(&_{imAjK!kf5>g(oDqDI4C{;Bv162k8sFNr;!qPa2LPh>=1n z=^_9)TsLDvTqK7&*Vfm5k;VXjBW^qN3Tl&}K=X5)oXJs$z3gk0_+7`mJvz{pK|FVs zHw!k&7xVjvY;|(Py<;J{)b#Yjj*LZO7x|~pO4^MJ2LqK3X;Irb%nf}L|gck zE#55_BNsy6m+W{e zo!P59DDo*s@VIi+S|v93PwY6d?CE=S&!JLXwE9{i)DMO*_X90;n2*mPDrL%{iqN!?%-_95J^L z=l<*{em(6|h7DR4+4G3Wr;4*}yrBkbe3}=p7sOW1xj!EZVKSMSd;QPw>uhKK z#>MlS@RB@-`ULv|#zI5GytO{=zp*R__uK~R6&p$q{Y{iNkg61yAgB8C^oy&``{~FK z8hE}H&nIihSozKrOONe5Hu?0Zy04U#0$fB7C6y~?8{or}KNvP)an=QP&W80mj&8WL zEZQF&*FhoMMG6tOjeiCIV;T{I>jhi9hiUwz?bkX3NS-k5eWKy)Mo_orMEg4sV6R6X&i-Q%JG;Esl+kLpn@Bsls9O|i9z`tKB^~1D5)RIBB&J<6T@a4$pUvh$IR$%ubH)joi z!7>ON0DPwx=>0DA>Bb^c?L8N0BBrMl#oDB+GOXJh;Y&6I)#GRy$W5xK%a;KS8BrER zX)M>Rdoc*bqP*L9DDA3lF%U8Yzb6RyIsW@}IKq^i7v&{LeIc=*ZHIbO68x=d=+0T( zev=DT9f|x!IWZNTB#N7}V4;9#V$%Wo0%g>*!MdLOEU>My0^gni9ocID{$g9ytD!gy zKRWT`DVN(lcYjR|(}f0?zgBa3SwunLfAhx><%u0uFkrdyqlh8_g zDKt#R6rA2(Vm2LW_>3lBNYKG_F{TEnnKWGGC15y&OebIRhFL4TeMR*v9i0wPoK#H< zu4){s4K&K)K(9~jgGm;H7lS7y_RYfS;&!Oj5*eqbvEcW^a*i67nevzOZxN6F+K~A%TYEtsAVsR z@J=1hc#Dgs7J2^FL|qV&#WBFQyDtEQ2kPO7m2`)WFhqAob)Y>@{crkil6w9VoA?M6 zADGq*#-hyEVhDG5MQj677XmcWY1_-UO40QEP&+D)rZoYv^1B_^w7zAvWGw&pQyCyx zD|ga$w!ODOxxGf_Qq%V9Z7Q2pFiUOIK818AGeZ-~*R zI1O|SSc=3Z?#61Rd|AXx2)K|F@Z1@x!hBBMhAqiU)J=U|Y)T$h3D?ZPPQgkSosnN! zIqw-t$0fqsOlgw3TlHJF*t$Q@bg$9}A3X=cS@-yU3_vNG_!#9}7=q7!LZ?-%U26W4 z$d>_}*s1>Ac%3uFR;tnl*fNlylJ)}r2^Q3&@+is3BIv<}x>-^_ng;jhdaM}6Sg3?p z0jS|b%QyScy3OQ(V*~l~bK>VC{9@FMuW_JUZO?y(V?LKWD6(MXzh}M3r3{7b4eB(#`(q1m{>Be%_<9jw8HO!x#yF6vez$c#kR+}s zZO-_;25Sxngd(}){zv?ccbLqRAlo;yog>4LH&uZUK1n>x?u49C)Y&2evH5Zgt~666 z_2_z|H5AO5Iqxv_Bn~*y1qzRPcob<+Otod5Xd2&z=C;u+F}zBB@b^UdGdUz|s!H}M zXG%KiLzn3G?FZgdY&3pV$nSeY?ZbU^jhLz9!t0K?ep}EFNqR1@E!f*n>x*!uO*~JF zW9UXWrVgbX1n#76_;&0S7z}(5n-bqnII}_iDsNqfmye@)kRk`w~1 z6j4h4BxcPe6}v)xGm%=z2#tB#^KwbgMTl2I*$9eY|EWAHFc3tO48Xo5rW z5oHD!G4kb?MdrOHV=A+8ThlIqL8Uu+7{G@ zb)cGBm|S^Eh5= z^E^SZ=yeC;6nNCdztw&TdnIz}^Of@Ke*@vjt)0g>Y!4AJvWiL~e7+9#Ibhe)> ziNwh>gWZL@FlWc)wzihocz+%+@*euwXhW%Hb>l7tf8aJe5_ZSH1w-uG|B;9qpcBP0 zM`r1Hu#htOl)4Cl1c7oY^t0e4Jh$-I(}M5kzWqh{F=g&IM#JiC`NDSd@BCKX#y<P@Gwl$3a3w z6<(b|K(X5FIR22M)sy$4jY*F4tT{?wZRI+KkZFb<@j@_C316lu1hq2hA|1wCmR+S@ zRN)YNNE{}i_H`_h&VUT5=Y(lN%m?%QX;6$*1P}K-PcPx>*S55v)qZ@r&Vcic-sjkm z! z=nfW&X`}iAqa_H$H%z3Tyz5&P3%+;93_0b;zxLs)t#B|up}JyV$W4~`8E@+BHQ+!y zuIo-jW!~)MN$2eHwyx-{fyGjAWJ(l8TZtUp?wZWBZ%}krT{f*^fqUh+ywHifw)_F> zp76_kj_B&zFmv$FsPm|L7%x-j!WP>_P6dHnUTv!9ZWrrmAUteBa`rT7$2ixO;ga8U z3!91micm}{!Btk+I%pMgcKs?H4`i+=w0@Ws-CS&n^=2hFTQ#QeOmSz6ttIkzmh^`A zYPq)G1l3h(E$mkyr{mvz*MP`x+PULBn%CDhltKkNo6Uqg!vJ#DA@BIYr9TQ`18Un2 zv$}BYzOQuay9}w(?JV63F$H6WmlYPPpH=R|CPb%C@BCv|&Q|&IcW7*LX?Q%epS z`=CPx{1HnJ9_46^=0VmNb>8JvMw-@&+V8SDLRYsa>hZXEeRbtf5eJ>0@Ds47zIY{N z42EOP9J8G@MXXdeiPx#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91AfN*P1ONa40RR91AOHXW0IY^$^8f$?lu1NER9Fe^SItioK@|V(ZWmgL zZT;XwPgVuWM>O%^|Dc$VK;n&?9!&g5)aVsG8cjs5UbtxVVnQNOV~7Mrg3+jnU;rhE z6fhW6P)R>_eXrXo-RW*y6RQ_qcb^s1wTu$TwriZ`=JUws>vRi}5x}MW1MR#7p|gIWJlaLK;~xaN}b< z<-@=RX-%1mt`^O0o^~2=CD7pJ<<$Rp-oUL-7PuG>do^5W_Mk#unlP}6I@6NPxY`Q} zuXJF}!0l)vwPNAW;@5DjPRj?*rZxl zwn;A(cFV!xe^CUu+6SrN?xe#mz?&%N9QHf~=KyK%DoB8HKC)=w=3E?1Bqj9RMJs3U z5am3Uv`@+{jgqO^f}Lx_Jp~CoP3N4AMZr~4&d)T`R?`(M{W5WWJV^z~2B|-oih@h^ zD#DuzGbl(P5>()u*YGo*Och=oRr~3P1wOlKqI)udc$|)(bacG5>~p(y>?{JD7nQf_ z*`T^YL06-O>T(s$bi5v~_fWMfnE7Vn%2*tqV|?~m;wSJEVGkNMD>+xCu#um(7}0so zSEu7?_=Q64Q5D+fz~T=Rr=G_!L*P|(-iOK*@X8r{-?oBlnxMNNgCVCN9Y~ocu+?XA zjjovJ9F1W$Nf!{AEv%W~8oahwM}4Ruc+SLs>_I_*uBxdcn1gQ^2F8a*vGjgAXYyh? zWCE@c5R=tbD(F4nL9NS?$PN1V_2*WR?gjv3)4MQeizuH`;sqrhgykEzj z593&TGlm3h`sIXy_U<7(dpRXGgp0TB{>s?}D{fwLe>IV~exweOfH!qM@CV5kib!YA z6O0gvJi_0J8IdEvyP#;PtqP*=;$iI2t(xG2YI-e!)~kaUn~b{6(&n zp)?iJ`z2)Xh%sCV@BkU`XL%_|FnCA?cVv@h*-FOZhY5erbGh)%Q!Av#fJM3Csc_g zC2I6x%$)80`Tkz#KRA!h1FzY`?0es3t!rKDT5EjPe6B=BLPr7s0GW!if;Ip^!AmGW zL;$`Vdre+|FA!I4r6)keFvAx3M#1`}ijBHDzy)3t0gwjl|qC2YB`SSxFKHr(oY#H$)x{L$LL zBdLKTlsOrmb>T0wd=&6l3+_Te>1!j0OU8%b%N342^opKmT)gni(wV($s(>V-fUv@0p8!f`=>PxC|9=nu ze{ToBBj8b<{PLfXV$h8YPgA~E!_sF9bl;QOF{o6t&JdsX?}rW!_&d`#wlB6T_h;Xf zl{4Tz5>qjF4kZgjO7ZiLPRz_~U@k5%?=30+nxEh9?s78gZ07YHB`FV`4%hlQlMJe@J`+e(qzy+h(9yY^ckv_* zb_E6o4p)ZaWfraIoB2)U7_@l(J0O%jm+Or>8}zSSTkM$ASG^w3F|I? z$+eHt7T~04(_WfKh27zqS$6* zzyy-ZyqvSIZ0!kkSvHknm_P*{5TKLQs8S6M=ONuKAUJWtpxbL#2(_huvY(v~Y%%#~ zYgsq$JbLLprKkV)32`liIT$KKEqs$iYxjFlHiRNvBhxbDg*3@Qefw4UM$>i${R5uB zhvTgmqQsKA{vrKN;TSJU2$f9q=y{$oH{<)woSeV>fkIz6D8@KB zf4M%v%f5U2?<8B(xn}xV+gWP?t&oiapJhJbfa;agtz-YM7=hrSuxl8lAc3GgFna#7 zNjX7;`d?oD`#AK+fQ=ZXqfIZFEk{ApzjJF0=yO~Yj{7oQfXl+6v!wNnoqwEvrs81a zGC?yXeSD2NV!ejp{LdZGEtd1TJ)3g{P6j#2jLR`cpo;YX}~_gU&Gd<+~SUJVh+$7S%`zLy^QqndN<_9 zrLwnXrLvW+ew9zX2)5qw7)zIYawgMrh`{_|(nx%u-ur1B7YcLp&WFa24gAuw~& zKJD3~^`Vp_SR$WGGBaMnttT)#fCc^+P$@UHIyBu+TRJWbcw4`CYL@SVGh!X&y%!x~ zaO*m-bTadEcEL6V6*{>irB8qT5Tqd54TC4`h`PVcd^AM6^Qf=GS->x%N70SY-u?qr>o2*OV7LQ=j)pQGv%4~z zz?X;qv*l$QSNjOuQZ>&WZs2^@G^Qas`T8iM{b19dS>DaXX~=jd4B2u`P;B}JjRBi# z_a@&Z5ev1-VphmKlZEZZd2-Lsw!+1S60YwW6@>+NQ=E5PZ+OUEXjgUaXL-E0fo(E* zsjQ{s>n33o#VZm0e%H{`KJi@2ghl8g>a~`?mFjw+$zlt|VJhSU@Y%0TWs>cnD&61fW4e0vFSaXZa4-c}U{4QR8U z;GV3^@(?Dk5uc@RT|+5C8-24->1snH6-?(nwXSnPcLn#X_}y3XS)MI_?zQ$ZAuyg+ z-pjqsw}|hg{$~f0FzmmbZzFC0He_*Vx|_uLc!Ffeb8#+@m#Z^AYcWcZF(^Os8&Z4g zG)y{$_pgrv#=_rV^D|Y<_b@ICleUv>c<0HzJDOsgJb#Rd-Vt@+EBDPyq7dUM9O{Yp zuGUrO?ma2wpuJuwl1M=*+tb|qx7Doj?!F-3Z>Dq_ihFP=d@_JO;vF{iu-6MWYn#=2 zRX6W=`Q`q-+q@Db|6_a1#8B|#%hskH82lS|9`im0UOJn?N#S;Y0$%xZw3*jR(1h5s z?-7D1tnIafviko>q6$UyqVDq1o@cwyCb*})l~x<@s$5D6N=-Uo1yc49p)xMzxwnuZ zHt!(hu-Ek;Fv4MyNTgbW%rPF*dB=;@r3YnrlFV{#-*gKS_qA(G-~TAlZ@Ti~Yxw;k za1EYyX_Up|`rpbZ0&Iv#$;eC|c0r4XGaQ-1mw@M_4p3vKIIpKs49a8Ns#ni)G314Z z8$Ei?AhiT5dQGWUYdCS|IC7r z=-8ol>V?u!n%F*J^^PZ(ONT&$Ph;r6X;pj|03HlDY6r~0g~X#zuzVU%a&!fs_f|m?qYvg^Z{y?9Qh7Rn?T*F%7lUtA6U&={HzhYEzA`knx1VH> z{tqv?p@I(&ObD5L4|YJV$QM>Nh-X3cx{I&!$FoPC_2iIEJfPk-$;4wz>adRu@n`_y z_R6aN|MDHdK;+IJmyw(hMoDCFCQ(6?hCAG5&7p{y->0Uckv# zvooVuu04$+pqof777ftk<#42@KQ((5DPcSMQyzGOJ{e9H$a9<2Qi_oHjl{#=FUL9d z+~0^2`tcvmp0hENwfHR`Ce|<1S@p;MNGInXCtHnrDPXCKmMTZQ{HVm_cZ>@?Wa6}O zHsJc7wE)mc@1OR2DWY%ZIPK1J2p6XDO$ar`$RXkbW}=@rFZ(t85AS>>U0!yt9f49^ zA9@pc0P#k;>+o5bJfx0t)Lq#v4`OcQn~av__dZ-RYOYu}F#pdsl31C^+Qgro}$q~5A<*c|kypzd} ziYGZ~?}5o`S5lw^B{O@laad9M_DuJle- z*9C7o=CJh#QL=V^sFlJ0c?BaB#4bV^T(DS6&Ne&DBM_3E$S^S13qC$7_Z?GYXTpR@wqr70wu$7+qvf-SEUa5mdHvFbu^7ew!Z1a^ zo}xKOuT*gtGws-a{Tx}{#(>G~Y_h&5P@Q8&p!{*s37^QX_Ibx<6XU*AtDOIvk|^{~ zPlS}&DM5$Ffyu-T&0|KS;Wnaqw{9DB&B3}vcO14wn;)O_e@2*9B&0I_ zZz{}CMxx`hv-XouY>^$Y@J(_INeM>lIQI@I>dBAqq1)}?Xmx(qRuX^i4IV%=MF306 z9g)i*79pP%_7Ex?m6ag-4Tlm=Z;?DQDyC-NpUIb#_^~V_tsL<~5<&;Gf2N+p?(msn zzUD~g>OoW@O}y0@Z;RN)wjam`CipmT&O7a|YljZqU=U86 zedayEdY)2F#BJ6xvmW8K&ffdS*0!%N<%RB!2~PAT4AD*$W7yzHbX#Eja9%3aD+Ah2 zf#T;XJW-GMxpE=d4Y>}jE=#U`IqgSoWcuvgaWQ9j1CKzG zDkoMDDT)B;Byl3R2PtC`ip=yGybfzmVNEx{xi_1|Cbqj>=FxQc{g`xj6fIfy`D8fA z##!-H_e6o0>6Su&$H2kQTujtbtyNFeKc}2=|4IfLTnye#@$Au7Kv4)dnA;-fz@D_8 z)>irG$)dkBY~zX zC!ZXLy*L3xr6cb70QqfN#Q>lFIc<>}>la4@3%7#>a1$PU&O^&VszpxLC%*!m-cO{B z-Y}rQr4$84(hvy#R69H{H zJ*O#uJh)TF6fbXy;fZkk%X=CjsTK}o5N1a`d7kgYYZLPxsHx%9*_XN8VWXEkVJZ%A z1A+5(B;0^{T4aPYr8%i@i32h)_)|q?9vws)r+=5u)1YNftF5mknwfd*%jXA2TeP}Z zQ!m?xJ3?9LpPM?_A3$hQ1QxNbR&}^m z!F999s?p^ak#C4NM_x2p9FoXWJ$>r?lJ)2bG)sX{gExgLA2s5RwHV!h6!C~d_H||J z>9{E{mEv{Z1z~65Vix@dqM4ZqiU|!)eWX$mwS5mLSufxbpBqqS!jShq1bmwCR6 z4uBri7ezMeS6ycaXPVu(i2up$L; zjpMtB`k~WaNrdgM_R=e#SN?Oa*u%nQy01?()h4A(jyfeNfx;5o+kX?maO4#1A^L}0 zYNyIh@QVXIFiS0*tE}2SWTrWNP3pH}1Vz1;E{@JbbgDFM-_Mky^7gH}LEhl~Ve5PexgbIyZ(IN%PqcaV@*_`ZFb=`EjspSz%5m2E34BVT)d=LGyHVz@-e%9Ova*{5@RD;7=Ebkc2GP%pIP^P7KzKapnh`UpH?@h z$RBpD*{b?vhohOKf-JG3?A|AX|2pQ?(>dwIbWhZ38GbTm4AImRNdv_&<99ySX;kJ| zo|5YgbHZC#HYgjBZrvGAT4NZYbp}qkVSa;C-LGsR26Co+i_HM&{awuO9l)Ml{G8zD zs$M8R`r+>PT#Rg!J(K6T4xHq7+tscU(}N$HY;Yz*cUObX7J7h0#u)S7b~t^Oj}TBF zuzsugnst;F#^1jm>22*AC$heublWtaQyM6RuaquFd8V#hJ60Z3j7@bAs&?dD#*>H0SJaDwp%U~27>zdtn+ z|8sZzklZy$%S|+^ie&P6++>zbrq&?+{Yy11Y>@_ce@vU4ZulS@6yziG6;iu3Iu`M= zf3rcWG<+3F`K|*(`0mE<$89F@jSq;j=W#E>(R}2drCB7D*0-|D;S;(;TwzIJkGs|q z2qH{m_zZ+el`b;Bv-#bQ>}*VPYC|7`rgBFf2oivXS^>v<&HHTypvd4|-zn|=h=TG{ z05TH2+{T%EnADO>3i|CB zCu60#qk`}GW{n4l-E$VrqgZGbI zbQW690KgZt4U3F^5@bdO1!xu~p@7Y~*_FfWg2CdvED5P5#w#V46LH`<&V0{t&Ml~4 zHNi7lIa+#i+^Z6EnxO7KJQw)wD)4~&S-Ki8)3=jpqxmx6c&zU&<&h%*c$I(5{1HZT zc9WE}ijcWJiVa^Q^xC|WX0habl89qycOyeViIbi(LFsEY_8a|+X^+%Qv+W4vzj>`y zpuRnjc-eHNkvXvI_f{=*FX=OKQzT?bck#2*qoKTHmDe>CDb&3AngA1O)1b}QJ1Tun z_<@yVEM>qG7664Pa@dzL@;DEh`#?yM+M|_fQS<7yv|i*pw)|Z8)9IR+QB7N3v3K(wv4OY*TXnH&X0nQB}?|h2XQeGL^q~N7N zDFa@x0E(UyN7k9g%IFq7Sf+EAfE#K%%#`)!90_)Dmy3Bll&e1vHQyPA87TaF(xbqMpDntVp?;8*$87STop$!EAnGhZ?>mqPJ(X zFsr336p3P{PpZCGn&^LP(JjnBbl_3P3Kcq+m}xVFMVr1zdCPJMDIV_ki#c=vvTwbU z*gKtfic&{<5ozL6Vfpx>o2Tts?3fkhWnJD&^$&+Mh5WGGyO7fG@6WDE`tEe(8<;+q z@Ld~g08XDzF8xtmpIj`#q^(Ty{Hq>t*v`pedHnuj(0%L(%sjkwp%s}wMd!a<*L~9T z9MM@s)Km~ogxlqEhIw5(lc46gCPsSosUFsgGDr8H{mj%OzJz{N#;bQ;KkV+ZWA1(9 zu0PXzyh+C<4OBYQ0v3z~Lr;=C@qmt8===Ov2lJ1=DeLfq*#jgT{YQCuwz?j{&3o_6 zsqp2Z_q-YWJg?C6=!Or|b@(zxTlg$ng2eUQzuC<+o)k<6^9ju_Z*#x+oioZ5T8Z_L zz9^A1h2eFS0O5muq8;LuDKwOv4A9pxmOjgb6L*i!-(0`Ie^d5Fsgspon%X|7 zC{RRXEmYn!5zP9XjG*{pLa)!2;PJB2<-tH@R7+E1cRo=Wz_5Ko8h8bB$QU%t9#vol zAoq?C$~~AsYC|AQQ)>>7BJ@{Cal)ZpqE=gjT+Juf!RD-;U0mbV1ED5PbvFD6M=qj1 zZ{QERT5@(&LQ~1X9xSf&@%r|3`S#ZCE=sWD`D4YQZ`MR`G&s>lN{y2+HqCfvgcw3E z-}Kp(dfGG?V|97kAHQX+OcKCZS`Q%}HD6u*e$~Ki&Vx53&FC!x94xJd4F2l^qQeFO z?&JdmgrdVjroKNJx64C!H&Vncr^w zzR#XI}Dn&o8jB~_YlVM^+#0W(G1LZH5K^|uYT@KSR z^Y5>^*Bc45E1({~EJB(t@4n9gb-eT#s@@7)J^^<_VV`Pm!h7av8XH6^5zO zOcQBhTGr;|MbRsgxCW69w{bl4EW#A~);L?d4*y#j8Ne=Z@fmJP0k4{_cQ~KA|Y#_#BuUiYx8y*za3_6Y}c=GSe7(2|KAfhdzud!Zq&}j)=o4 z7R|&&oX7~e@~HmyOOsCCwy`AR+deNjZ3bf6ijI_*tKP*_5JP3;0d;L_p(c>W1b%sG zJ*$wcO$ng^aW0E(5ldckV9unU7}OB7s?Wx(761?1^&8tA5y0_(ieV>(x-e@}1`lWC z-YH~G$D>#ud!SxK2_Iw{K%92=+{4yb-_XC>ji&j7)1ofp(OGa4jjF;Hd*`6YQL+Jf zffg+6CPc8F@EDPN{Kn96yip;?g@)qgkPo^nVKFqY?8!=h$G$V=<>%5J&iVjwR!7H0 z$@QL|_Q81I;Bnq8-5JyNRv$Y>`sWl{qhq>u+X|)@cMlsG!{*lu?*H`Tp|!uv z9oEPU1jUEj@ueBr}%Y)7Luyi)REaJV>eQ{+uy4uh0ep0){t;OU8D*RZ& zE-Z-&=BrWQLAD^A&qut&4{ZfhqK1ZQB0fACP)=zgx(0(o-`U62EzTkBkG@mXqbjXm z>w`HNeQM?Is&4xq@BB(K;wv5nI6EXas)XXAkUuf}5uSrZLYxRCQPefn-1^#OCd4aO zzF=dQ*CREEyWf@n6h7(uXLNgJIwGp#Xrsj6S<^bzQ7N0B0N{XlT;`=m9Olg<>KL}9 zlp>EKTx-h|%d1Ncqa=wnQEuE;sIO-f#%Bs?g4}&xS?$9MG?n$isHky0caj za8W+B^ERK#&h?(x)7LLpOqApV5F>sqB`sntV%SV>Q1;ax67qs+WcssfFeF3Xk=e4^ zjR2^(%K1oBq%0%Rf!y&WT;lu2Co(rHi|r1_uW)n{<7fGc-c=ft7Z0Q}r4W$o$@tQF#i?jDBwZ8h+=SC}3?anUp3mtRVv9l#H?-UD;HjTF zQ*>|}e=6gDrgI9p%c&4iMUkQa4zziS$bO&i#DI$Wu$7dz7-}XLk%!US^XUIFf2obO zFCTjVEtkvYSKWB;<0C;_B{HHs~ax_48^Cml*mjfBC5*7^HJZiLDir(3k&BerVIZF8zF;0q80eX8c zPN4tc+Dc5DqEAq$Y3B3R&XPZ=AQfFMXv#!RQnGecJONe0H;+!f^h5x0wS<+%;D}MpUbTNUBA}S2n&U59-_5HKr{L^jPsV8B^%NaH|tUr)mq=qCBv_- ziZ1xUp(ZzxUYTCF@C}To;u60?RIfTGS?#JnB8S8@j`TKPkAa)$My+6ziGaBcA@){d z91)%+v2_ba7gNecdj^8*I4#<11l!{XKl6s0zkXfJPxhP+@b+5ev{a>p*W-3*25c&} zmCf{g9mPWVQ$?Sp*4V|lT@~>RR)9iNdN^7KT@>*MU3&v^3e?=NTbG9!h6C|9zO097 zN{Qs6YwR-5$)~ z`b~qs`a1Dbx8P>%V=1XGjBptMf%P~sl1qbHVm1HYpY|-Z^Dar8^HqjIw}xaeRlsYa zJ_@Apy-??`gxPmb`m`0`z`#G7*_C}qiSZe~l2z65tE~IwMw$1|-u&t|z-8SxliH00 zlh1#kuqB56s+E&PWQ7Nz17?c}pN+A@-c^xLqh(j;mS|?>(Pf7(?qd z5q@jkc^nA&!K-}-1P=Ry0yyze0W!+h^iW}7jzC1{?|rEFFWbE^Yu7Y}t?jmP-D$f+ zmqFT7nTl0HL|4jwGm7w@a>9 zKD)V~+g~ysmei$OT5}%$&LK8?ib|8aY|>W3;P+0B;=oD=?1rg+PxKcP(d;OEzq1CKA&y#boc51P^ZJPPS)z5 zAZ)dd2$glGQXFj$`XBBJyl2y-aoBA8121JC9&~|_nY>nkmW>TLi%mWdn-^Jks-Jv| zSR*wij;A3Fcy8KsDjQ15?Z9oOj|Qw2;jgJiq>dxG(2I2RE- z$As!#zSFIskebqU2bnoM^N<4VWD2#>!;saPSsY8OaCCQqkCMdje$C?Sp%V}f2~tG5 z0whMYk6tcaABwu*x)ak@n4sMElGPX1_lmv@bgdI2jPdD|2-<~Jf`L`@>Lj7{<-uLQ zE3S_#3e10q-ra=vaDQ42QUY^@edh>tnTtpBiiDVUk5+Po@%RmuTntOlE29I4MeJI?;`7;{3e4Qst#i-RH6s;>e(Sc+ubF2_gwf5Qi%P!aa89fx6^{~A*&B4Q zKTF|Kx^NkiWx=RDhe<{PWXMQ;2)=SC=yZC&mh?T&CvFVz?5cW~ritRjG2?I0Av_cI z)=s!@MXpXbarYm>Kj0wOxl=eFMgSMc?62U#2gM^li@wKPK9^;;0_h7B>F>0>I3P`{ zr^ygPYp~WVm?Qbp6O3*O2)(`y)x>%ZXtztz zMAcwKDr=TCMY!S-MJ8|2MJCVNUBI0BkJV6?(!~W!_dC{TS=eh}t#X+2D>Kp&)ZN~q zvg!ogxUXu^y(P*;Q+y_rDoGeSCYxkaGPldDDx)k;ocJvvGO#1YKoQLHUf2h_pjm&1 zqh&!_KFH03FcJvSdfgUYMp=5EpigZ*8}7N_W%Ms^WSQ4hH`9>3061OEcxmf~TcYn5_oHtscWn zo5!ayj<_fZ)vHu3!A!7M;4y1QIr8YGy$P2qDD_4+T8^=^dB6uNsz|D>p~4pF3Nrb6 zcpRK*($<~JUqOya#M1=#IhOZ zG)W+rJS-x(6EoVz)P zsSo>JtnChdj9^);su%SkFG~_7JPM zEDz3gk2T7Y%x>1tWyia|op(ilEzvAujW?Xwlw>J6d7yEi8E zv30riR|a_MM%ZZX&n!qm0{2agq(s?x9E@=*tyT$nND+{Djpm7Rsy!+c$j+wqMwTOF zZL8BQ|I`<^bGW)5apO{lh(Asqen?_U`$_n0-Ob~Yd%^89oEe%9yGumQ_8Be+l2k+n zCxT%s?bMpv|AdWP7M1LQwLm|x+igA~;+iK-*+tClF&ueX_V}>=4gvZ01xpubQWXD_ zi?Un>&3=$fu)dgk-Z;0Ll}HK5_YM->l^Czrd0^cJ))(DwL2g3aZuza7ga9^|mT_70 z))}A}r1#-(9cxtn<9jGRwOB4hb9kK@YCgjfOM-90I$8@l=H^`K$cyhe2mTM|FY9vW znH~h)I<_aa#V1xmhk?Ng@$Jw-s%a!$BI4Us+Df+?J&gKAF-M`v}j`OWKP3>6`X`tEmhe#y*(Xm$_^Ybbs=%;L7h zp7q^C*qM}Krqsinq|WolR99>_!GL#Z71Hhz|IwQQv<>Ds09B?Je(lhI1(FInO8mc} zl$RyKCUmfku+Cd^8s0|t+e}5g7M{ZPJQH=UB3(~U&(w#Bz#@DTDHy>_UaS~AtN>4O zJ-I#U@R($fgupHebcpuEBX`SZ>kN!rW$#9>s{^3`86ZRQRtYTY)hiFm_9wU3c`SC8 z-5M%g)h}3Pt|wyj#F%}pGC@VL`9&>9P+_UbudCkS%y2w&*o})hBplrB*@Z?gel5q+ z%|*59(sR9GMk3xME}wd%&k?7~J)OL`rK#4d-haC7uaU8-L@?$K6(r<0e<;y83rK&` z3Q!1rD9WkcB8WBQ|WT|$u^lkr0UL4WH4EQTJyk@5gzHb18cOte4w zS`fLv8q;PvAZyY;*Go3Qw1~5#gP0D0ERla6M6#{; zr1l?bR}Nh+OC7)4bfAs(0ZD(axaw6j9v`^jh5>*Eo&$dAnt?c|Y*ckEORIiJXfGcM zEo`bmIq6rJm`XhkXR-^3d8^RTK2;nmVetHfUNugJG(4XLOu>HJA;0EWb~?&|0abr6 zxqVp@p=b3MN^|~?djPe!=eex(u!x>RYFAj|*T$cTi*Sd3Bme7Pri1tkK9N`KtRmXf zZYNBNtik97ct1R^vamQBfo9ZUR@k*LhIg8OR9d_{iv#t)LQV91^5}K5u{eyxwOFoU zHMVq$C>tfa@uNDW^_>EmO~WYQd(@!nKmAvSSIb&hPO|}g-3985t?|R&WZXvxS}Kt2i^eRe>WHb_;-K5cM4=@AN1>E&1c$k!w4O*oscx(f=<1K6l#8Exi)U(ZiZ zdr#YTP6?m1e1dOKysUjQ^>-MR={OuD00g6+(a^cvcmn#A_%Fh3Of%(qP5nvjS1=(> z|Ld8{u%(J}%2SY~+$4pjy{()5HN2MYUjg1X9umxOMFFPdM+IwOVEs4Z(olynvT%G) zt9|#VR}%O2@f6=+6uvbZv{3U)l;C{tuc zZ{K$rut=eS%3_~fQv^@$HV6#9)K9>|0qD$EV2$G^XUNBLM|5-ZmFF!KV)$4l^KVj@ zZ4fI}Knv*K%zPqK77}B-h_V{66VrmoZP2>@^euu8Rc}#qwRwt5uEBWcJJE5*5rT2t zA4Jpx`QQ~1Sh_n_a9x%Il!t1&B~J6p54zxAJx`REov${jeuL8h8x-z=?qwMAmPK5i z_*ES)BW(NZluu#Bmn1-NUKQip_X&_WzJy~J`WYxEJQ&Gu7DD< z&F9urE;}8S{x4{yB zaq~1Zrz%8)<`prSQv$eu5@1RY2WLu=waPTrn`WK%;G5(jt^FeM;gOdvXQjYhax~_> z{bS_`;t#$RYMu-;_Dd&o+LD<5Afg6v{NK?0d8dD5ohAN?QoocETBj?y{MB)jQ%UQ}#t3j&iL!qr@#6JEajR3@^k5wgLfI9S9dT2^f`2wd z%I#Q*@Ctk@w=(u)@QC}yBvUP&fFRR-uYKJ){Wp3&$s(o~W7OzgsUIPx0|ph2L1(r*_Pa@T@mcH^JxBjh09#fgo|W#gG7}|)k&uD1iZxb0 z@|Y)W79SKj9sS&EhmTD;uI#)FE6VwQ*YAr&foK$RI5H8_ripb$^=;U%gWbrrk4!5P zXDcyscEZoSH~n6VJu8$^6LE6)>+=o#Q-~*jmob^@191+Ot1w454e3)WMliLtY6~^w zW|n#R@~{5K#P+(w+XC%(+UcOrk|yzkEes=!qW%imu6>zjdb!B#`efaliKtN}_c!Jp zfyZa`n+Nx8;*AquvMT2;c8fnYszdDA*0(R`bsof1W<#O{v%O!1IO4WZe=>XBu_D%d zOwWDaEtX%@B>4V%f1+dKqcXT>m2!|&?}(GK8e&R=&w?V`*Vj)sCetWp9lr@@{xe6a zE)JL&;p}OnOO}Nw?vFyoccXT*z*?r}E8{uPtd;4<(hmX;d$rqJhEF}I+kD+m(ke;J z7Cm$W*CSdcD=RYEBhedg>tuT{PHqwCdDP*NkHv4rvQTXkzEn*Mb0oJz&+WfWIOS4@ zzpPJ|e%a-PIwOaOC7uQcHQ-q(SE(e@fj+7oC@34wzaBNaP;cw&gm{Z8yYX?V(lIv5 zKbg*zo1m5aGA4^lwJ|bAU=j3*d8S{vp!~fLFcK8s6%Ng55_qW_d*3R%e=34aDZPfD z&Le39j|ahp6E7B0*9OVdeMNrTErFatiE+=Z!XZ^tv0y%zZKXRTBuPyP&C{5(H?t)S zKV24_-TKpOmCPzU&by8R1Q5HY^@IDoeDA9MbgizgQ*F1Er~HVmvSU>vx}pZVQ&tr| zOtZl8vfY2#L<)gZ=ba&wG~EI*Vd?}lRMCf+!b5CDz$8~be-HKMo5omk$w7p4`Mym*IR8WiTz4^kKcUo^8Hkcsu14u z`Pkg`#-Y^A%CqJ0O@UF|caAulf68@(zhqp~YjzInh7qSN7Ov%Aj(Qz%{3zW|xubJ- ztNE_u_MO7Q_585r;xD?e=Er}@U1G@BKW5v$UM((eByhH2p!^g9W}99OD8VV@7d{#H zv)Eam+^K(5>-Ot~U!R$Um3prQmM)7DyK=iM%vy>BRX4#aH7*oCMmz07YB(EL!^%F7?CA#>zXqiYDhS;e?LYPTf(bte6B ztrfvDXYG*T;ExK-w?Knt{jNv)>KMk*sM^ngZ-WiUN;=0Ev^GIDMs=AyLg2V@3R z7ugNc45;4!RPxvzoT}3NCMeK$7j#q3r_xV(@t@OPRyoKBzHJ#IepkDsm$EJRxL)A* zf{_GQYttu^OXr$jHQn}zs$Eh|s|Z!r?Yi+bS-bi+PE*lH zo|6ztu6$r_?|B~S#m>imI!kQP9`6X426uHRri!wGcK;J;`%sFM(D#*Le~W*t2uH`Q z(HEO9-c_`mhA@4QhbW+tgtt9Pzx=_*3Kh~TB$SKmU4yx-Ay&)n%PZPKg#rD4H{%Ke zdMY@rf5EAFfqtrf?Vmk&N(_d-<=bvfOdPrYwY*;5%j@O6@O#Qj7LJTk-x3LN+dEKy+X z>~U8j3Ql`exr1jR>+S4nEy+4c2f{-Q!3_9)yY758tLGg7k^=nt<6h$YE$ltA+13S<}uOg#XHe6 zZHKdNsAnMQ_RIuB;mdoZ%RWpandzLR-BnjN2j@lkBbBd+?i ze*!5mC}!Qj(Q!rTu`KrRRqp22c=hF6<^v&iCDB`n7mHl;vdclcer%;{;=kA(PwdGG zdX#BWoC!leBC4);^J^tPkPbIe<)~nYb6R3u{HvC!NOQa?DC^Q`|_@ zcz;rk`a!4rSLAS>_=b@g?Yab4%=J3Cc7pRv8?_rHMl_aK*HSPU%0pG2Fyhef_biA!aW|-(( z*RIdG&Lmk(=(nk28Q1k1Oa$8Oa-phG%Mc6dT3>JIylcMMIc{&FsBYBD^n@#~>C?HG z*1&FpYVvXOU@~r2(BUa+KZv;tZ15#RewooEM0LFb>guQN;Z0EBFMFMZ=-m$a3;gVD z)2EBD4+*=6ZF?+)P`z@DOT;azK0Q4p4>NfwDR#Pd;no|{q_qB!zk1O8QojE;>zhPu z1Q=1z^0MYHo1*``H3ex|bW-Zy==5J4fE2;g6sq6YcXMYK5i|S^9(OSw#v!3^!EB<% zZF~J~CleS`V-peStyf*I%1^R88D;+8{{qN6-t!@gTARDg^w2`uSzFZbPQ!)q^oC}m zPo8VOQxq2BaIN`pAVFGu8!{p3}(+iZ`f4ck2ygVpEZMQW38nLpj3NQx+&sAkb8`}P3- zc>N*k6AG?r}bfO6_vccTuKX+*- z7W4Q#2``P0jIHYs)F>uG#AM#I6W2)!Nu2nD5{CRV_PmkDS2ditmbd#pggqEgAo%5oC?|CP zGa0CV)wA*ko!xC7pZYkqo{10CN_e00FX5SjWkI3?@XG}}bze!(&+k2$C-C`6temSk z_YyYpB^wh3woo`B zrMSTd4T?(X-jh`FeO76C(3xsOm9s2BP_b%ospg^!#*2*o9N;tf4(X9$qc_d(()yz5 zDk@1}u_Xd+86vy5RBs?LQCuYKCGPS;E4uFOi@V%1JTK&|eRf~lp$AV#;*#O}iRI2=i3rFL8{ zA^ptDZ0l6k-mq=hUJ0x$Y@J>UNfz~I5l63H(`~*v;qX`Z{zwsQQD-!wp0D&hyB8&Z z7$R07gIKGJ^%AvQ{4KM0edM39iFRx=P^6`!<1(s0t|JbB2tXs_B_IH9#ajH0C=-n+ z`nz`fKMBKLlf?2AC+|83M+0rqR%uhNGD;uKA6jOjp7YDe^4%0fRB<^bcjlS2KF~F; zu09wh1x0&4pG&76M;x8$u`b134t=dEPBn6PV|X29<#T4F1mxGF*HOgiWU8tN@cguI z_F@o+XL7FJztR63wC|j4x_DANzcX94r7Iz-O2x$({&qd*mdLG=-Rv)uZ}UlMR+F&q zU}=lkfb0p1>1Ho){o$@}mSKIV;h*$AND7~Dl)QzpFBlSM99Kx+F7GsVK5xcR? z_4Q(Z%cgk8ST}U;;=!LwyZVu^S$>B-Waeik%wzcKTIqeX=0FP(TGQ=nxi=dsS5BYF zl@?}NT!Y!Iyos^@v7XWXA{_bV~1lxz7gC?xuXxy0_?GaN!AhRRM5>)^t%&ODd;@HN5L{MD3 zc>i2keQZVm#?NrDwbfd}_<*5^U&w0zv~n-y8=GGN-!=_`FU^cM8oVCWRFxw?BM^YD zi=Vxz4q|jwPTg+?q7_XI)-S@gQkh>w0ZUB}a{^ z_i;`Y(~fvpI!vmW*A^|P7(6+@C4UeL2WATf{P1?H5rk`5{TL zcf!CgP6Mi{MvjZS)rfo7JLDZK7M7ANd$3`{j9baD*7{#Zu-33fOYUzjvtKzR2)_T1I1s7fe&z|=)QkX;=`zX8!Byw-veM#yr;|wjO^II>!B*B z0+w%;0(=*G3V@88t!}~zx)&do(uF=073Yeh*fEhZb3Vn>t!m(9p~Y_FdV3IgR)9eT z)~e9xpI%2deTWyHlXA(7srrfc_`7ACm!R>SoIgkuF8 z!wkOhrixFy9y@)GdxAntd!!7@=L_tFD2T5OdSUO)I%yj02le`qeQ=yKq$g^h)NG;# za(0J@#VBi^5YI|QI=rq{KlxwGabZJ0dKmfWDROkcM}lUN$@DV`K7fU?8CP2H23QPi zG?YF*=Vn=kTK*#Y_{AQN&oLju|0#E=fx%YVh>S{puu&K$b;BN*jIo@VYhqPiJPzzM>#kxoy0vW9i;ne2_BIG0zyRFp<3M(iY(%*M_>q0ulV2K}Tg zkG{EWKS{i%4DUuHi%DVKy%e+Q!~Uf`>>F6NgD{{I8~nO4!VgOvtFOc7(O)X`|7n*f zxBa4CJ-v9fUUH+`7sPVvpM_C*udZ@OTGTzx56QM5y~OlrZc&w9=)B?nmd@keRn+^= zvm~4sa5987LFDnU{(N|N zJAR8H@}p1fC+H(yTI4n#%~TbImMpuqYn9cQ<0QQ%=PzZItLkC*ef9WJUvfITKWh#D zc#__8`4am9%#NslIUw+<82#SR8AYG|woLfBg#!-&dqq}@P>|I0%lbdy0lSMmNe+}o zj0zZuFr6Wb?Y{Qy-S=|r`bdrDmhnmvkRnkdn`YCleU>Q$=je}LGhh>_QAj6aa_0Oc z%Swsmui;IRx7bN*=AAS@5yW&Y2hy;3&|HAiA8}!HT6!Z!RVn~MZg`RmI6&%#tBZDx zfD+y@Z~NWlk*4l13vmt3AK2wP!fQlnBbECL>?p)F?T)<`w&QN>cP_V>r7UTcsTaaP zTOb$f!P@zf$6>890NVKbIkG8rE?9!Y97sMSZjfF?A zYR8lp`LMoz~O?iaZN;gcX;LC-%Ia*R%A&SLx!YIf29?P+=XAAojK8!^OU*@?R&DK!#G_lsn!#;S375uZ&B0HH1|BO0R90$U>qs zSvHv>H~mAgNCcjo-e+;RjY6B9NCbQrZ|BHjTkehaU<9CSkdd>Vl*ifA2LNOP&R2Qdy3k3-TQ+ zbq=#vI43x`s=%~cGyN&y4Y!FxhwgDe@i6uv8^BLL&3z*SO=D0aLjih?gY4-9uWp5or)H+v~w6n5X#F-I52z=Z_p4JB(;M| zeaVFhuR2|3UD2MzVc~^nSoD2(dD#uL_1PdnIxeA{V5n`#3xf1Zx@4lw(DsQ&H$h zw#%3O<1173hjg2_nhKi!d1ej=h7y`hVjCNB6|HTnx>SWuCE-kgTnfT+YGX4_Lun({ zDv2`>d3vrS)tTf7ps_vvh!Cx^e1BFuWnEAh0(7fkNk|-3oU|iRWdsC6U)?Raft~HN z;^$U}vZK5O8|LV$>6X5T(uYkblv{zwPxnQBh(BQ5tA~J!vGiAMYP^_ki~pkIxDfOZ zUJDwq%O~WueeV6%uN<54&u*c&E4y431cklBNrb06zGOOy4XNT~JS-q(s6@)F@ovbe ze`fial(O4(-su%6@@1+V0MsdLLMyE8;)nou(7}czU(5ASaZYDT(kUZ0L(&g$nF^n9 z9-Pi`ZZLX&)^*M6As4_2Mmc9S7OT)F8KkL2NJ)KJcnCuWU=Wy402A&45#Q9Id~BBH z0cY*xlv!uXzKrXLH!xQu(OtJvEj|0-DmRj1vjFz{c*I4$Pe(+_V|^b~S!0xm{8lq= zZv)@NlcyL3Xdz+*|L137F7y6L-2VsrKw=q^S>F6i%<{Fr8zk06$Ay-(!L$fY@7mcng!2}L0t zgi|KxfB63Xtk_Q8#ZPipQ@!zgjdpEIbK_?q17Hoi4Eiyun$hrc>T(7pOLVLQE=lgGwA+A308p& z7@=09(|$>eLy5gLe{*|3b(M;1n;C^~v?o88jYib48eR4$QGsBFzd}3QuwO^_XE(=B zq+hMi0UFC|dB{LCwch7;zYT=NK})O%sgi0k#yV;My@24^B1+CuZmYOh0^b)5Ba_)) zC%i#_Iev&nsu%I|1N5=MVc#PrlunKAs&hY|3s5;@}`>sB>}gzxuB zB=2vrRyB3uiyW(hkDUNe1@&(b`;>ZvGgw|@s{zVC#_`HXIN_^J@Etb zA7A+F?ot37T{<-vTy8h&b3e+WKHE1oh;pUQrN4yRRrx?mT_9jRa2i4l1fUnLW^Cbl z!I1>VzyFe?VELWWhM?@?t-YPZkD-Qjo@bC2(o#ZtZmr{KZsdFWItV`rs$gp{724@C zL8K5}E0+DHcWcL^{BGei4>@J-3%a#$y6;I}=upc};-NDv-z#kPX26ylOpH)Ov1uU{ zkLj6oiH6l_s+B~_z;|Jc2oi?naS7#3H63~~lWj4rUnd=fCnKdkik<@R&kch9q##G{ z4u!%=rlM~Yp3jk*t8}1B`Sv6<%Z^}~1e@aq zg|JQ`QO2pSjAm-g*?IrNc$^~sIrNBo2$m|Sxanr?Mfs>2@Auu49 zGXlsS<9XS1&8h(dD*Hl&5HBDG!^pJ*lkau_Ur+7`7z;rcs$hT4we?3bT=7Fe<>{5( z2m2(c+hUz2BTHM8dCe*Z3XX&Av;b~a=$6EF>&^E8%nyxO@m_n!q&XD^A{SRjRZQ0L~qDeC=j&0$j6=LNIz@`ni^>ch|sv}^6 zlm>?28yPl@WmDPR?Y-A9X{U9Dv_IsbXJnzKCjkRksLOg#42uG2mE_acbTQ4)J|1V>%U@K(FP3AYhL0U zdeOCPN1qLv!|#c=p!_+%VNV(GHt`RuLRV^vz<5tt-r)yOK**kUWPspVAf|}ZL{LS= z@k(@@!P&W!>wwe`x{+GrFSWhHov7hu?{KuuT%kl#WO@*WX$i_@retlhQBj++SVNCx z5$78LxP>Z=^aJ)D280r_jj=zFfMJFXCIe^B{~V@d1rl_F(qo&AB4bC-vYL>x2jSKX zpuTG-6kgp3e^T&+dtV*i6a~)v@n?n*MffN59y}<0djUX zt27R+SE#hp8bzc#;rk$jw3r4)Q@eI$*`_)=Pvge8@8|8>H3X)<9YX6cXa=ii#Le;(qKm@%0-7$>2ShnYc`j#zJ7gu_FE^?uAkL|H)UIH#gPu^40!6^J=^ zr`}iwa^!4tzW~vOMZAaKF>*8A{^8m$i(VK)>?=#l`xrVe>wseSvM_aF zATNkY>kM_P3?1kE`uIq#mvr-wuTgUH0N<&JhF=(E9%^NS*HLm!4GZ4_XI zL=R5tlG5Mk_1rPfg)sk^llFuKPMPBhuU|L5q#yP_mzxp1o&pAzi-X31sgFpIHn@($ z_>=`AB5(8tP6p2zS5VEvH5J$M` z_much3>S7t3Yo`Yx!>83-hW9LYzDKP?mKdkD#QAK8*M((sx{eBQdrR<^3ZhFP81+& zBnJMUefQyNBji~$5d88Wfw1Lv59aJN9t2!pABLg;ewJ#LXL-10;QcJl+Y4Mtngb)k6JZlCf)3uD_u)J3sYyN;NN5hNbg$%W!i-GK%e&!Us)2IExWSss$YG(hm3kJ-h%yD z>8q^n$+4I(_y_mbT{du4P%h1j3oSpjhY97{+IZ`aA4ug!vNJ6*p?<2H(2w+GD3j$I z1TUXGyNzdf>_yB3grP~FZUs<2Quw;eEi*7s(-MiIkQ%@J^+WGdQvYSUN+TRiD-xto zJ=OUU+kxGYc!HCLNbCvR4lGTp~#L;DFzGd-#gJe*xf(P3hDQz|y)?b9mwU3WUVnpcqXM<@w%r-k*Wr^gzAv)8T^sqA=Ye z!7qy&exJmAcAt~CwS#@yNmjr8*T*!A6w4~E*ibaLRs0CFo(;R3=ODhDt6zWNodmo0 zXx&bT$6&+5c>a|WJ)F4G-^GjY0H#*tY=UNyYr_q5fsrcjk(c^~e*7Lf`!Jd`)p412 zn|^*hV= zFI4UbwA%X@smDd$cQOiMC%jfitTxTb+#`9`G=2rJDfK!E=5ra|So>lc{X1$~w28i+ z4p&cTGwZ#5VueiXS9O8#;RR$yg7tL9!^)Sz&pZYIzlSh}0}V{LxL$Cu%B4U5_}k}- zm~|CsD<076x@<>m=6w6N?WaThIBP`!u{-;WF)xc=2otx*lwf|5+MkdJePjh(B z9SH+%cHGCMAXNxB{_3^otDWdsV7Ob6n{0 z+&!(;iaHOX__5z_$Qk{%xYV%Ig@7iokGBwR`3642ZP#H#v9QGbWl8<|MS*=@qO@Uj z6+SZ_v9`1paUe5tFN~v(b#J3a_Lx0+;r9giZIx-A5TxdbG>xi#AZ5_z1V}B^n)sxT zz49}eK7EWb6wR!6-qQOrHQHkUvshvq%=G2d&@(#XM*Am1;WbnJ{X_!a{ZkphD$^TQ z=Iskb&}=lBm(RHiwJoGg`*NiQ6#RB$T#LF+>#ef;Jne&MxKPX!#r`&TVEFsp2jnNx>dClzpcPy&G&13a_<0qaR3i+k212~hoQ z8nMk{JP-t04I{GW5gUBqcJW-jSMrlw}>p)ptx?WKuCUV77taMiV zHok9V=6yv+Uts@fMY&A}amC=!Yj}eL@=e%XJ#%?agkt1jWF+10{(E9mHLDa>Ll7Vj zG=3cp%ljIB-6pC}6&`xJ*6WCP|IlglLWJ^?yviI8Ve)?V_i4%n;olzny62_`-|IGi z^=}p_O>Z8M;c4|RExu70E7ePW(HWVS&E$+LL6xSQgB`QfMQJ|4pCTFowA39p5P-|$ zUtM_H2HnP8_RoS~Vwk(FhbG zH41licj%=0a;Ln2STFBvU}Ne&O&%8bYKj!h1FA#sNM`232fX|U3QPp#3C?mN2;hE9 z;)!@5ixSPl<89^7gwhHc2YAX1KJK$#*3`KOMIQ253q7-*RJ5k)zp9GBO|Ga~X*^}US5oN@aG&waHV%vi~r{t^`ptTxb zL}q1W8S7*>7oWwvgV4uFLZ(@k`R*=LO_|Gu`prs~!WQXj-NLIa^2(7IHg>BG^N zc|i{-^=&Cek9dkJFQys|sjG9i>LLz|;yCv{^1i%c*h>8zF91kLvS9HBQi~ZU!JL`B zK8N+U0fr1*6??Ium)AF!6tc1eGhXIYL6IRT7rmKp7+>?%5Pa6zC5)KY$ycF0ZJ`G5nEQDG100U-jLkH8^UE4g6wq?sg%pP=-$&G#bcN`^?w3a6 z((s$6eRKcSEIslW-kk5Qi|5Mg-(xdLF}PxxVh$PuO}#aR6pW1kV4Af!Bqh*btXNNZ z>-4(IUl+L4dw+3LcpGut=qB45O+W)Q5?*zZ2A6rJcg`qkSvWA!j^r2mqKuCm6`Py? z@^T#Ux04HemPGd!Hs7NkZdVn1}8_j`o?)*OKZGS!`ff)gF zG?v-lj$wWNWCcw2Mg2o18D~1?3_b0XzdiKBNkYSDpcv@&kp0POmweJE2ZkIQ3B!a! zIgIoE+Xv?;34kyo^QYjZk+tEqZvq^#QG(OzX4~X+KtsoQoddTWUR(yo8R+ObEF1j<-syWOb>)JQ&Zbdu(sctU%Mt zW&YR0{ttY2TTXYZ?~WNU&cES1Z2q(7SrWDh``!J(JM+Nk$!hu&Y;(7E`ZNKTe0w+% zJc?Qnw2B+%UR}0;cB0Rufa(7-3FF}?629@LgTiEC&2uyL6NxexOp?AKT^aAx3gi(W zao>r>MPw0eQ3>IV02uLsC@>yK_epX6GRg4{NEL2wPPF9=*L2RV3yyK8DhuEK>rmmV z`&Q~#c`lgR&93TdOCja|ewOXmPNRh7!&dMT(1ett#iDr8HZW~VqWW@7fe9B6;7S+? zbC`d4@MEau&mKlOPKd>*10q0c{~^baw6!a*w^sY#0Xim{oOsiXiDOhbG&kl3c$$n1 zMRrD83&QucDSEcV*7LIp8VTA@F<%qe+_c`L;6on(>SjAU^}5c9!BCffT>$VQhe=)z z8(=Ej{5>jhmjB3{xDfj2R@VmHQ!CqjlO4KnuOmvHy3K#po$yp_V;p_MKjh1`(rzj6 zHW956k1yvntz{_g?Xbs`avK(IjlTnsu%htO;D7 z?J#x^EzuvVn&NA=!MEj7cwe5A-Z$Zk2LBZH$~%E* zf`((xH0?`}hs|HA%mtwfOEsZJxxrennkTYcwP#FKO5%Lpc^JXhSpV|ZH$Wr;`}`_( zIP==gd3LYyVtwD|*ZJGi{7~x8{=^bGVqu0RJ`n_BZH9+}kz%-4ZRsImi@rx%=ZEKs zcPnUXo6hbJV>fH;@1|bAHIe0ijYI*&kdT|HkDS$9No9 zCHo=*HWb~U+Dtzxr+Esao}6@|;Pf+E$ay0$kQp#s{wlw+7aIKbMdf`OqhoG*;Tco0 zjrP}VQG#Y2cJuqoJg&5({)S(BA}q9T1lGeWRyu=Je|)I!6a+aj!IP^1({)ZYe&x6w zt3a)Dq^TB+A7CdB0-}#z2Ur$W&h3YVw8==!xONy$uQmDWh-@15iEOt!q2m&?ZLA|w z8loSb(0}7y6Xu0?M5Uf4>VZGluB`wMf2oh;m)ghxVda>3m}4%V)r^0nVQ5V6f3>*) z0&VN!N0~GC^P}vj$`EDMZEmVV;N&RISY2C;$0;2(<{Lt&PKzqRByQdiEHGAbwtbS zPj`Da5%U6k1oEtVzI}QNw;!hT6F+~|@=c@$C4NtO@=xgP?|5MyZAyuCzcvq4rdAv@C06%gZ`9%I);R6UGiGJobfux+<0DLS&|MSG4UH z_~o{^^9>ixMg~mY!-@Fai{xaE4^;qy9iZN15Gbn5ZqHWf>Jc5Rv6(#n8`1NcCsdmG zab*dSXVPaE?)wCalD;$ivF%@nB#7D`@YG04p6ed9m}4iJW|pfVMLE<-c{=-8$e?cH zUdU#mCj4gb zZKA^b9p*9S(}8@tw~1RNPHr7tQr;P+-)D8|sq=*o)G%RGqt> zzP5yf`pVxb)I51D_G~Xp^GNK zVI6sAX)a9s)e{8N3?35YA6aQTXuyszK3ah~CemzA&CII#8F&F#KN41~8I^&_%}6MCNb{W87qAF`zj_Y^szhb> z3p3}KbOxotY|(lD=;)`fYE_*{S}x;f^SW#)SU&5X#o|-R|trpa|L5PS5aa0 zTHw8%SDSVtU4?vyrhnq+^@dgFS)|(y{~(4j%3UEiO-rBM9%`)8(dh33pMLiuurNY# z#10AsQ7%*0Cu_DSAU}P;X(JwA64~Q_^R%d_zSm^6Aux?Pn70PM>9EvLeOX z&w9c)pGmcL22;MO3C_B>=NC0RJpMp8?#ZUf=GWRvy z6RHq3B}=MGVg?9@iKFBpsvnkVh3{Vpp=`CcD=u~@ql{my|6?3ssi3mCOPnjI&E}VC zc@X+Yl>;;DNo0W0`0th!X{?luDhOC{E8N=?!w}K1{V=)+1={m(f`Oc|N=07>}3;z{-(A zm{JL=j?Sro5iecmE2-pWlRf(r%|HEQ7kgwQ9+kt=NBhtQI7OwcZ#3%$Uf%^r2nhjY zoQ08MfC%_X{O9~WcirMZMhn#z^ux4Erx-tf-6bHD)9eH&^L>^jvAd^9A^DCDs?0;k zkm7LE*KjP6`2d17MrQaaLqd_Rka}J$csvUec#hw78<=s(hyR>065~YCVCA9+#Q+; za(*L0IEw!r5P|@-;x33L$Lv9 zcuN8YG&g{<(SeJG18~(b!5yywSqQiLAX0;---;}mF5&b4lg|T?LwKREa{9YX_-zL@ZE?Zqi@HxK^2KO1>0LATu{te=T zprmHtY)bDVfxI1S}KBE7V zznP7KQ8HekWU#W6mw`dr-boV}pMQR==&5=Q5T=_q091jfc;R*jX#&=MQ%~@E@9^?`$v48ks<>(fI(F6L(5ppKy|$HWng*bKOb(4|cMUB&z$#ob#XV z5-mg)gmFIybZf=znm3ZPyUO^GJfxt0kmHjaTZ|sthsxXw&}Y)fOUSg=JhRSR^UjZ- zhqqb}Wsyw4zdnj6@#BAJa#-PdI4_dgafFXh85DsEQ_cT+5)XpZq$fZlBA_9UsE9r6 zEFec5?uqN@QhJ^IzwZrwl-5J`CmVPv{(YDTqEqWR^dI;5hXc~cxP%B3v&~s0`Ct89 z@S`i~a^c%V^N81dDT*ItFS*&IN;@O$EgzX0e7x&}TD=!zS}hTpezBLS>mdX(5< z)8DEI(-o_D)c-UX@dA1MuJ*yc>Hf4|`*B2S_O>w*-tbUwtiu`;W(Ud{HTty@(&x(T(F&;M zJ=?H>6`B7nf-90e8V`WSVp|0oEKB-P2M{}4ZDawzvM&a!y>`Y#jCsD%T_l``@ah(I2nJs~Q|%uSKu@k!m~*8B*IoA{*TgtF<(5sHCGG;n@NE%~Xt(G$^&<87u;}Na zx-8cq0g`uA(&RBFo=-4Y1GUZ<``Zw{xL4jfHkZw~%~wvtGueszcXt)_QwH8g!; z%s&3kSa~R$dO$-%L-)c@_hi7&>{6L_M>OZFkUQu;{sL_bUMStNrt{{&O(Wn~*zPOk zB>dnfszb29NSTf2pqIs68k|p-UrSrxgLHqi?3N-UFa!LHy9n1)=s>`yS+J{MEzS@ zNlfGtpma7kG&LR3JE@wB%rFA*h~~KitlO=IP)ZjN6dQLM6qsry zHkB#cyNh#n`)}bCrN1My*;k)^@>e4gJ`LJK?2)Pwp?4Tl4)4FA0(tvY+#1jOUM)xw zlMz4x-f@g^+yKUN`?Vu)|AwujArnM~Pa@y*Q9S8eS(u{-S%(Z5=R~pRl5ZGDjdqH% zC8rW&{##wOpU_oTIG4WXMk4&%2t1;lWcW5&!yxmOT*!hBcKyTqEcNoO+R2;Q?Yj+W z1-Y4?59fijz4(MIDwGe4-baYf08UCs;r|YefD-Md2ST;=cxwpgW=tR76-dQVAhn^= zG9Wk5lQk%jIR@KNU!UMp6@BfU;r+;y4VQ)D2!Il9HX%yW-9nOzV+m$YKzVaO`B8S7t z$!S2Mz`xw>V(RjE`0>bQp<0y&h~Y=M#jpy!#=dE>`=e_AjSZq6u!Dy1xJf~-7|0F! zPR9|n`e_7D2DIV2H(CESQ}hA>U>n|6`%z?YKEA~)BOVY%y=jPV zT=44R!L?J)736X#csn|lfBJ)o8ixaZclguWgrGO<`TN2FMfO}7;5}d+BlK0yTSH3* z4!=;5rOh85&2|x=46hkNaz?)U8&=bcfh=N_#8BNpZ2v$aVBo;sk^*X`v;4-LU;D>! zM*h12MxXIQy)SfAqE4;jY)wgnppazZkdNNVVF;(PLf^qK$FgY9+VFyBKE7UC|f z`R|?&egV11K3s$rJ6!GvoeW=jV*!-e(wA;x(2=d0E_e_%0x--0o8#~m^H1%AH5Z^B zn!TNPn927*bvaf0pt}zhK0o^V@WlGwwKo(*nQ|Q~4_;>~-8y20`HP>@UJa)3nEnGG z5Hwhs|FcmFG16ZVNb5hL`2Gc1{zWIMM{_OiKewV!hCi}U!VuE?s9wU-QbZ!)+Y^tS zGzp5OSi5iq6hmEr$w}&9DFgoB+i*`q`8TBi^MVS{SKEb8Aw%@K7@XCo(De2A`6%mf&a2#~y1N)+kJLD$1HCP!22)(U}xo2|j?WRzt(11j8Z_*v;P$R+Ug*Gy3VxV4K; zGGUGabnW*`Z}~`ydXL-l9e=GC$pY#z|63vy>E*m=$=j}iWP{sRTh0%H54`t>2xYH% zsk+M&u&pNgMCM@3e)Xc?jBWX-TIR_cQ1Z!RW7!B zBjZX=+^3}?SE)B+$EP+0oi1Fp5blDT?*}nsP>filqXH{ms zxU<$hetC`u)Wi+x|EKL-`y^#aQX+sDYIa{M;V%LqLrOk~lR>u0Q!+pyQSU4zY`?E^ z|5@)C)w6G_=i5YYC5SE_u(7hDNYr}uKT|@DSqF%S++lTIbIk^$a>{~0IH8KNFEy%+ zW#$&!ynpgNJh>6uR~?2c)ZMW+h0OKu231(7L_vETPaR+(P)Zy%0~yGm>E9?@@x!Jy z3PYgS}Q@b}x}E#F27@F+j}0=&Ql4gES&f8acMrPAVlVs9$97`FR))R5wI zc&}KFI1UIewh>3PkhnB7u zS3AT8_*|nexznG|Z*DU0c!K@jsI4J)5#DyNi#|e#`l1Vv1`1)*NVcy0LZ``aL0n8B zecupJ(rhq3u8bW0NIRhKYq$v1li+jp*4hfAd&wxYDE8vn1TQ7S@bTM|I2Ob z8vMOIxA7&_j{AKmD+O@EyXT`|dElt0pED^@IV0m)RPBUs*5jW60>>w1!@_G3aBKzG z_f(KfAPBk}-jQtR*Sroq!*3rbQ_m27e+YdzQjUb<_*k8vc_C)y!@cj5E>NxUhPu&g z@Z2<~esU`)ih+4opWe+K7sbN9n*9@n>#@n3*o z?xoROgDuvhq>jJ;Ve{6i<3roQNfgo5^4Q4(|GNExO2Dr7GjgA2zWuKp_K)K0R(6lv z!l$!zW-+T6mb3gQaAFviTQi{|*t%>{(mhTdy+y;Re4qT@kccy#{b z&zWy~kLO@>*WPj2k#H)|7L&gAJ37DmHQAme#@m;(Y8Nu^`D5vf8sZFW#+lA2!HK=( zJ)#hO6JD*`o~&c*&46d}g=Qj@SsoB5ikC z^1V8E+&<-OzuS_C`p5<<(A6fB`LXT(!kV^0_~hL6PpW4={l%|#xgdh?5EIk~lu8{D z2hiyhv3Yxij_#$Wu>P@7SYsl`-~3;}Ktx{34_NL^Kwin&=?!HDv3elQDbcU*qyYpN z(#yw~f1vFGK-t%CC-qa-4FYHbA^h>bag-I&*qaxwn?Qv|idE$<>1H|Gr6JtUu(he2$eg!N z@HTF@dG1)*y;4fxe)4_ZkpaBHH9hXp9p4|gLrRQyuevRd@gSS}JhRnWqrvm|U@>qM z=yl7RQROTKwQtzP3!zUF)_6Ld#NGA6v~2{J9Dd`h6{%+XsU#qGLh%`fB1Hc?wfayK zN`H4BpDp)npVQuu$DVW1qsBS&AJ2eP%6Qw>;k{)Z$8%HL=Q4(a$Ng2_vHw&vA!1L+9zc8vaX2GtqJ{L-;gvF0IR$em zMQ8@{Qp3+3Quk)TJ$?I<8KmwzD*7#(q<@Mc`dchngW}cRG14(Z6K7{T|LhFXwhqUQ;BET;cYqPcAcMgt6M$V9$(?jHo@Sud$an$U&5F zZ1QNh^ztt)E*d#Ij;<43oSKKnd+WNr$_r}+s_O_x6DZSB10*5Q{ourqq>mTl| zx4y^(cy+9;t@R=*j>3_dmm_m)$k$#937V(sllby&5)Xex^UD-|m|q<(jEd#@DV(of zAd7sSdmS*zUDqJ9|K%O2J2OfdUiK{{b{PCy)pi<;hp~7v1CQj&4-10 zgO<3dqhYH1#-Fa}Q{pjql5>>P6gZH21zLfxZ4$SK4T@7b!|`nWF9b*84Bq8&Eht;9 z*P72x&NUCZ7*@B$`FtE=hz5b}S`|c6Ey+j@D1ZibjJaRlR;{cxAWv z?Nqa>QqV*H-*zzaPvpLMHt~nl(x6?vrPpR?zn7~wow?oj*1TKmx4j71>$hvtC$DLD zUrz0^tiP0792U&dxJxNv@r}Elsjn^aSLUu=9#mD{&9n8|ayIL$!H3s>%KEvbchBFW z%cd?VU83mGF#Dar9*s~w&AnmQRQIOvR+uWsuZ?+|a=TzApXO@q^(r%8=}iv#wCnFq z=K9}JbqU@k99Q%j-}NNk+qLCP)jXfmOO|)@?mHcnynd6({mJisP1_}u7k)|eYHXWK z63eQ)E$ufFi!3CWUY2gw%e>omCv}qEX66aH-k&35f9`Q@Us|NPetVqe8=dX*VxJdn ze`q7b=Dn(UA(2sf&g)cOmQFhNJ#<-aMELJZbA#@to>25@kbW<)&!X01 z%NMJt>1ST)tyX)h@?`DxhbgCHr>S4wv}WC&Nw-!{+Z7$2D}74QAcXTvip=M0%Tp_N zor=k`)t|ra^ySr-+(|R9mB(E=`MX#y(wSw)$!iymzB;^c*>%&^*7HxTnRga=soSZT zdDl+9s;r!v8hk6POtzBaig4pRp7eWF(<8gufvNHPu6xs-=e{;mnHzJyGKE+8L0j}; z@%8-e^UCL5HhMiR>sD3Rve&yVZ#{Q1*CO8c+qSr^Z#CN;)(X5>tGG5yUw3<+CfhaL z%bP;hZ?jvgJU67BWyiy74_)6r)_nSxttxn0`0?HE^5(uydHVgP+HE$V?Lv)Leti43 zWA|;f-RqX``95>)^P-fw!Vi{3KNsII-*5f){gdxqd%gVdB1sOBNe=nEW%;i~g_P8J w!5uhoe-Jcg1nPN%MiEAtgE$;km@@t6ukO)1^!cY^83Pb_y85}Sb4q9e0FIsP9{>OV literal 0 HcmV?d00001 diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png new file mode 100644 index 0000000000000000000000000000000000000000..2f1632cfddf3d9dade342351e627a0a75609fb46 GIT binary patch literal 2218 zcmV;b2vzrqP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91K%fHv1ONa40RR91KmY&$07g+lumAuE6iGxuRCodHTWf3-RTMruyW6Fu zQYeUM04eX6D5c0FCjKKPrco1(K`<0SL=crI{PC3-^hZU0kQie$gh-5!7z6SH6Q0J% zqot*`H1q{R5fHFYS}dje@;kG=v$L0(yY0?wY2%*c?A&{2?!D*x?m71{of2gv!$5|C z3>qG_BW}7K_yUcT3A5C6QD<+{aq?x;MAUyAiJn#Jv8_zZtQ{P zTRzbL3U9!qVuZzS$xKU10KiW~Bgdcv1-!uAhQxf3a7q+dU6lj?yoO4Lq4TUN4}h{N z*fIM=SS8|C2$(T>w$`t@3Tka!(r!7W`x z-isCVgQD^mG-MJ;XtJuK3V{Vy72GQ83KRWsHU?e*wrhKk=ApIYeDqLi;JI1e zuvv}5^Dc=k7F7?nm3nIw$NVmU-+R>> zyqOR$-2SDpJ}Pt;^RkJytDVXNTsu|mI1`~G7yw`EJR?VkGfNdqK9^^8P`JdtTV&tX4CNcV4 z&N06nZa??Fw1AgQOUSE2AmPE@WO(Fvo`%m`cDgiv(fAeRA%3AGXUbsGw{7Q`cY;1BI#ac3iN$$Hw z0LT0;xc%=q)me?Y*$xI@GRAw?+}>=9D+KTk??-HJ4=A>`V&vKFS75@MKdSF1JTq{S zc1!^8?YA|t+uKigaq!sT;Z!&0F2=k7F0PIU;F$leJLaw2UI6FL^w}OG&!;+b%ya1c z1n+6-inU<0VM-Y_s5iTElq)ThyF?StVcebpGI znw#+zLx2@ah{$_2jn+@}(zJZ{+}_N9BM;z)0yr|gF-4=Iyu@hI*Lk=-A8f#bAzc9f z`Kd6K--x@t04swJVC3JK1cHY-Hq+=|PN-VO;?^_C#;coU6TDP7Bt`;{JTG;!+jj(` zw5cLQ-(Cz-Tlb`A^w7|R56Ce;Wmr0)$KWOUZ6ai0PhzPeHwdl0H(etP zUV`va_i0s-4#DkNM8lUlqI7>YQLf)(lz9Q3Uw`)nc(z3{m5ZE77Ul$V%m)E}3&8L0 z-XaU|eB~Is08eORPk;=<>!1w)Kf}FOVS2l&9~A+@R#koFJ$Czd%Y(ENTV&A~U(IPI z;UY+gf+&6ioZ=roly<0Yst8ck>(M=S?B-ys3mLdM&)ex!hbt+ol|T6CTS+Sc0jv(& z7ijdvFwBq;0a{%3GGwkDKTeG`b+lyj0jjS1OMkYnepCdoosNY`*zmBIo*981BU%%U z@~$z0V`OVtIbEx5pa|Tct|Lg#ZQf5OYMUMRD>Wdxm5SAqV2}3!ceE-M2 z@O~lQ0OiKQp}o9I;?uxCgYVV?FH|?Riri*U$Zi_`V2eiA>l zdSm6;SEm6#T+SpcE8Ro_f2AwxzI z44hfe^WE3!h@W3RDyA_H440cpmYkv*)6m1XazTqw%=E5Xv7^@^^T7Q2wxr+Z2kVYr + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/macos/Runner/Configs/AppInfo.xcconfig b/macos/Runner/Configs/AppInfo.xcconfig new file mode 100644 index 00000000..8d4afce6 --- /dev/null +++ b/macos/Runner/Configs/AppInfo.xcconfig @@ -0,0 +1,14 @@ +// Application-level settings for the Runner target. +// +// This may be replaced with something auto-generated from metadata (e.g., pubspec.yaml) in the +// future. If not, the values below would default to using the project name when this becomes a +// 'flutter create' template. + +// The application's name. By default this is also the title of the Flutter window. +PRODUCT_NAME = meshcore_open + +// The application's bundle identifier +PRODUCT_BUNDLE_IDENTIFIER = com.meshcore.meshcoreOpen + +// The copyright displayed in application information +PRODUCT_COPYRIGHT = Copyright © 2025 com.meshcore. All rights reserved. diff --git a/macos/Runner/Configs/Debug.xcconfig b/macos/Runner/Configs/Debug.xcconfig new file mode 100644 index 00000000..36b0fd94 --- /dev/null +++ b/macos/Runner/Configs/Debug.xcconfig @@ -0,0 +1,2 @@ +#include "../../Flutter/Flutter-Debug.xcconfig" +#include "Warnings.xcconfig" diff --git a/macos/Runner/Configs/Release.xcconfig b/macos/Runner/Configs/Release.xcconfig new file mode 100644 index 00000000..dff4f495 --- /dev/null +++ b/macos/Runner/Configs/Release.xcconfig @@ -0,0 +1,2 @@ +#include "../../Flutter/Flutter-Release.xcconfig" +#include "Warnings.xcconfig" diff --git a/macos/Runner/Configs/Warnings.xcconfig b/macos/Runner/Configs/Warnings.xcconfig new file mode 100644 index 00000000..42bcbf47 --- /dev/null +++ b/macos/Runner/Configs/Warnings.xcconfig @@ -0,0 +1,13 @@ +WARNING_CFLAGS = -Wall -Wconditional-uninitialized -Wnullable-to-nonnull-conversion -Wmissing-method-return-type -Woverlength-strings +GCC_WARN_UNDECLARED_SELECTOR = YES +CLANG_UNDEFINED_BEHAVIOR_SANITIZER_NULLABILITY = YES +CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE +CLANG_WARN__DUPLICATE_METHOD_MATCH = YES +CLANG_WARN_PRAGMA_PACK = YES +CLANG_WARN_STRICT_PROTOTYPES = YES +CLANG_WARN_COMMA = YES +GCC_WARN_STRICT_SELECTOR_MATCH = YES +CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES +CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES +GCC_WARN_SHADOW = YES +CLANG_WARN_UNREACHABLE_CODE = YES diff --git a/macos/Runner/DebugProfile.entitlements b/macos/Runner/DebugProfile.entitlements new file mode 100644 index 00000000..dddb8a30 --- /dev/null +++ b/macos/Runner/DebugProfile.entitlements @@ -0,0 +1,12 @@ + + + + + com.apple.security.app-sandbox + + com.apple.security.cs.allow-jit + + com.apple.security.network.server + + + diff --git a/macos/Runner/Info.plist b/macos/Runner/Info.plist new file mode 100644 index 00000000..4789daa6 --- /dev/null +++ b/macos/Runner/Info.plist @@ -0,0 +1,32 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIconFile + + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSMinimumSystemVersion + $(MACOSX_DEPLOYMENT_TARGET) + NSHumanReadableCopyright + $(PRODUCT_COPYRIGHT) + NSMainNibFile + MainMenu + NSPrincipalClass + NSApplication + + diff --git a/macos/Runner/MainFlutterWindow.swift b/macos/Runner/MainFlutterWindow.swift new file mode 100644 index 00000000..3cc05eb2 --- /dev/null +++ b/macos/Runner/MainFlutterWindow.swift @@ -0,0 +1,15 @@ +import Cocoa +import FlutterMacOS + +class MainFlutterWindow: NSWindow { + override func awakeFromNib() { + let flutterViewController = FlutterViewController() + let windowFrame = self.frame + self.contentViewController = flutterViewController + self.setFrame(windowFrame, display: true) + + RegisterGeneratedPlugins(registry: flutterViewController) + + super.awakeFromNib() + } +} diff --git a/macos/Runner/Release.entitlements b/macos/Runner/Release.entitlements new file mode 100644 index 00000000..852fa1a4 --- /dev/null +++ b/macos/Runner/Release.entitlements @@ -0,0 +1,8 @@ + + + + + com.apple.security.app-sandbox + + + diff --git a/macos/RunnerTests/RunnerTests.swift b/macos/RunnerTests/RunnerTests.swift new file mode 100644 index 00000000..61f3bd1f --- /dev/null +++ b/macos/RunnerTests/RunnerTests.swift @@ -0,0 +1,12 @@ +import Cocoa +import FlutterMacOS +import XCTest + +class RunnerTests: XCTestCase { + + func testExample() { + // If you add code to the Runner application, consider adding tests here. + // See https://developer.apple.com/documentation/xctest for more information about using XCTest. + } + +} diff --git a/pubspec.lock b/pubspec.lock new file mode 100644 index 00000000..75819f3b --- /dev/null +++ b/pubspec.lock @@ -0,0 +1,658 @@ +# Generated by pub +# See https://dart.dev/tools/pub/glossary#lockfile +packages: + args: + dependency: transitive + description: + name: args + sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04 + url: "https://pub.dev" + source: hosted + version: "2.7.0" + async: + dependency: transitive + description: + name: async + sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" + url: "https://pub.dev" + source: hosted + version: "2.13.0" + bluez: + dependency: transitive + description: + name: bluez + sha256: "61a7204381925896a374301498f2f5399e59827c6498ae1e924aaa598751b545" + url: "https://pub.dev" + source: hosted + version: "0.8.3" + boolean_selector: + dependency: transitive + description: + name: boolean_selector + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" + url: "https://pub.dev" + source: hosted + version: "2.1.2" + characters: + dependency: transitive + description: + name: characters + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 + url: "https://pub.dev" + source: hosted + version: "1.4.0" + clock: + dependency: transitive + description: + name: clock + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b + url: "https://pub.dev" + source: hosted + version: "1.1.2" + collection: + dependency: transitive + description: + name: collection + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" + url: "https://pub.dev" + source: hosted + version: "1.19.1" + convert: + dependency: transitive + description: + name: convert + sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68 + url: "https://pub.dev" + source: hosted + version: "3.1.2" + crypto: + dependency: "direct main" + description: + name: crypto + sha256: c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf + url: "https://pub.dev" + source: hosted + version: "3.0.7" + cupertino_icons: + dependency: "direct main" + description: + name: cupertino_icons + sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6 + url: "https://pub.dev" + source: hosted + version: "1.0.8" + dart_earcut: + dependency: transitive + description: + name: dart_earcut + sha256: e485001bfc05dcbc437d7bfb666316182e3522d4c3f9668048e004d0eb2ce43b + url: "https://pub.dev" + source: hosted + version: "1.2.0" + dbus: + dependency: transitive + description: + name: dbus + sha256: "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c" + url: "https://pub.dev" + source: hosted + version: "0.7.11" + fake_async: + dependency: transitive + description: + name: fake_async + sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" + url: "https://pub.dev" + source: hosted + version: "1.3.3" + ffi: + dependency: transitive + description: + name: ffi + sha256: "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + file: + dependency: transitive + description: + name: file + sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 + url: "https://pub.dev" + source: hosted + version: "7.0.1" + fixnum: + dependency: transitive + description: + name: fixnum + sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be + url: "https://pub.dev" + source: hosted + version: "1.1.1" + flutter: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_blue_plus: + dependency: "direct main" + description: + name: flutter_blue_plus + sha256: "399b3dbc15562ef59749f04e43a99ccbb91540022380d5f269aff3c2787534e4" + url: "https://pub.dev" + source: hosted + version: "2.1.0" + flutter_blue_plus_android: + dependency: transitive + description: + name: flutter_blue_plus_android + sha256: "5010b0960cce533a8fa71401573f044362c3e2e111dc6eb4898c92e85f85f50c" + url: "https://pub.dev" + source: hosted + version: "8.1.0" + flutter_blue_plus_darwin: + dependency: transitive + description: + name: flutter_blue_plus_darwin + sha256: d160a8128e3a016fa58dd65ab6dac05cbc73e0fa799a1f24211d041641ed63ba + url: "https://pub.dev" + source: hosted + version: "8.1.0" + flutter_blue_plus_linux: + dependency: transitive + description: + name: flutter_blue_plus_linux + sha256: f5b02244d89465ba82c8c512686c66362fbb01f52fa03d645ed353ebf3883242 + url: "https://pub.dev" + source: hosted + version: "8.1.0" + flutter_blue_plus_platform_interface: + dependency: transitive + description: + name: flutter_blue_plus_platform_interface + sha256: "6e0fc04b77491dbfdbcd46c1a021b12f2f5fc5d6e01777f93a38a8431989b7f0" + url: "https://pub.dev" + source: hosted + version: "8.1.0" + flutter_blue_plus_web: + dependency: transitive + description: + name: flutter_blue_plus_web + sha256: "376aad9595ee389c7cd56e0c373e78abcaa790c821ece9cb81f0969ec94c5bca" + url: "https://pub.dev" + source: hosted + version: "8.1.0" + flutter_blue_plus_winrt: + dependency: transitive + description: + name: flutter_blue_plus_winrt + sha256: "5cfa5960ac8723771cbc59586588b100f38494390154b8a3268c95db37e21617" + url: "https://pub.dev" + source: hosted + version: "0.0.7" + flutter_lints: + dependency: "direct dev" + description: + name: flutter_lints + sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1" + url: "https://pub.dev" + source: hosted + version: "5.0.0" + flutter_local_notifications: + dependency: "direct main" + description: + name: flutter_local_notifications + sha256: ef41ae901e7529e52934feba19ed82827b11baa67336829564aeab3129460610 + url: "https://pub.dev" + source: hosted + version: "18.0.1" + flutter_local_notifications_linux: + dependency: transitive + description: + name: flutter_local_notifications_linux + sha256: "8f685642876742c941b29c32030f6f4f6dacd0e4eaecb3efbb187d6a3812ca01" + url: "https://pub.dev" + source: hosted + version: "5.0.0" + flutter_local_notifications_platform_interface: + dependency: transitive + description: + name: flutter_local_notifications_platform_interface + sha256: "6c5b83c86bf819cdb177a9247a3722067dd8cc6313827ce7c77a4b238a26fd52" + url: "https://pub.dev" + source: hosted + version: "8.0.0" + flutter_map: + dependency: "direct main" + description: + name: flutter_map + sha256: "2ecb34619a4be19df6f40c2f8dce1591675b4eff7a6857bd8f533706977385da" + url: "https://pub.dev" + source: hosted + version: "7.0.2" + flutter_test: + dependency: "direct dev" + description: flutter + source: sdk + version: "0.0.0" + flutter_web_plugins: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + http: + dependency: "direct main" + description: + name: http + sha256: "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412" + url: "https://pub.dev" + source: hosted + version: "1.6.0" + http_parser: + dependency: transitive + description: + name: http_parser + sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571" + url: "https://pub.dev" + source: hosted + version: "4.1.2" + intl: + dependency: transitive + description: + name: intl + sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5" + url: "https://pub.dev" + source: hosted + version: "0.20.2" + js: + dependency: transitive + description: + name: js + sha256: "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc" + url: "https://pub.dev" + source: hosted + version: "0.7.2" + latlong2: + dependency: "direct main" + description: + name: latlong2 + sha256: "98227922caf49e6056f91b6c56945ea1c7b166f28ffcd5fb8e72fc0b453cc8fe" + url: "https://pub.dev" + source: hosted + version: "0.9.1" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de" + url: "https://pub.dev" + source: hosted + version: "11.0.2" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1" + url: "https://pub.dev" + source: hosted + version: "3.0.10" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1" + url: "https://pub.dev" + source: hosted + version: "3.0.2" + lints: + dependency: transitive + description: + name: lints + sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7 + url: "https://pub.dev" + source: hosted + version: "5.1.1" + lists: + dependency: transitive + description: + name: lists + sha256: "4ca5c19ae4350de036a7e996cdd1ee39c93ac0a2b840f4915459b7d0a7d4ab27" + url: "https://pub.dev" + source: hosted + version: "1.0.1" + logger: + dependency: transitive + description: + name: logger + sha256: a7967e31b703831a893bbc3c3dd11db08126fe5f369b5c648a36f821979f5be3 + url: "https://pub.dev" + source: hosted + version: "2.6.2" + matcher: + dependency: transitive + description: + name: matcher + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 + url: "https://pub.dev" + source: hosted + version: "0.12.17" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec + url: "https://pub.dev" + source: hosted + version: "0.11.1" + meta: + dependency: transitive + description: + name: meta + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c + url: "https://pub.dev" + source: hosted + version: "1.16.0" + mgrs_dart: + dependency: transitive + description: + name: mgrs_dart + sha256: fb89ae62f05fa0bb90f70c31fc870bcbcfd516c843fb554452ab3396f78586f7 + url: "https://pub.dev" + source: hosted + version: "2.0.0" + nested: + dependency: transitive + description: + name: nested + sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20" + url: "https://pub.dev" + source: hosted + version: "1.0.0" + path: + dependency: transitive + description: + name: path + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" + url: "https://pub.dev" + source: hosted + version: "1.9.1" + path_provider_linux: + dependency: transitive + description: + name: path_provider_linux + sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279 + url: "https://pub.dev" + source: hosted + version: "2.2.1" + path_provider_platform_interface: + dependency: transitive + description: + name: path_provider_platform_interface + sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334" + url: "https://pub.dev" + source: hosted + version: "2.1.2" + path_provider_windows: + dependency: transitive + description: + name: path_provider_windows + sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7 + url: "https://pub.dev" + source: hosted + version: "2.3.0" + petitparser: + dependency: transitive + description: + name: petitparser + sha256: "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1" + url: "https://pub.dev" + source: hosted + version: "7.0.1" + platform: + dependency: transitive + description: + name: platform + sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984" + url: "https://pub.dev" + source: hosted + version: "3.1.6" + plugin_platform_interface: + dependency: transitive + description: + name: plugin_platform_interface + sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" + url: "https://pub.dev" + source: hosted + version: "2.1.8" + pointycastle: + dependency: "direct main" + description: + name: pointycastle + sha256: "4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe" + url: "https://pub.dev" + source: hosted + version: "3.9.1" + polylabel: + dependency: transitive + description: + name: polylabel + sha256: "41b9099afb2aa6c1730bdd8a0fab1400d287694ec7615dd8516935fa3144214b" + url: "https://pub.dev" + source: hosted + version: "1.0.1" + proj4dart: + dependency: transitive + description: + name: proj4dart + sha256: c8a659ac9b6864aa47c171e78d41bbe6f5e1d7bd790a5814249e6b68bc44324e + url: "https://pub.dev" + source: hosted + version: "2.1.0" + provider: + dependency: "direct main" + description: + name: provider + sha256: "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272" + url: "https://pub.dev" + source: hosted + version: "6.1.5+1" + rxdart: + dependency: transitive + description: + name: rxdart + sha256: "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962" + url: "https://pub.dev" + source: hosted + version: "0.28.0" + shared_preferences: + dependency: "direct main" + description: + name: shared_preferences + sha256: "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64" + url: "https://pub.dev" + source: hosted + version: "2.5.4" + shared_preferences_android: + dependency: transitive + description: + name: shared_preferences_android + sha256: "83af5c682796c0f7719c2bbf74792d113e40ae97981b8f266fa84574573556bc" + url: "https://pub.dev" + source: hosted + version: "2.4.18" + shared_preferences_foundation: + dependency: transitive + description: + name: shared_preferences_foundation + sha256: "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f" + url: "https://pub.dev" + source: hosted + version: "2.5.6" + shared_preferences_linux: + dependency: transitive + description: + name: shared_preferences_linux + sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f" + url: "https://pub.dev" + source: hosted + version: "2.4.1" + shared_preferences_platform_interface: + dependency: transitive + description: + name: shared_preferences_platform_interface + sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80" + url: "https://pub.dev" + source: hosted + version: "2.4.1" + shared_preferences_web: + dependency: transitive + description: + name: shared_preferences_web + sha256: c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019 + url: "https://pub.dev" + source: hosted + version: "2.4.3" + shared_preferences_windows: + dependency: transitive + description: + name: shared_preferences_windows + sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1" + url: "https://pub.dev" + source: hosted + version: "2.4.1" + sky_engine: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + source_span: + dependency: transitive + description: + name: source_span + sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" + url: "https://pub.dev" + source: hosted + version: "1.10.1" + stack_trace: + dependency: transitive + description: + name: stack_trace + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" + url: "https://pub.dev" + source: hosted + version: "1.12.1" + stream_channel: + dependency: transitive + description: + name: stream_channel + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + string_scanner: + dependency: transitive + description: + name: string_scanner + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" + url: "https://pub.dev" + source: hosted + version: "1.4.1" + term_glyph: + dependency: transitive + description: + name: term_glyph + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" + url: "https://pub.dev" + source: hosted + version: "1.2.2" + test_api: + dependency: transitive + description: + name: test_api + sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00" + url: "https://pub.dev" + source: hosted + version: "0.7.6" + timezone: + dependency: transitive + description: + name: timezone + sha256: dd14a3b83cfd7cb19e7888f1cbc20f258b8d71b54c06f79ac585f14093a287d1 + url: "https://pub.dev" + source: hosted + version: "0.10.1" + typed_data: + dependency: transitive + description: + name: typed_data + sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 + url: "https://pub.dev" + source: hosted + version: "1.4.0" + unicode: + dependency: transitive + description: + name: unicode + sha256: "0f69e46593d65245774d4f17125c6084d2c20b4e473a983f6e21b7d7762218f1" + url: "https://pub.dev" + source: hosted + version: "0.3.1" + uuid: + dependency: "direct main" + description: + name: uuid + sha256: a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8 + url: "https://pub.dev" + source: hosted + version: "4.5.2" + vector_math: + dependency: transitive + description: + name: vector_math + sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b + url: "https://pub.dev" + source: hosted + version: "2.2.0" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60" + url: "https://pub.dev" + source: hosted + version: "15.0.2" + web: + dependency: transitive + description: + name: web + sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a" + url: "https://pub.dev" + source: hosted + version: "1.1.1" + wkt_parser: + dependency: transitive + description: + name: wkt_parser + sha256: "8a555fc60de3116c00aad67891bcab20f81a958e4219cc106e3c037aa3937f13" + url: "https://pub.dev" + source: hosted + version: "2.0.0" + xdg_directories: + dependency: transitive + description: + name: xdg_directories + sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + xml: + dependency: transitive + description: + name: xml + sha256: "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025" + url: "https://pub.dev" + source: hosted + version: "6.6.1" +sdks: + dart: ">=3.9.2 <4.0.0" + flutter: ">=3.35.0" diff --git a/pubspec.yaml b/pubspec.yaml new file mode 100644 index 00000000..7868d7b8 --- /dev/null +++ b/pubspec.yaml @@ -0,0 +1,99 @@ +name: meshcore_open +description: "A new Flutter project." +# The following line prevents the package from being accidentally published to +# pub.dev using `flutter pub publish`. This is preferred for private packages. +publish_to: 'none' # Remove this line if you wish to publish to pub.dev + +# The following defines the version and build number for your application. +# A version number is three numbers separated by dots, like 1.2.43 +# followed by an optional build number separated by a +. +# Both the version and the builder number may be overridden in flutter +# build by specifying --build-name and --build-number, respectively. +# In Android, build-name is used as versionName while build-number used as versionCode. +# Read more about Android versioning at https://developer.android.com/studio/publish/versioning +# In iOS, build-name is used as CFBundleShortVersionString while build-number is used as CFBundleVersion. +# Read more about iOS versioning at +# 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: 1.0.0+1 + +environment: + sdk: ^3.9.2 + +# Dependencies specify other packages that your package needs in order to work. +# To automatically upgrade your package dependencies to the latest versions +# consider running `flutter pub upgrade --major-versions`. Alternatively, +# dependencies can be manually updated by changing the version numbers below to +# the latest version available on pub.dev. To see which dependencies have newer +# versions available, run `flutter pub outdated`. +dependencies: + flutter: + sdk: flutter + + # The following adds the Cupertino Icons font to your application. + # Use with the CupertinoIcons class for iOS style icons. + cupertino_icons: ^1.0.8 + flutter_blue_plus: ^2.1.0 + provider: ^6.1.5+1 + shared_preferences: ^2.2.2 + uuid: ^4.3.3 + flutter_map: ^7.0.2 + latlong2: ^0.9.1 + flutter_local_notifications: ^18.0.1 + crypto: ^3.0.3 + pointycastle: ^3.7.4 + http: ^1.2.0 + +dev_dependencies: + flutter_test: + sdk: flutter + + # The "flutter_lints" package below contains a set of recommended lints to + # encourage good coding practices. The lint set provided by the package is + # activated in the `analysis_options.yaml` file located at the root of your + # package. See that file for information about deactivating specific lint + # rules and activating additional ones. + flutter_lints: ^5.0.0 + +# For information on the generic Dart part of this file, see the +# following page: https://dart.dev/tools/pub/pubspec + +# The following section is specific to Flutter packages. +flutter: + + # The following line ensures that the Material Icons font is + # included with your application, so that you can use the icons in + # the material Icons class. + uses-material-design: true + + # To add assets to your application, add an assets section, like this: + # assets: + # - images/a_dot_burr.jpeg + # - images/a_dot_ham.jpeg + + # An image asset can refer to one or more resolution-specific "variants", see + # https://flutter.dev/to/resolution-aware-images + + # For details regarding adding assets from package dependencies, see + # https://flutter.dev/to/asset-from-package + + # To add custom fonts to your application, add a fonts section here, + # in this "flutter" section. Each entry in this list should have a + # "family" key with the font family name, and a "fonts" key with a + # list giving the asset and other descriptors for the font. For + # example: + # fonts: + # - family: Schyler + # fonts: + # - asset: fonts/Schyler-Regular.ttf + # - asset: fonts/Schyler-Italic.ttf + # style: italic + # - family: Trajan Pro + # fonts: + # - asset: fonts/TrajanPro.ttf + # - asset: fonts/TrajanPro_Bold.ttf + # weight: 700 + # + # For details regarding fonts from package dependencies, + # see https://flutter.dev/to/font-from-package diff --git a/test/widget_test.dart b/test/widget_test.dart new file mode 100644 index 00000000..ba020e63 --- /dev/null +++ b/test/widget_test.dart @@ -0,0 +1,12 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:meshcore_open/main.dart'; + +void main() { + testWidgets('App loads successfully', (WidgetTester tester) async { + // Build our app and trigger a frame. + await tester.pumpWidget(const MeshCoreApp()); + + // Verify that the app title appears + expect(find.text('MeshCore Open'), findsOneWidget); + }); +} diff --git a/web/favicon.png b/web/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..8aaa46ac1ae21512746f852a42ba87e4165dfdd1 GIT binary patch literal 917 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0X7 zltGxWVyS%@P(fs7NJL45ua8x7ey(0(N`6wRUPW#JP&EUCO@$SZnVVXYs8ErclUHn2 zVXFjIVFhG^g!Ppaz)DK8ZIvQ?0~DO|i&7O#^-S~(l1AfjnEK zjFOT9D}DX)@^Za$W4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7USFmqf|i<65o z3raHc^AtelCMM;Vme?vOfh>Xph&xL%(-1c06+^uR^q@XSM&D4+Kp$>4P^%3{)XKjo zGZknv$b36P8?Z_gF{nK@`XI}Z90TzwSQO}0J1!f2c(B=V`5aP@1P1a|PZ!4!3&Gl8 zTYqUsf!gYFyJnXpu0!n&N*SYAX-%d(5gVjrHJWqXQshj@!Zm{!01WsQrH~9=kTxW#6SvuapgMqt>$=j#%eyGrQzr zP{L-3gsMA^$I1&gsBAEL+vxi1*Igl=8#8`5?A-T5=z-sk46WA1IUT)AIZHx1rdUrf zVJrJn<74DDw`j)Ki#gt}mIT-Q`XRa2-jQXQoI%w`nb|XblvzK${ZzlV)m-XcwC(od z71_OEC5Bt9GEXosOXaPTYOia#R4ID2TiU~`zVMl08TV_C%DnU4^+HE>9(CE4D6?Fz oujB08i7adh9xk7*FX66dWH6F5TM;?E2b5PlUHx3vIVCg!0Dx9vYXATM literal 0 HcmV?d00001 diff --git a/web/icons/Icon-192.png b/web/icons/Icon-192.png new file mode 100644 index 0000000000000000000000000000000000000000..b749bfef07473333cf1dd31e9eed89862a5d52aa GIT binary patch literal 5292 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 literal 0 HcmV?d00001 diff --git a/web/icons/Icon-512.png b/web/icons/Icon-512.png new file mode 100644 index 0000000000000000000000000000000000000000..88cfd48dff1169879ba46840804b412fe02fefd6 GIT binary patch literal 8252 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 literal 0 HcmV?d00001 diff --git a/web/icons/Icon-maskable-192.png b/web/icons/Icon-maskable-192.png new file mode 100644 index 0000000000000000000000000000000000000000..eb9b4d76e525556d5d89141648c724331630325d GIT binary patch literal 5594 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 X>c!)3PgKfL&lX^$Z>Cpu&6)6jvi^Z! literal 0 HcmV?d00001 diff --git a/web/icons/Icon-maskable-512.png b/web/icons/Icon-maskable-512.png new file mode 100644 index 0000000000000000000000000000000000000000..d69c56691fbdb0b7efa65097c7cc1edac12a6d3e GIT binary patch literal 20998 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 MPgg&ebxsLQ025IeI{*Lx literal 0 HcmV?d00001 diff --git a/web/index.html b/web/index.html new file mode 100644 index 00000000..3087ec27 --- /dev/null +++ b/web/index.html @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + meshcore_open + + + + + + diff --git a/web/manifest.json b/web/manifest.json new file mode 100644 index 00000000..9b0c25f2 --- /dev/null +++ b/web/manifest.json @@ -0,0 +1,35 @@ +{ + "name": "meshcore_open", + "short_name": "meshcore_open", + "start_url": ".", + "display": "standalone", + "background_color": "#0175C2", + "theme_color": "#0175C2", + "description": "A new Flutter project.", + "orientation": "portrait-primary", + "prefer_related_applications": false, + "icons": [ + { + "src": "icons/Icon-192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "icons/Icon-512.png", + "sizes": "512x512", + "type": "image/png" + }, + { + "src": "icons/Icon-maskable-192.png", + "sizes": "192x192", + "type": "image/png", + "purpose": "maskable" + }, + { + "src": "icons/Icon-maskable-512.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "maskable" + } + ] +} diff --git a/windows/.gitignore b/windows/.gitignore new file mode 100644 index 00000000..d492d0d9 --- /dev/null +++ b/windows/.gitignore @@ -0,0 +1,17 @@ +flutter/ephemeral/ + +# Visual Studio user-specific files. +*.suo +*.user +*.userosscache +*.sln.docstates + +# Visual Studio build-related files. +x64/ +x86/ + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt new file mode 100644 index 00000000..daf32c2f --- /dev/null +++ b/windows/CMakeLists.txt @@ -0,0 +1,108 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.14) +project(meshcore_open LANGUAGES CXX) + +# The name of the executable created for the application. Change this to change +# the on-disk name of your application. +set(BINARY_NAME "meshcore_open") + +# Explicitly opt in to modern CMake behaviors to avoid warnings with recent +# versions of CMake. +cmake_policy(VERSION 3.14...3.25) + +# Define build configuration option. +get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) +if(IS_MULTICONFIG) + set(CMAKE_CONFIGURATION_TYPES "Debug;Profile;Release" + CACHE STRING "" FORCE) +else() + if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE "Debug" CACHE + STRING "Flutter build mode" FORCE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Profile" "Release") + endif() +endif() +# Define settings for the Profile build mode. +set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}") +set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}") +set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE}") +set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE}") + +# Use Unicode for all projects. +add_definitions(-DUNICODE -D_UNICODE) + +# Compilation settings that should be applied to most targets. +# +# Be cautious about adding new options here, as plugins use this function by +# default. In most cases, you should add new options to specific targets instead +# of modifying this function. +function(APPLY_STANDARD_SETTINGS TARGET) + target_compile_features(${TARGET} PUBLIC cxx_std_17) + target_compile_options(${TARGET} PRIVATE /W4 /WX /wd"4100") + target_compile_options(${TARGET} PRIVATE /EHsc) + target_compile_definitions(${TARGET} PRIVATE "_HAS_EXCEPTIONS=0") + target_compile_definitions(${TARGET} PRIVATE "$<$:_DEBUG>") +endfunction() + +# Flutter library and tool build rules. +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# Application build; see runner/CMakeLists.txt. +add_subdirectory("runner") + + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# Support files are copied into place next to the executable, so that it can +# run in place. This is done instead of making a separate bundle (as on Linux) +# so that building and running from within Visual Studio will work. +set(BUILD_BUNDLE_DIR "$") +# Make the "install" step default, as it's required to run. +set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1) +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +endif() + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}") + +install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +if(PLUGIN_BUNDLED_LIBRARIES) + install(FILES "${PLUGIN_BUNDLED_LIBRARIES}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() + +# Copy the native assets provided by the build.dart from all packages. +set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/windows/") +install(DIRECTORY "${NATIVE_ASSETS_DIR}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +# Fully re-copy the assets directory on each build to avoid having stale files +# from a previous install. +set(FLUTTER_ASSET_DIR_NAME "flutter_assets") +install(CODE " + file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") + " COMPONENT Runtime) +install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" + DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) + +# Install the AOT library on non-Debug builds only. +install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + CONFIGURATIONS Profile;Release + COMPONENT Runtime) diff --git a/windows/flutter/CMakeLists.txt b/windows/flutter/CMakeLists.txt new file mode 100644 index 00000000..903f4899 --- /dev/null +++ b/windows/flutter/CMakeLists.txt @@ -0,0 +1,109 @@ +# This file controls Flutter-level build steps. It should not be edited. +cmake_minimum_required(VERSION 3.14) + +set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") + +# Configuration provided via flutter tool. +include(${EPHEMERAL_DIR}/generated_config.cmake) + +# TODO: Move the rest of this into files in ephemeral. See +# https://github.com/flutter/flutter/issues/57146. +set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper") + +# Set fallback configurations for older versions of the flutter tool. +if (NOT DEFINED FLUTTER_TARGET_PLATFORM) + set(FLUTTER_TARGET_PLATFORM "windows-x64") +endif() + +# === Flutter Library === +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll") + +# Published to parent scope for install step. +set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) +set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) +set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) +set(AOT_LIBRARY "${PROJECT_DIR}/build/windows/app.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "flutter_export.h" + "flutter_windows.h" + "flutter_messenger.h" + "flutter_plugin_registrar.h" + "flutter_texture_registrar.h" +) +list(TRANSFORM FLUTTER_LIBRARY_HEADERS PREPEND "${EPHEMERAL_DIR}/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}.lib") +add_dependencies(flutter flutter_assemble) + +# === Wrapper === +list(APPEND CPP_WRAPPER_SOURCES_CORE + "core_implementations.cc" + "standard_codec.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_CORE PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_PLUGIN + "plugin_registrar.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_PLUGIN PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_APP + "flutter_engine.cc" + "flutter_view_controller.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_APP PREPEND "${WRAPPER_ROOT}/") + +# Wrapper sources needed for a plugin. +add_library(flutter_wrapper_plugin STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} +) +apply_standard_settings(flutter_wrapper_plugin) +set_target_properties(flutter_wrapper_plugin PROPERTIES + POSITION_INDEPENDENT_CODE ON) +set_target_properties(flutter_wrapper_plugin PROPERTIES + CXX_VISIBILITY_PRESET hidden) +target_link_libraries(flutter_wrapper_plugin PUBLIC flutter) +target_include_directories(flutter_wrapper_plugin PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_plugin flutter_assemble) + +# Wrapper sources needed for the runner. +add_library(flutter_wrapper_app STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_APP} +) +apply_standard_settings(flutter_wrapper_app) +target_link_libraries(flutter_wrapper_app PUBLIC flutter) +target_include_directories(flutter_wrapper_app PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_app flutter_assemble) + +# === Flutter tool backend === +# _phony_ is a non-existent file to force this command to run every time, +# since currently there's no way to get a full input/output list from the +# flutter tool. +set(PHONY_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/_phony_") +set_source_files_properties("${PHONY_OUTPUT}" PROPERTIES SYMBOLIC TRUE) +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} + ${PHONY_OUTPUT} + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat" + ${FLUTTER_TARGET_PLATFORM} $ + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} +) diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc new file mode 100644 index 00000000..c158b14b --- /dev/null +++ b/windows/flutter/generated_plugin_registrant.cc @@ -0,0 +1,14 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + +#include + +void RegisterPlugins(flutter::PluginRegistry* registry) { + FlutterBluePlusPluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("FlutterBluePlusPlugin")); +} diff --git a/windows/flutter/generated_plugin_registrant.h b/windows/flutter/generated_plugin_registrant.h new file mode 100644 index 00000000..dc139d85 --- /dev/null +++ b/windows/flutter/generated_plugin_registrant.h @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void RegisterPlugins(flutter::PluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake new file mode 100644 index 00000000..905321af --- /dev/null +++ b/windows/flutter/generated_plugins.cmake @@ -0,0 +1,24 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST + flutter_blue_plus_winrt +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/windows/runner/CMakeLists.txt b/windows/runner/CMakeLists.txt new file mode 100644 index 00000000..394917c0 --- /dev/null +++ b/windows/runner/CMakeLists.txt @@ -0,0 +1,40 @@ +cmake_minimum_required(VERSION 3.14) +project(runner LANGUAGES CXX) + +# Define the application target. To change its name, change BINARY_NAME in the +# top-level CMakeLists.txt, not the value here, or `flutter run` will no longer +# work. +# +# Any new source files that you add to the application should be added here. +add_executable(${BINARY_NAME} WIN32 + "flutter_window.cpp" + "main.cpp" + "utils.cpp" + "win32_window.cpp" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" + "Runner.rc" + "runner.exe.manifest" +) + +# Apply the standard set of build settings. This can be removed for applications +# that need different build settings. +apply_standard_settings(${BINARY_NAME}) + +# Add preprocessor definitions for the build version. +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}") + +# Disable Windows macros that collide with C++ standard library functions. +target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX") + +# Add dependency libraries and include directories. Add any application-specific +# dependencies here. +target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app) +target_link_libraries(${BINARY_NAME} PRIVATE "dwmapi.lib") +target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}") + +# Run the Flutter tool portions of the build. This must not be removed. +add_dependencies(${BINARY_NAME} flutter_assemble) diff --git a/windows/runner/Runner.rc b/windows/runner/Runner.rc new file mode 100644 index 00000000..3f1fc898 --- /dev/null +++ b/windows/runner/Runner.rc @@ -0,0 +1,121 @@ +// Microsoft Visual C++ generated resource script. +// +#pragma code_page(65001) +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "winres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (United States) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_APP_ICON ICON "resources\\app_icon.ico" + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD) +#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD +#else +#define VERSION_AS_NUMBER 1,0,0,0 +#endif + +#if defined(FLUTTER_VERSION) +#define VERSION_AS_STRING FLUTTER_VERSION +#else +#define VERSION_AS_STRING "1.0.0" +#endif + +VS_VERSION_INFO VERSIONINFO + FILEVERSION VERSION_AS_NUMBER + PRODUCTVERSION VERSION_AS_NUMBER + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904e4" + BEGIN + VALUE "CompanyName", "com.meshcore" "\0" + VALUE "FileDescription", "meshcore_open" "\0" + VALUE "FileVersion", VERSION_AS_STRING "\0" + VALUE "InternalName", "meshcore_open" "\0" + VALUE "LegalCopyright", "Copyright (C) 2025 com.meshcore. All rights reserved." "\0" + VALUE "OriginalFilename", "meshcore_open.exe" "\0" + VALUE "ProductName", "meshcore_open" "\0" + VALUE "ProductVersion", VERSION_AS_STRING "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END + +#endif // English (United States) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED diff --git a/windows/runner/flutter_window.cpp b/windows/runner/flutter_window.cpp new file mode 100644 index 00000000..955ee303 --- /dev/null +++ b/windows/runner/flutter_window.cpp @@ -0,0 +1,71 @@ +#include "flutter_window.h" + +#include + +#include "flutter/generated_plugin_registrant.h" + +FlutterWindow::FlutterWindow(const flutter::DartProject& project) + : project_(project) {} + +FlutterWindow::~FlutterWindow() {} + +bool FlutterWindow::OnCreate() { + if (!Win32Window::OnCreate()) { + return false; + } + + RECT frame = GetClientArea(); + + // The size here must match the window dimensions to avoid unnecessary surface + // creation / destruction in the startup path. + flutter_controller_ = std::make_unique( + frame.right - frame.left, frame.bottom - frame.top, project_); + // Ensure that basic setup of the controller was successful. + if (!flutter_controller_->engine() || !flutter_controller_->view()) { + return false; + } + RegisterPlugins(flutter_controller_->engine()); + SetChildContent(flutter_controller_->view()->GetNativeWindow()); + + flutter_controller_->engine()->SetNextFrameCallback([&]() { + this->Show(); + }); + + // Flutter can complete the first frame before the "show window" callback is + // registered. The following call ensures a frame is pending to ensure the + // window is shown. It is a no-op if the first frame hasn't completed yet. + flutter_controller_->ForceRedraw(); + + return true; +} + +void FlutterWindow::OnDestroy() { + if (flutter_controller_) { + flutter_controller_ = nullptr; + } + + Win32Window::OnDestroy(); +} + +LRESULT +FlutterWindow::MessageHandler(HWND hwnd, UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + // Give Flutter, including plugins, an opportunity to handle window messages. + if (flutter_controller_) { + std::optional result = + flutter_controller_->HandleTopLevelWindowProc(hwnd, message, wparam, + lparam); + if (result) { + return *result; + } + } + + switch (message) { + case WM_FONTCHANGE: + flutter_controller_->engine()->ReloadSystemFonts(); + break; + } + + return Win32Window::MessageHandler(hwnd, message, wparam, lparam); +} diff --git a/windows/runner/flutter_window.h b/windows/runner/flutter_window.h new file mode 100644 index 00000000..6da0652f --- /dev/null +++ b/windows/runner/flutter_window.h @@ -0,0 +1,33 @@ +#ifndef RUNNER_FLUTTER_WINDOW_H_ +#define RUNNER_FLUTTER_WINDOW_H_ + +#include +#include + +#include + +#include "win32_window.h" + +// A window that does nothing but host a Flutter view. +class FlutterWindow : public Win32Window { + public: + // Creates a new FlutterWindow hosting a Flutter view running |project|. + explicit FlutterWindow(const flutter::DartProject& project); + virtual ~FlutterWindow(); + + protected: + // Win32Window: + bool OnCreate() override; + void OnDestroy() override; + LRESULT MessageHandler(HWND window, UINT const message, WPARAM const wparam, + LPARAM const lparam) noexcept override; + + private: + // The project to run. + flutter::DartProject project_; + + // The Flutter instance hosted by this window. + std::unique_ptr flutter_controller_; +}; + +#endif // RUNNER_FLUTTER_WINDOW_H_ diff --git a/windows/runner/main.cpp b/windows/runner/main.cpp new file mode 100644 index 00000000..c66f3253 --- /dev/null +++ b/windows/runner/main.cpp @@ -0,0 +1,43 @@ +#include +#include +#include + +#include "flutter_window.h" +#include "utils.h" + +int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, + _In_ wchar_t *command_line, _In_ int show_command) { + // Attach to console when present (e.g., 'flutter run') or create a + // new console when running with a debugger. + if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) { + CreateAndAttachConsole(); + } + + // Initialize COM, so that it is available for use in the library and/or + // plugins. + ::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); + + flutter::DartProject project(L"data"); + + std::vector command_line_arguments = + GetCommandLineArguments(); + + project.set_dart_entrypoint_arguments(std::move(command_line_arguments)); + + FlutterWindow window(project); + Win32Window::Point origin(10, 10); + Win32Window::Size size(1280, 720); + if (!window.Create(L"meshcore_open", origin, size)) { + return EXIT_FAILURE; + } + window.SetQuitOnClose(true); + + ::MSG msg; + while (::GetMessage(&msg, nullptr, 0, 0)) { + ::TranslateMessage(&msg); + ::DispatchMessage(&msg); + } + + ::CoUninitialize(); + return EXIT_SUCCESS; +} diff --git a/windows/runner/resource.h b/windows/runner/resource.h new file mode 100644 index 00000000..66a65d1e --- /dev/null +++ b/windows/runner/resource.h @@ -0,0 +1,16 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by Runner.rc +// +#define IDI_APP_ICON 101 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/windows/runner/resources/app_icon.ico b/windows/runner/resources/app_icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..c04e20caf6370ebb9253ad831cc31de4a9c965f6 GIT binary patch literal 33772 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 literal 0 HcmV?d00001 diff --git a/windows/runner/runner.exe.manifest b/windows/runner/runner.exe.manifest new file mode 100644 index 00000000..153653e8 --- /dev/null +++ b/windows/runner/runner.exe.manifest @@ -0,0 +1,14 @@ + + + + + PerMonitorV2 + + + + + + + + + diff --git a/windows/runner/utils.cpp b/windows/runner/utils.cpp new file mode 100644 index 00000000..3a0b4651 --- /dev/null +++ b/windows/runner/utils.cpp @@ -0,0 +1,65 @@ +#include "utils.h" + +#include +#include +#include +#include + +#include + +void CreateAndAttachConsole() { + if (::AllocConsole()) { + FILE *unused; + if (freopen_s(&unused, "CONOUT$", "w", stdout)) { + _dup2(_fileno(stdout), 1); + } + if (freopen_s(&unused, "CONOUT$", "w", stderr)) { + _dup2(_fileno(stdout), 2); + } + std::ios::sync_with_stdio(); + FlutterDesktopResyncOutputStreams(); + } +} + +std::vector GetCommandLineArguments() { + // Convert the UTF-16 command line arguments to UTF-8 for the Engine to use. + int argc; + wchar_t** argv = ::CommandLineToArgvW(::GetCommandLineW(), &argc); + if (argv == nullptr) { + return std::vector(); + } + + std::vector command_line_arguments; + + // Skip the first argument as it's the binary name. + for (int i = 1; i < argc; i++) { + command_line_arguments.push_back(Utf8FromUtf16(argv[i])); + } + + ::LocalFree(argv); + + return command_line_arguments; +} + +std::string Utf8FromUtf16(const wchar_t* utf16_string) { + if (utf16_string == nullptr) { + return std::string(); + } + unsigned int target_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + -1, nullptr, 0, nullptr, nullptr) + -1; // remove the trailing null character + int input_length = (int)wcslen(utf16_string); + std::string utf8_string; + if (target_length == 0 || target_length > utf8_string.max_size()) { + return utf8_string; + } + utf8_string.resize(target_length); + int converted_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + input_length, utf8_string.data(), target_length, nullptr, nullptr); + if (converted_length == 0) { + return std::string(); + } + return utf8_string; +} diff --git a/windows/runner/utils.h b/windows/runner/utils.h new file mode 100644 index 00000000..3879d547 --- /dev/null +++ b/windows/runner/utils.h @@ -0,0 +1,19 @@ +#ifndef RUNNER_UTILS_H_ +#define RUNNER_UTILS_H_ + +#include +#include + +// Creates a console for the process, and redirects stdout and stderr to +// it for both the runner and the Flutter library. +void CreateAndAttachConsole(); + +// Takes a null-terminated wchar_t* encoded in UTF-16 and returns a std::string +// encoded in UTF-8. Returns an empty std::string on failure. +std::string Utf8FromUtf16(const wchar_t* utf16_string); + +// Gets the command line arguments passed in as a std::vector, +// encoded in UTF-8. Returns an empty std::vector on failure. +std::vector GetCommandLineArguments(); + +#endif // RUNNER_UTILS_H_ diff --git a/windows/runner/win32_window.cpp b/windows/runner/win32_window.cpp new file mode 100644 index 00000000..60608d0f --- /dev/null +++ b/windows/runner/win32_window.cpp @@ -0,0 +1,288 @@ +#include "win32_window.h" + +#include +#include + +#include "resource.h" + +namespace { + +/// Window attribute that enables dark mode window decorations. +/// +/// Redefined in case the developer's machine has a Windows SDK older than +/// version 10.0.22000.0. +/// See: https://docs.microsoft.com/windows/win32/api/dwmapi/ne-dwmapi-dwmwindowattribute +#ifndef DWMWA_USE_IMMERSIVE_DARK_MODE +#define DWMWA_USE_IMMERSIVE_DARK_MODE 20 +#endif + +constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW"; + +/// Registry key for app theme preference. +/// +/// A value of 0 indicates apps should use dark mode. A non-zero or missing +/// value indicates apps should use light mode. +constexpr const wchar_t kGetPreferredBrightnessRegKey[] = + L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize"; +constexpr const wchar_t kGetPreferredBrightnessRegValue[] = L"AppsUseLightTheme"; + +// The number of Win32Window objects that currently exist. +static int g_active_window_count = 0; + +using EnableNonClientDpiScaling = BOOL __stdcall(HWND hwnd); + +// Scale helper to convert logical scaler values to physical using passed in +// scale factor +int Scale(int source, double scale_factor) { + return static_cast(source * scale_factor); +} + +// Dynamically loads the |EnableNonClientDpiScaling| from the User32 module. +// This API is only needed for PerMonitor V1 awareness mode. +void EnableFullDpiSupportIfAvailable(HWND hwnd) { + HMODULE user32_module = LoadLibraryA("User32.dll"); + if (!user32_module) { + return; + } + auto enable_non_client_dpi_scaling = + reinterpret_cast( + GetProcAddress(user32_module, "EnableNonClientDpiScaling")); + if (enable_non_client_dpi_scaling != nullptr) { + enable_non_client_dpi_scaling(hwnd); + } + FreeLibrary(user32_module); +} + +} // namespace + +// Manages the Win32Window's window class registration. +class WindowClassRegistrar { + public: + ~WindowClassRegistrar() = default; + + // Returns the singleton registrar instance. + static WindowClassRegistrar* GetInstance() { + if (!instance_) { + instance_ = new WindowClassRegistrar(); + } + return instance_; + } + + // Returns the name of the window class, registering the class if it hasn't + // previously been registered. + const wchar_t* GetWindowClass(); + + // Unregisters the window class. Should only be called if there are no + // instances of the window. + void UnregisterWindowClass(); + + private: + WindowClassRegistrar() = default; + + static WindowClassRegistrar* instance_; + + bool class_registered_ = false; +}; + +WindowClassRegistrar* WindowClassRegistrar::instance_ = nullptr; + +const wchar_t* WindowClassRegistrar::GetWindowClass() { + if (!class_registered_) { + WNDCLASS window_class{}; + window_class.hCursor = LoadCursor(nullptr, IDC_ARROW); + window_class.lpszClassName = kWindowClassName; + window_class.style = CS_HREDRAW | CS_VREDRAW; + window_class.cbClsExtra = 0; + window_class.cbWndExtra = 0; + window_class.hInstance = GetModuleHandle(nullptr); + window_class.hIcon = + LoadIcon(window_class.hInstance, MAKEINTRESOURCE(IDI_APP_ICON)); + window_class.hbrBackground = 0; + window_class.lpszMenuName = nullptr; + window_class.lpfnWndProc = Win32Window::WndProc; + RegisterClass(&window_class); + class_registered_ = true; + } + return kWindowClassName; +} + +void WindowClassRegistrar::UnregisterWindowClass() { + UnregisterClass(kWindowClassName, nullptr); + class_registered_ = false; +} + +Win32Window::Win32Window() { + ++g_active_window_count; +} + +Win32Window::~Win32Window() { + --g_active_window_count; + Destroy(); +} + +bool Win32Window::Create(const std::wstring& title, + const Point& origin, + const Size& size) { + Destroy(); + + const wchar_t* window_class = + WindowClassRegistrar::GetInstance()->GetWindowClass(); + + const POINT target_point = {static_cast(origin.x), + static_cast(origin.y)}; + HMONITOR monitor = MonitorFromPoint(target_point, MONITOR_DEFAULTTONEAREST); + UINT dpi = FlutterDesktopGetDpiForMonitor(monitor); + double scale_factor = dpi / 96.0; + + HWND window = CreateWindow( + window_class, title.c_str(), WS_OVERLAPPEDWINDOW, + Scale(origin.x, scale_factor), Scale(origin.y, scale_factor), + Scale(size.width, scale_factor), Scale(size.height, scale_factor), + nullptr, nullptr, GetModuleHandle(nullptr), this); + + if (!window) { + return false; + } + + UpdateTheme(window); + + return OnCreate(); +} + +bool Win32Window::Show() { + return ShowWindow(window_handle_, SW_SHOWNORMAL); +} + +// static +LRESULT CALLBACK Win32Window::WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + if (message == WM_NCCREATE) { + auto window_struct = reinterpret_cast(lparam); + SetWindowLongPtr(window, GWLP_USERDATA, + reinterpret_cast(window_struct->lpCreateParams)); + + auto that = static_cast(window_struct->lpCreateParams); + EnableFullDpiSupportIfAvailable(window); + that->window_handle_ = window; + } else if (Win32Window* that = GetThisFromHandle(window)) { + return that->MessageHandler(window, message, wparam, lparam); + } + + return DefWindowProc(window, message, wparam, lparam); +} + +LRESULT +Win32Window::MessageHandler(HWND hwnd, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + switch (message) { + case WM_DESTROY: + window_handle_ = nullptr; + Destroy(); + if (quit_on_close_) { + PostQuitMessage(0); + } + return 0; + + case WM_DPICHANGED: { + auto newRectSize = reinterpret_cast(lparam); + LONG newWidth = newRectSize->right - newRectSize->left; + LONG newHeight = newRectSize->bottom - newRectSize->top; + + SetWindowPos(hwnd, nullptr, newRectSize->left, newRectSize->top, newWidth, + newHeight, SWP_NOZORDER | SWP_NOACTIVATE); + + return 0; + } + case WM_SIZE: { + RECT rect = GetClientArea(); + if (child_content_ != nullptr) { + // Size and position the child window. + MoveWindow(child_content_, rect.left, rect.top, rect.right - rect.left, + rect.bottom - rect.top, TRUE); + } + return 0; + } + + case WM_ACTIVATE: + if (child_content_ != nullptr) { + SetFocus(child_content_); + } + return 0; + + case WM_DWMCOLORIZATIONCOLORCHANGED: + UpdateTheme(hwnd); + return 0; + } + + return DefWindowProc(window_handle_, message, wparam, lparam); +} + +void Win32Window::Destroy() { + OnDestroy(); + + if (window_handle_) { + DestroyWindow(window_handle_); + window_handle_ = nullptr; + } + if (g_active_window_count == 0) { + WindowClassRegistrar::GetInstance()->UnregisterWindowClass(); + } +} + +Win32Window* Win32Window::GetThisFromHandle(HWND const window) noexcept { + return reinterpret_cast( + GetWindowLongPtr(window, GWLP_USERDATA)); +} + +void Win32Window::SetChildContent(HWND content) { + child_content_ = content; + SetParent(content, window_handle_); + RECT frame = GetClientArea(); + + MoveWindow(content, frame.left, frame.top, frame.right - frame.left, + frame.bottom - frame.top, true); + + SetFocus(child_content_); +} + +RECT Win32Window::GetClientArea() { + RECT frame; + GetClientRect(window_handle_, &frame); + return frame; +} + +HWND Win32Window::GetHandle() { + return window_handle_; +} + +void Win32Window::SetQuitOnClose(bool quit_on_close) { + quit_on_close_ = quit_on_close; +} + +bool Win32Window::OnCreate() { + // No-op; provided for subclasses. + return true; +} + +void Win32Window::OnDestroy() { + // No-op; provided for subclasses. +} + +void Win32Window::UpdateTheme(HWND const window) { + DWORD light_mode; + DWORD light_mode_size = sizeof(light_mode); + LSTATUS result = RegGetValue(HKEY_CURRENT_USER, kGetPreferredBrightnessRegKey, + kGetPreferredBrightnessRegValue, + RRF_RT_REG_DWORD, nullptr, &light_mode, + &light_mode_size); + + if (result == ERROR_SUCCESS) { + BOOL enable_dark_mode = light_mode == 0; + DwmSetWindowAttribute(window, DWMWA_USE_IMMERSIVE_DARK_MODE, + &enable_dark_mode, sizeof(enable_dark_mode)); + } +} diff --git a/windows/runner/win32_window.h b/windows/runner/win32_window.h new file mode 100644 index 00000000..e901dde6 --- /dev/null +++ b/windows/runner/win32_window.h @@ -0,0 +1,102 @@ +#ifndef RUNNER_WIN32_WINDOW_H_ +#define RUNNER_WIN32_WINDOW_H_ + +#include + +#include +#include +#include + +// A class abstraction for a high DPI-aware Win32 Window. Intended to be +// inherited from by classes that wish to specialize with custom +// rendering and input handling +class Win32Window { + public: + struct Point { + unsigned int x; + unsigned int y; + Point(unsigned int x, unsigned int y) : x(x), y(y) {} + }; + + struct Size { + unsigned int width; + unsigned int height; + Size(unsigned int width, unsigned int height) + : width(width), height(height) {} + }; + + Win32Window(); + virtual ~Win32Window(); + + // Creates a win32 window with |title| that is positioned and sized using + // |origin| and |size|. New windows are created on the default monitor. Window + // sizes are specified to the OS in physical pixels, hence to ensure a + // consistent size this function will scale the inputted width and height as + // as appropriate for the default monitor. The window is invisible until + // |Show| is called. Returns true if the window was created successfully. + bool Create(const std::wstring& title, const Point& origin, const Size& size); + + // Show the current window. Returns true if the window was successfully shown. + bool Show(); + + // Release OS resources associated with window. + void Destroy(); + + // Inserts |content| into the window tree. + void SetChildContent(HWND content); + + // Returns the backing Window handle to enable clients to set icon and other + // window properties. Returns nullptr if the window has been destroyed. + HWND GetHandle(); + + // If true, closing this window will quit the application. + void SetQuitOnClose(bool quit_on_close); + + // Return a RECT representing the bounds of the current client area. + RECT GetClientArea(); + + protected: + // Processes and route salient window messages for mouse handling, + // size change and DPI. Delegates handling of these to member overloads that + // inheriting classes can handle. + virtual LRESULT MessageHandler(HWND window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Called when CreateAndShow is called, allowing subclass window-related + // setup. Subclasses should return false if setup fails. + virtual bool OnCreate(); + + // Called when Destroy is called. + virtual void OnDestroy(); + + private: + friend class WindowClassRegistrar; + + // OS callback called by message pump. Handles the WM_NCCREATE message which + // is passed when the non-client area is being created and enables automatic + // non-client DPI scaling so that the non-client area automatically + // responds to changes in DPI. All other messages are handled by + // MessageHandler. + static LRESULT CALLBACK WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Retrieves a class instance pointer for |window| + static Win32Window* GetThisFromHandle(HWND const window) noexcept; + + // Update the window frame's theme to match the system theme. + static void UpdateTheme(HWND const window); + + bool quit_on_close_ = false; + + // window handle for top level window. + HWND window_handle_ = nullptr; + + // window handle for hosted content. + HWND child_content_ = nullptr; +}; + +#endif // RUNNER_WIN32_WINDOW_H_