feat: enhance location update feedback and improve message retry error handling

feat: improve message matching logic and update notification IDs for advertisements
feat: add set-as-my-location from map long-press, connector and UI improvements
2026-06-15 07:04:26 +10:00 · 2026-03-14 09:54:50 -07:00 · 2026-03-14 09:44:37 -07:00 · 2026-03-14 09:33:37 -07:00 · 2026-03-13 11:04:11 -07:00 · 2026-03-13 10:59:09 -07:00
210 changed files with 114487 additions and 5729 deletions
@@ -0,0 +1,78 @@
+name: Build
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  android:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          distribution: "temurin"
+          java-version: "17"
+      - uses: subosito/flutter-action@v2
+        with:
+          channel: "stable"
+          cache: true
+      - name: Cache Gradle
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('android/gradle/wrapper/gradle-wrapper.properties', 'android/build.gradle', 'android/settings.gradle', 'android/app/build.gradle', 'pubspec.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - run: flutter pub get
+      - run: flutter build apk --release --no-pub
+
+  ios:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: subosito/flutter-action@v2
+        with:
+          channel: "stable"
+          cache: true
+      - run: flutter pub get
+      - run: flutter build ios --release --no-codesign --no-pub
+
+  linux:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: subosito/flutter-action@v2
+        with:
+          channel: "stable"
+          cache: true
+      - name: Install Linux build deps
+        run: sudo apt-get update && sudo apt-get install -y clang cmake ninja-build pkg-config libgtk-3-dev
+      - run: flutter pub get
+      - run: flutter build linux --release --no-pub
+
+  macos:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: subosito/flutter-action@v2
+        with:
+          channel: "stable"
+          cache: true
+      - run: flutter pub get
+      - run: flutter build macos --release --no-pub
+
+  web:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: subosito/flutter-action@v2
+        with:
+          channel: "stable"
+          cache: true
+      - run: flutter pub get
+      - run: flutter build web --release --no-pub
@@ -0,0 +1,38 @@
+name: Deploy to Cloudflare Workers
+
+on:
+  push:
+    tags:
+      - '*'
+  workflow_dispatch:
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      
+      - name: Setup Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: 'stable'
+          # Match local development version which provides Dart 3.11.0
+          flutter-version: '3.41.2'
+
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: latest
+
+      - name: Get dependencies
+        run: flutter pub get
+
+      - name: Build Web
+        run: bun run build
+
+      - name: Deploy to Cloudflare
+        uses: cloudflare/wrangler-action@v3
+        with:
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          command: deploy
@@ -0,0 +1,31 @@
+name: Flutter and Dart
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+
+jobs:
+  analyze:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+
+      - name: Install dependencies
+        run: flutter pub get
+
+      - name: Analyze code
+        run: flutter analyze --fatal-infos --fatal-warnings
+
+      - name: Verify formatting
+        run: dart format --output=none --set-exit-if-changed .
+
+      - name: Run tests
+        run: flutter test -r github
@@ -30,6 +30,7 @@ migrate_working_dir/
 .flutter-plugins-dependencies
 .pub-cache/
 .pub/
+pubspec.lock
 /build/
 /coverage/

@@ -65,11 +66,13 @@ secrets.dart
 **/ios/Flutter/Flutter.podspec

 # Android
+.gradle/
 **/android/.gradle/
 **/android/captures/
 **/android/local.properties
 **/android/.externalNativeBuild/
 *.jks
+key.properties
 keystore.properties

 # Generated files
@@ -80,3 +83,6 @@ keystore.properties
 # IDE
 .vscode/launch.json
 .vscode/settings.json
+
+# Cloudflare Wrangler
+.wrangler
@@ -0,0 +1 @@
+4.0.0
@@ -0,0 +1 @@
+6.2.4
@@ -6,9 +6,26 @@ Open-source Flutter client for MeshCore LoRa mesh networking devices.

 MeshCore Open is a cross-platform mobile application for communicating with MeshCore LoRa mesh network devices via Bluetooth Low Energy (BLE). The app enables long-range, off-grid communication through peer-to-peer messaging, public channels, and mesh networking capabilities.

+<a href="http://apps.obtainium.imranr.dev/redirect.html?r=obtainium://add/https://github.com/zjs81/meshcore-open">
+        <img src="assets/badges/badge_obtainium.png" height="80" align="center" alt="Get it on Obtainium"/>
+</a>
+
+## Screenshots
+
+<table>
+  <tr>
+    <td><img src="docs/screenshots/contacts.jpg" width="200"/><br/><p align="center"><b>Contacts</b></p></td>
+    <td><img src="docs/screenshots/chat1.jpg" width="200"/><br/><p align="center"><b>Chat</b></p></td>
+    <td><img src="docs/screenshots/chat2.jpg" width="200"/><br/><p align="center"><b>Reactions</b></p></td>
+    <td><img src="docs/screenshots/map.jpg" width="200"/><br/><p align="center"><b>Map</b></p></td>
+    <td><img src="docs/screenshots/channels.jpg" width="200"/><br/><p align="center"><b>Channels</b></p></td>
+  </tr>
+</table>
+
 ## Features

 ### Core Functionality
+
 - **Direct Messaging**: Private encrypted conversations with individual contacts
 - **Public Channels**: Broadcast messages to channel subscribers on the mesh network
 - **Contact Management**: Organize contacts, track last seen times, and manage conversation history
@@ -17,6 +34,7 @@ MeshCore Open is a cross-platform mobile application for communicating with Mesh
 - **Message Replies**: Thread conversations with inline reply functionality

 ### Mesh Network
+
 - **Path Visualization**: View routing paths and signal quality for each contact
 - **Route Management**: Manual path overriding and automatic route rotation
 - **Signal Metrics**: Real-time SNR (Signal-to-Noise Ratio) tracking
@@ -24,6 +42,7 @@ MeshCore Open is a cross-platform mobile application for communicating with Mesh
 - **Repeater Support**: Connect to and manage repeater nodes for extended range

 ### Map & Location
+
 - **Live Map View**: Real-time visualization of mesh network nodes on an interactive map
 - **Node Filtering**: Filter by node type (chat, repeater, sensor) and time range
 - **Location Sharing**: Share GPS coordinates and custom markers with contacts
@@ -31,12 +50,14 @@ MeshCore Open is a cross-platform mobile application for communicating with Mesh
 - **MGRS Coordinates**: Support for Military Grid Reference System coordinate format

 ### Device Management
+
 - **BLE Connection**: Scan and connect to MeshCore devices via Bluetooth
 - **Device Settings**: Configure radio parameters, power settings, and network options
 - **Battery Monitoring**: Real-time battery status with chemistry-specific voltage curves
 - **Firmware Updates**: Over-the-air firmware updates via BLE (coming soon)

 ### Repeater Hub
+
 - **CLI Access**: Full command-line interface to repeater nodes
 - **Settings Management**: Configure repeater behavior, power limits, and network settings
 - **Statistics Dashboard**: View repeater traffic, connected clients, and system health
@@ -45,6 +66,7 @@ MeshCore Open is a cross-platform mobile application for communicating with Mesh
 ## Technical Details

 ### Architecture
+
 - **Framework**: Flutter 3.38.5 / Dart 3.10.4
 - **State Management**: Provider pattern with ChangeNotifier
 - **BLE Protocol**: Nordic UART Service (NUS) over Bluetooth Low Energy
@@ -52,11 +74,14 @@ MeshCore Open is a cross-platform mobile application for communicating with Mesh
 - **Encryption**: End-to-end encryption for private messages using the MeshCore protocol

 ### Platform Support
+
 - ✅ **Android**: Full support (API 21+)
 - ✅ **iOS**: Full support (iOS 12+)
 - 🚧 **Desktop**: Limited support (macOS/Linux/Windows)
+- 🚧 **Web**: Under construction (Chrome)

 ### Dependencies
+
 | Package | Purpose |
 |---------|---------|
 | flutter_blue_plus | Bluetooth Low Energy communication |
@@ -72,6 +97,7 @@ MeshCore Open is a cross-platform mobile application for communicating with Mesh
 ## Getting Started

 ### Prerequisites
+
 - Flutter SDK 3.38.5 or later
 - Android Studio / Xcode (for mobile development)
 - A MeshCore-compatible LoRa device
@@ -79,17 +105,20 @@ MeshCore Open is a cross-platform mobile application for communicating with Mesh
 ### Installation

 1. **Clone the repository**
+
   ```bash
   git clone https://github.com/zjs81/meshcore-open.git
   cd meshcore-open
   ```

 2. **Install dependencies**
+
   ```bash
   flutter pub get
   ```

 3. **Run the app**
+
   ```bash
   flutter run
   ```
@@ -97,11 +126,13 @@ MeshCore Open is a cross-platform mobile application for communicating with Mesh
 ### Building for Release

 **Android APK:**
+
 ```bash
 flutter build apk --release
 ```

 **iOS:**
+
 ```bash
 flutter build ios --release
 ```
@@ -140,25 +171,30 @@ lib/
 ## 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
+
 Devices are discovered by scanning for BLE advertisements with the name prefix `MeshCore-`

 ### Message Format
+
 Messages are transmitted as binary frames using a custom protocol optimized for LoRa transmission. See `meshcore_protocol.dart` for frame structure definitions.

 ## Configuration

 ### App Settings
+
 - **Theme**: System default, light, or dark mode
 - **Notifications**: Configurable for messages, channels, and node advertisements
 - **Battery Chemistry**: Support for NMC, LiFePO4, and LiPo battery types
 - **Message Retry**: Automatic retry with configurable path clearing

 ### Device Settings
+
 - **Radio Power**: Transmit power adjustment (10-30 dBm)
 - **Frequency**: LoRa frequency configuration
 - **Bandwidth**: Channel bandwidth selection
@@ -170,22 +206,24 @@ Messages are transmitted as binary frames using a custom protocol optimized for
 This is an open-source project. Contributions are welcome!

 ### Development Guidelines
+
 - Follow the Flutter style guide
 - Use Material 3 design components
 - Write clear commit messages
 - Test on both Android and iOS before submitting PRs

 ### Code Style
+
 - Prefer `StatelessWidget` with `Consumer` for reactive UI
 - Use `const` constructors where possible
 - Keep functions small and focused
 - Avoid premature abstractions
-
+- Run dart format on all changes before submitting

 ## Support

 For issues, questions, or feature requests, please open an issue on GitHub:
-https://github.com/zjs81/meshcore-open/issues
+<https://github.com/zjs81/meshcore-open/issues>

 ## Donate

@@ -193,10 +231,14 @@ If you find MeshCore Open useful and would like to support development, you can

 **Solana Address:** `F15YanjZj96YTBtKJYgNa8RLQLCZkx5CEwogPWkqXeoQ`

+
+**Monero Address:** `453TxnpUqjkJtXxzdjMsrgERNkBRXEGamPbpC45ENrvKAk9tH7kZbxWF82Hz66etgDZyXFPEBU2JUEqhLeJyWt9kBvTVy5m`
+
+**Bitcoin Address:** `bc1qh45x28v8dslcg4v4upmqd9g0mvc3lnyffmyzr5`
+
 Your support helps maintain and improve this open-source project!

 ## Acknowledgments

 - Built with [Flutter](https://flutter.dev/)
 - Map tiles from [OpenStreetMap](https://www.openstreetmap.org/)
- Voice codec support via [Codec2](https://github.com/drowe67/codec2)
@@ -0,0 +1,244 @@
+# TestFlight and App Store Deployment Guide
+
+## Prerequisites
+
+- [x] Apple Developer Account ($99/year) - [developer.apple.com](https://developer.apple.com)
+- [x] Xcode installed
+- [x] Apple Transporter app installed
+- [x] App icons ready (1024x1024px)
+- [x] Bundle ID configured: `com.monitormx.meshcoreopen`
+
+## Step 1: Register Bundle Identifier
+
+1. Go to [Apple Developer - Identifiers](https://developer.apple.com/account/resources/identifiers/list)
+2. Click the **"+"** button
+3. Select **"App IDs"** → Continue
+4. Select **"App"** → Continue
+5. Fill in:
+   - **Description**: Meshcore Open
+   - **Bundle ID**: Explicit - `com.monitormx.meshcoreopen`
+   - **Capabilities**: Leave defaults (or add as needed)
+6. Click **Continue** → **Register**
+
+## Step 2: Create App in App Store Connect
+
+1. Go to [App Store Connect](https://appstoreconnect.apple.com)
+2. Sign in with your Apple ID
+3. Click **"My Apps"**
+4. Click the **"+"** button → **"New App"**
+5. Fill in the form:
+   - **Platforms**: iOS
+   - **Name**: Meshcore Open
+   - **Primary Language**: English (U.S.)
+   - **Bundle ID**: Select `com.monitormx.meshcoreopen` from dropdown
+   - **SKU**: `meshcore-open-001` (or any unique identifier)
+   - **User Access**: Full Access
+6. Click **"Create"**
+
+## Step 3: Build the IPA
+
+Run these commands from the project directory:
+
+```bash
+# Add CocoaPods to PATH
+export PATH="/opt/homebrew/lib/ruby/gems/4.0.0/bin:$PATH"
+
+# Clean previous builds
+../flutter/bin/flutter clean
+
+# Build IPA for App Store
+../flutter/bin/flutter build ipa
+```
+
+The IPA will be created at: `build/ios/ipa/meshcore_open.ipa`
+
+## Step 4: Upload to App Store Connect via Transporter
+
+1. **Open Apple Transporter**
+   - Launch from Applications folder
+   - Sign in with your Apple ID
+
+2. **Upload the IPA**
+   - Drag and drop `build/ios/ipa/meshcore_open.ipa` into Transporter
+   - Click **"Deliver"**
+   - Wait for upload to complete (usually 1-5 minutes)
+
+3. **Processing**
+   - Apple will process your build (10-30 minutes)
+   - You'll receive an email when processing is complete
+
+## Step 5: Configure App Store Connect Metadata
+
+### App Information
+1. In App Store Connect, go to your app
+2. Fill in required information:
+   - **Subtitle**: Short description (30 chars max)
+   - **Privacy Policy URL**: Required for Bluetooth apps
+   - **Category**: Utilities or Productivity
+   - **Age Rating**: Complete questionnaire
+
+### App Store Listing
+1. Go to **App Store** tab
+2. Upload **Screenshots** (required):
+   - iPhone 6.7" display (1290 x 2796 pixels) - At least 1 screenshot
+   - iPhone 6.5" display (1242 x 2688 pixels) - At least 1 screenshot
+   - Optional: iPad screenshots
+
+3. Fill in **Description**:
+   ```
+   Meshcore Open is a Flutter client for MeshCore LoRa mesh networking devices.
+
+   Features:
+   - BLE connectivity to MeshCore devices
+   - Real-time mesh network communication
+   - Map visualization with OpenStreetMap
+   - Community management with QR code scanning
+   - Message tracking and retry system
+
+   Connect to your MeshCore LoRa device and start communicating over the mesh network.
+   ```
+
+4. **Keywords**: `lora,mesh,networking,bluetooth,communication`
+5. **Support URL**: Your GitHub or website URL
+6. **Marketing URL**: (Optional)
+
+### Version Information
+1. **What's New in This Version**:
+   ```
+   Initial release of Meshcore Open
+
+   - BLE device connectivity
+   - Mesh network messaging
+   - Map integration
+   - Community features
+   ```
+
+2. **Build**: Select the uploaded build once processing completes
+
+## Step 6: TestFlight Setup
+
+### Internal Testing (No Review Required)
+1. Go to **TestFlight** tab in App Store Connect
+2. Click **Internal Testing** → **"+"** to create a group
+3. Name your group (e.g., "Internal Testers")
+4. Add yourself as a tester using your email
+5. Select the build you uploaded
+6. Testers will receive an email with TestFlight invitation
+
+### External Testing (Requires Beta Review)
+1. Click **External Testing** → **"+"** to create a group
+2. Add build and testers
+3. Fill in **Test Information**:
+   - **What to Test**: Brief description of features
+   - **Feedback Email**: Your email address
+4. Click **Submit for Review**
+5. Beta review typically takes 24-48 hours
+
+## Step 7: App Store Submission
+
+Once you're ready for public release:
+
+1. Go to **App Store** tab
+2. Complete all required metadata (if not done)
+3. Select your build
+4. Fill in **App Review Information**:
+   - **Contact Information**: Your name, phone, email
+   - **Demo Account**: If app requires login
+   - **Notes**: Any special instructions for reviewers
+5. Answer **Export Compliance** questions:
+   - Does your app use encryption? **Yes** (uses TLS/HTTPS)
+   - Is encryption registration required? **No** (standard encryption)
+6. Click **Add for Review**
+7. Review summary and click **Submit to App Review**
+
+## Step 8: After Submission
+
+- **App Review**: Typically 24-48 hours
+- **Common Rejection Reasons**:
+  - Missing privacy policy
+  - Incomplete app information
+  - Crashes or bugs
+  - Misleading app description
+
+- **If Approved**: You can release immediately or schedule a release date
+- **If Rejected**: Address issues and resubmit
+
+## Updating the App
+
+When you need to release an update:
+
+1. **Update version** in `pubspec.yaml`:
+   ```yaml
+   version: 0.5.0+6  # Increment version (0.5.0) and build number (+6)
+   ```
+
+2. **Build new IPA**:
+   ```bash
+   export PATH="/opt/homebrew/lib/ruby/gems/4.0.0/bin:$PATH"
+   ../flutter/bin/flutter clean
+   ../flutter/bin/flutter build ipa
+   ```
+
+3. **Upload via Transporter** (same process as above)
+
+4. **Create new version** in App Store Connect:
+   - Click **"+"** next to versions
+   - Select version number
+   - Update "What's New" text
+   - Select new build
+   - Submit for review
+
+## macOS Build (Bonus)
+
+To build for macOS:
+
+```bash
+export PATH="/opt/homebrew/lib/ruby/gems/4.0.0/bin:$PATH"
+../flutter/bin/flutter build macos --release
+cd build/macos/Build/Products/Release
+zip -r meshcore_open-macos.zip meshcore_open.app
+```
+
+Distribution:
+- Share the zip file directly
+- Users unzip and drag to Applications
+- First run: Right-click → Open (to bypass Gatekeeper)
+
+## Troubleshooting
+
+### Build Errors
+- **CocoaPods not found**: Ensure PATH includes `/opt/homebrew/lib/ruby/gems/4.0.0/bin`
+- **No signing certificate**: Configure Team in Xcode (Signing & Capabilities)
+- **Bundle ID mismatch**: Check `ios/Runner.xcodeproj/project.pbxproj`
+
+### Upload Errors
+- **No profiles found**: Create app in App Store Connect first
+- **Bundle ID not registered**: Register in Apple Developer portal
+- **Authentication failed**: Use Transporter app instead of CLI
+
+### TestFlight Issues
+- **Build not appearing**: Wait 10-30 minutes for processing
+- **Can't add testers**: Check you have available slots (100 internal, 10,000 external)
+- **TestFlight crashes**: Check device logs in Xcode → Devices & Simulators
+
+## Important Files
+
+- **iOS IPA**: `build/ios/ipa/meshcore_open.ipa`
+- **macOS App**: `build/macos/Build/Products/Release/meshcore_open.app`
+- **Bundle ID Config**: `ios/Runner.xcodeproj/project.pbxproj`
+- **Version Info**: `pubspec.yaml`
+
+## Useful Links
+
+- [App Store Connect](https://appstoreconnect.apple.com)
+- [Apple Developer Portal](https://developer.apple.com/account)
+- [TestFlight Documentation](https://developer.apple.com/testflight/)
+- [App Store Review Guidelines](https://developer.apple.com/app-store/review/guidelines/)
+- [Flutter iOS Deployment](https://docs.flutter.dev/deployment/ios)
+
+## Support
+
+For issues with:
+- **App Store Process**: [Apple Developer Support](https://developer.apple.com/contact/)
+- **Flutter Build Issues**: [Flutter GitHub](https://github.com/flutter/flutter/issues)
+- **Meshcore Open App**: [GitHub Issues](https://github.com/wel97459/meshcore-open/issues)
@@ -1,3 +1,5 @@
+import java.util.Properties
+
 plugins {
    id("com.android.application")
    id("kotlin-android")
@@ -5,19 +7,25 @@ plugins {
    id("dev.flutter.flutter-gradle-plugin")
 }

+val keystoreProperties = Properties()
+val keystorePropertiesFile = rootProject.file("key.properties")
+if (keystorePropertiesFile.exists()) {
+    keystorePropertiesFile.inputStream().use { keystoreProperties.load(it) }
+}
+
 android {
    namespace = "com.meshcore.meshcore_open"
    compileSdk = flutter.compileSdkVersion
    ndkVersion = flutter.ndkVersion

    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
        isCoreLibraryDesugaringEnabled = true
    }

    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
    }

    defaultConfig {
@@ -40,11 +48,25 @@ android {
        // }
    }

+    signingConfigs {
+        create("release") {
+            val storeFilePath = keystoreProperties["storeFile"] as String?
+            if (storeFilePath != null) {
+                storeFile = file(storeFilePath)
+                storePassword = keystoreProperties["storePassword"] as String?
+                keyAlias = keystoreProperties["keyAlias"] as String?
+                keyPassword = keystoreProperties["keyPassword"] as String?
+            }
+        }
+    }
+
    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")
+            signingConfig = if (keystorePropertiesFile.exists()) {
+                signingConfigs.getByName("release")
+            } else {
+                signingConfigs.getByName("debug")
+            }
        }
    }

@@ -61,5 +83,5 @@ flutter {
 }

 dependencies {
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4")
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4")
 }
@@ -16,6 +16,10 @@
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE"/>
    <uses-permission android:name="android.permission.WAKE_LOCK"/>
+    <!-- Camera permission for QR code scanning -->
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-feature android:name="android.hardware.camera" android:required="false"/>
+    <uses-feature android:name="android.hardware.usb.host" android:required="false"/>

    <application
        android:label="meshcore_open"
@@ -64,5 +68,14 @@
            <action android:name="android.intent.action.PROCESS_TEXT"/>
            <data android:mimeType="text/plain"/>
        </intent>
+        <!-- URL launcher intents for opening links -->
+        <intent>
+            <action android:name="android.intent.action.VIEW"/>
+            <data android:scheme="http"/>
+        </intent>
+        <intent>
+            <action android:name="android.intent.action.VIEW"/>
+            <data android:scheme="https"/>
+        </intent>
    </queries>
 </manifest>
@@ -1,5 +1,18 @@
 package com.meshcore.meshcore_open

 import io.flutter.embedding.android.FlutterActivity
+import io.flutter.embedding.engine.FlutterEngine

-class MainActivity : FlutterActivity()
+class MainActivity : FlutterActivity() {
+    private val usbFunctions by lazy { MeshcoreUsbFunctions(this) }
+
+    override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
+        super.configureFlutterEngine(flutterEngine)
+        usbFunctions.configureFlutterEngine(flutterEngine)
+    }
+
+    override fun onDestroy() {
+        usbFunctions.dispose()
+        super.onDestroy()
+    }
+}
@@ -0,0 +1,582 @@
+package com.meshcore.meshcore_open
+
+import android.app.PendingIntent
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.hardware.usb.UsbConstants
+import android.hardware.usb.UsbDevice
+import android.hardware.usb.UsbDeviceConnection
+import android.hardware.usb.UsbEndpoint
+import android.hardware.usb.UsbInterface
+import android.hardware.usb.UsbManager
+import android.os.Build
+import android.os.Handler
+import android.os.Looper
+import io.flutter.embedding.android.FlutterActivity
+import io.flutter.embedding.engine.FlutterEngine
+import io.flutter.plugin.common.EventChannel
+import io.flutter.plugin.common.MethodCall
+import io.flutter.plugin.common.MethodChannel
+import java.util.Locale
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
+
+class MeshcoreUsbFunctions(
+    private val activity: FlutterActivity,
+) {
+    private companion object {
+        const val usbRecipientInterface = 0x01
+    }
+
+    private val usbMethodChannelName = "meshcore_open/android_usb_serial"
+    private val usbEventChannelName = "meshcore_open/android_usb_serial_events"
+    private val usbPermissionAction = "com.meshcore.meshcore_open.USB_PERMISSION"
+
+    private val usbManager by lazy {
+        activity.getSystemService(Context.USB_SERVICE) as UsbManager
+    }
+    private val mainHandler = Handler(Looper.getMainLooper())
+    private val usbIoExecutor: ExecutorService = Executors.newSingleThreadExecutor()
+
+    @Volatile private var eventSink: EventChannel.EventSink? = null
+    @Volatile private var usbConnection: UsbDeviceConnection? = null
+    @Volatile private var usbInEndpoint: UsbEndpoint? = null
+    @Volatile private var usbOutEndpoint: UsbEndpoint? = null
+    @Volatile private var controlInterface: UsbInterface? = null
+    @Volatile private var dataInterface: UsbInterface? = null
+    private var readThread: Thread? = null
+    @Volatile private var isReading = false
+    @Volatile private var connectedDeviceName: String? = null
+
+    private var pendingConnectResult: MethodChannel.Result? = null
+    private var pendingConnectPortName: String? = null
+    private var pendingConnectBaudRate: Int = 115200
+
+    private data class PortConfig(
+        val controlInterface: UsbInterface?,
+        val dataInterface: UsbInterface,
+        val inEndpoint: UsbEndpoint,
+        val outEndpoint: UsbEndpoint,
+    )
+
+    private val permissionReceiver =
+        object : BroadcastReceiver() {
+            override fun onReceive(context: Context?, intent: Intent?) {
+                when (intent?.action) {
+                    UsbManager.ACTION_USB_DEVICE_DETACHED -> {
+                        handleUsbDetached(intent)
+                        return
+                    }
+                    usbPermissionAction -> Unit
+                    else -> return
+                }
+
+                val result = pendingConnectResult
+                val portName = pendingConnectPortName
+                pendingConnectResult = null
+                pendingConnectPortName = null
+
+                if (result == null || portName == null) {
+                    return
+                }
+
+                val device = findUsbDevice(portName)
+                if (device == null) {
+                    result.error(
+                        "usb_device_missing",
+                        null,
+                        null,
+                    )
+                    return
+                }
+
+                val granted =
+                    intent.getBooleanExtra(UsbManager.EXTRA_PERMISSION_GRANTED, false)
+                if (!granted || !usbManager.hasPermission(device)) {
+                    result.error("usb_permission_denied", null, null)
+                    return
+                }
+
+                openUsbDevice(device, pendingConnectBaudRate, result)
+            }
+        }
+
+    fun configureFlutterEngine(flutterEngine: FlutterEngine) {
+        registerUsbPermissionReceiver()
+
+        MethodChannel(flutterEngine.dartExecutor.binaryMessenger, usbMethodChannelName)
+            .setMethodCallHandler { call, result ->
+                when (call.method) {
+                    "listPorts" -> result.success(listUsbPorts())
+                    "connect" -> handleUsbConnect(call, result)
+                    "write" -> handleUsbWrite(call, result)
+                    "disconnect" -> {
+                        scheduleCloseUsbConnection {
+                            result.success(null)
+                        }
+                    }
+                    else -> result.notImplemented()
+                }
+            }
+
+        EventChannel(flutterEngine.dartExecutor.binaryMessenger, usbEventChannelName)
+            .setStreamHandler(
+                object : EventChannel.StreamHandler {
+                    override fun onListen(arguments: Any?, events: EventChannel.EventSink) {
+                        eventSink = events
+                    }
+
+                    override fun onCancel(arguments: Any?) {
+                        eventSink = null
+                    }
+                },
+            )
+    }
+
+    fun dispose() {
+        closeUsbConnection()
+        usbIoExecutor.shutdownNow()
+        try {
+            activity.unregisterReceiver(permissionReceiver)
+        } catch (_: IllegalArgumentException) {
+        }
+    }
+
+    private fun registerUsbPermissionReceiver() {
+        val filter =
+            IntentFilter().apply {
+                addAction(usbPermissionAction)
+                addAction(UsbManager.ACTION_USB_DEVICE_DETACHED)
+            }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            activity.registerReceiver(permissionReceiver, filter, Context.RECEIVER_NOT_EXPORTED)
+        } else {
+            @Suppress("DEPRECATION")
+            activity.registerReceiver(permissionReceiver, filter)
+        }
+    }
+
+    private fun listUsbPorts(): List<String> {
+        return usbManager.deviceList.values.map { device ->
+            val productName = device.productName ?: "USB Serial Device"
+            val vendorProduct =
+                String.format(
+                    Locale.US,
+                    "VID:%04X PID:%04X",
+                    device.vendorId,
+                    device.productId,
+                )
+            "${device.deviceName} - $productName - $vendorProduct"
+        }
+    }
+
+    private fun handleUsbConnect(call: MethodCall, result: MethodChannel.Result) {
+        val portName = call.argument<String>("portName")
+        val baudRate = call.argument<Int>("baudRate") ?: 115200
+        if (portName.isNullOrBlank()) {
+            result.error("usb_invalid_port", null, null)
+            return
+        }
+
+        val device = findUsbDevice(portName)
+        if (device == null) {
+            result.error("usb_device_missing", null, null)
+            return
+        }
+
+        if (usbManager.hasPermission(device)) {
+            openUsbDevice(device, baudRate, result)
+            return
+        }
+
+        if (pendingConnectResult != null) {
+            result.error("usb_busy", null, null)
+            return
+        }
+
+        pendingConnectResult = result
+        pendingConnectPortName = portName
+        pendingConnectBaudRate = baudRate
+
+        val permissionIntent = PendingIntent.getBroadcast(
+            activity,
+            0,
+            Intent(usbPermissionAction).setPackage(activity.packageName),
+            pendingIntentFlags(),
+        )
+        usbManager.requestPermission(device, permissionIntent)
+    }
+
+    private fun handleUsbWrite(call: MethodCall, result: MethodChannel.Result) {
+        val data = call.argument<ByteArray>("data")
+        val connection = usbConnection
+        val endpoint = usbOutEndpoint
+        if (data == null) {
+            result.error("usb_invalid_data", null, null)
+            return
+        }
+        if (connection == null || endpoint == null) {
+            result.error("usb_not_connected", null, null)
+            return
+        }
+
+        usbIoExecutor.execute {
+            try {
+                writeToDevice(data)
+                mainHandler.post { result.success(null) }
+            } catch (error: Exception) {
+                mainHandler.post {
+                    result.error("usb_write_failed", error.message, null)
+                }
+            }
+        }
+    }
+
+    private fun findUsbDevice(portName: String): UsbDevice? {
+        val devices = usbManager.deviceList.values
+        val exactMatch = devices.firstOrNull { it.deviceName == portName }
+        if (exactMatch != null) {
+            return exactMatch
+        }
+
+        val normalizedName = portName.substringBefore(" - ").trim()
+        return devices.firstOrNull { it.deviceName == normalizedName }
+    }
+
+    private fun openUsbDevice(
+        device: UsbDevice,
+        baudRate: Int,
+        result: MethodChannel.Result,
+    ) {
+        usbIoExecutor.execute {
+            try {
+                closeUsbConnection()
+
+                val config = resolvePortConfig(device)
+                if (config == null) {
+                    mainHandler.post {
+                        result.error(
+                            "usb_driver_missing",
+                            null,
+                            null,
+                        )
+                    }
+                    return@execute
+                }
+
+                val connection = usbManager.openDevice(device)
+                if (connection == null) {
+                    mainHandler.post {
+                        result.error(
+                            "usb_open_failed",
+                            null,
+                            null,
+                        )
+                    }
+                    return@execute
+                }
+
+                if (!connection.claimInterface(config.dataInterface, true)) {
+                    connection.close()
+                    mainHandler.post {
+                        result.error(
+                            "usb_open_failed",
+                            null,
+                            null,
+                        )
+                    }
+                    return@execute
+                }
+
+                if (config.controlInterface != null &&
+                    config.controlInterface.id != config.dataInterface.id &&
+                    !connection.claimInterface(config.controlInterface, true)
+                ) {
+                    connection.releaseInterface(config.dataInterface)
+                    connection.close()
+                    mainHandler.post {
+                        result.error(
+                            "usb_open_failed",
+                            null,
+                            null,
+                        )
+                    }
+                    return@execute
+                }
+
+                usbConnection = connection
+                usbInEndpoint = config.inEndpoint
+                usbOutEndpoint = config.outEndpoint
+                controlInterface = config.controlInterface
+                dataInterface = config.dataInterface
+
+                configureDevice(connection, config, baudRate)
+
+                connectedDeviceName = device.deviceName
+                startReadLoop()
+
+                mainHandler.post {
+                    result.success(null)
+                }
+            } catch (error: Exception) {
+                closeUsbConnection()
+                mainHandler.post {
+                    result.error("usb_connect_failed", error.message, null)
+                }
+            }
+        }
+    }
+
+    private fun resolvePortConfig(device: UsbDevice): PortConfig? {
+        var preferredDataInterface: UsbInterface? = null
+        var preferredInEndpoint: UsbEndpoint? = null
+        var preferredOutEndpoint: UsbEndpoint? = null
+        var fallbackDataInterface: UsbInterface? = null
+        var fallbackInEndpoint: UsbEndpoint? = null
+        var fallbackOutEndpoint: UsbEndpoint? = null
+        var preferredControlInterface: UsbInterface? = null
+
+        for (interfaceIndex in 0 until device.interfaceCount) {
+            val usbInterface = device.getInterface(interfaceIndex)
+            var inEndpoint: UsbEndpoint? = null
+            var outEndpoint: UsbEndpoint? = null
+
+            for (endpointIndex in 0 until usbInterface.endpointCount) {
+                val endpoint = usbInterface.getEndpoint(endpointIndex)
+                if (endpoint.type != UsbConstants.USB_ENDPOINT_XFER_BULK) {
+                    continue
+                }
+                when (endpoint.direction) {
+                    UsbConstants.USB_DIR_IN -> if (inEndpoint == null) inEndpoint = endpoint
+                    UsbConstants.USB_DIR_OUT -> if (outEndpoint == null) outEndpoint = endpoint
+                }
+            }
+
+            val hasDataPair = inEndpoint != null && outEndpoint != null
+            when {
+                usbInterface.interfaceClass == UsbConstants.USB_CLASS_COMM &&
+                    preferredControlInterface == null -> {
+                    preferredControlInterface = usbInterface
+                }
+                hasDataPair &&
+                    usbInterface.interfaceClass == UsbConstants.USB_CLASS_CDC_DATA -> {
+                    preferredDataInterface = usbInterface
+                    preferredInEndpoint = inEndpoint
+                    preferredOutEndpoint = outEndpoint
+                }
+                hasDataPair && fallbackDataInterface == null -> {
+                    fallbackDataInterface = usbInterface
+                    fallbackInEndpoint = inEndpoint
+                    fallbackOutEndpoint = outEndpoint
+                }
+            }
+        }
+
+        val dataInterface = preferredDataInterface ?: fallbackDataInterface ?: return null
+        val inEndpoint = preferredInEndpoint ?: fallbackInEndpoint ?: return null
+        val outEndpoint = preferredOutEndpoint ?: fallbackOutEndpoint ?: return null
+        return PortConfig(preferredControlInterface, dataInterface, inEndpoint, outEndpoint)
+    }
+
+    private fun configureDevice(
+        connection: UsbDeviceConnection,
+        config: PortConfig,
+        baudRate: Int,
+    ) {
+        val control = config.controlInterface ?: return
+        val lineCoding =
+            byteArrayOf(
+                (baudRate and 0xFF).toByte(),
+                ((baudRate shr 8) and 0xFF).toByte(),
+                ((baudRate shr 16) and 0xFF).toByte(),
+                ((baudRate shr 24) and 0xFF).toByte(),
+                0, // stop bits: 1
+                0, // parity: none
+                8, // data bits
+            )
+
+                val lineCodingResult =
+            connection.controlTransfer(
+                UsbConstants.USB_DIR_OUT or
+                    UsbConstants.USB_TYPE_CLASS or
+                    usbRecipientInterface,
+                0x20,
+                0,
+                control.id,
+                lineCoding,
+                lineCoding.size,
+                1000,
+            )
+        if (lineCodingResult < 0) {
+            throw IllegalStateException("Failed to configure USB line coding")
+        }
+
+        val controlLineResult =
+            connection.controlTransfer(
+                UsbConstants.USB_DIR_OUT or
+                    UsbConstants.USB_TYPE_CLASS or
+                    usbRecipientInterface,
+                0x22,
+                0x0001, // DTR on, RTS off
+                control.id,
+                null,
+                0,
+                1000,
+            )
+        if (controlLineResult < 0) {
+            throw IllegalStateException("Failed to configure USB control line state")
+        }
+    }
+
+    private fun startReadLoop() {
+        val connection = usbConnection ?: return
+        val endpoint = usbInEndpoint ?: return
+
+        isReading = true
+        readThread =
+            Thread({
+                val packetSize = endpoint.maxPacketSize.coerceAtLeast(64)
+                val buffer = ByteArray(packetSize * 4)
+                try {
+                    while (isReading) {
+                        val bytesRead = connection.bulkTransfer(endpoint, buffer, buffer.size, 250)
+                        if (!isReading) {
+                            break
+                        }
+                        if (bytesRead <= 0) {
+                            continue
+                        }
+                        val packet = buffer.copyOf(bytesRead)
+                        mainHandler.post {
+                            eventSink?.success(packet)
+                        }
+                    }
+                } catch (error: Exception) {
+                    if (isReading) {
+                        mainHandler.post {
+                            eventSink?.error(
+                                "usb_io_error",
+                                error.message ?: "USB serial I/O error",
+                                null,
+                            )
+                        }
+                        scheduleCloseUsbConnection()
+                    }
+                }
+            }, "MeshCoreUsbRead").also { thread ->
+                thread.isDaemon = true
+                thread.start()
+            }
+    }
+
+    private fun writeToDevice(data: ByteArray) {
+        val connection = usbConnection ?: throw IllegalStateException("USB connection missing")
+        val endpoint = usbOutEndpoint ?: throw IllegalStateException("USB output endpoint missing")
+        var offset = 0
+        val maxPacketSize = endpoint.maxPacketSize.coerceAtLeast(64)
+        while (offset < data.size) {
+            val chunkSize = minOf(maxPacketSize, data.size - offset)
+            val chunk = data.copyOfRange(offset, offset + chunkSize)
+            val bytesWritten = connection.bulkTransfer(endpoint, chunk, chunkSize, 1000)
+            if (bytesWritten != chunkSize) {
+                throw IllegalStateException("Short USB write: wrote $bytesWritten of $chunkSize bytes")
+            }
+            offset += chunkSize
+        }
+    }
+
+    private fun scheduleCloseUsbConnection(onComplete: (() -> Unit)? = null) {
+        usbIoExecutor.execute {
+            closeUsbConnection()
+            if (onComplete != null) {
+                mainHandler.post(onComplete)
+            }
+        }
+    }
+
+    @Synchronized
+    private fun closeUsbConnection() {
+        isReading = false
+        readThread?.interrupt()
+        if (readThread != null && readThread !== Thread.currentThread()) {
+            try {
+                readThread?.join(300)
+            } catch (_: InterruptedException) {
+                Thread.currentThread().interrupt()
+            }
+        }
+        readThread = null
+
+        val connection = usbConnection
+        val claimedControl = controlInterface
+        val claimedData = dataInterface
+
+        usbInEndpoint = null
+        usbOutEndpoint = null
+        controlInterface = null
+        dataInterface = null
+        usbConnection = null
+
+        if (connection != null) {
+            if (claimedControl != null) {
+                try {
+                    connection.releaseInterface(claimedControl)
+                } catch (_: Exception) {
+                }
+            }
+            if (claimedData != null && claimedData.id != claimedControl?.id) {
+                try {
+                    connection.releaseInterface(claimedData)
+                } catch (_: Exception) {
+                }
+            }
+            try {
+                connection.close()
+            } catch (_: Exception) {
+            }
+        }
+        connectedDeviceName = null
+    }
+
+    private fun handleUsbDetached(intent: Intent) {
+        val detachedDevice =
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                intent.getParcelableExtra(UsbManager.EXTRA_DEVICE, UsbDevice::class.java)
+            } else {
+                @Suppress("DEPRECATION")
+                intent.getParcelableExtra(UsbManager.EXTRA_DEVICE)
+            }
+
+        val detachedName = detachedDevice?.deviceName ?: return
+
+        if (pendingConnectPortName == detachedName) {
+            pendingConnectResult?.error(
+                "usb_device_detached",
+                "USB device was removed before the connection completed",
+                null,
+            )
+            pendingConnectResult = null
+            pendingConnectPortName = null
+        }
+
+        if (connectedDeviceName == detachedName) {
+            scheduleCloseUsbConnection {
+                eventSink?.error(
+                    "usb_device_detached",
+                    "USB device was disconnected",
+                    null,
+                )
+            }
+        }
+    }
+
+    private fun pendingIntentFlags(): Int {
+        var flags = PendingIntent.FLAG_UPDATE_CURRENT
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            flags = flags or PendingIntent.FLAG_MUTABLE
+        }
+        return flags
+    }
+}
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#e3e3e3"><path d="M268-240 42-466l57-56 170 170 56 56-57 56Zm226 0L268-466l56-57 170 170 368-368 56 57-424 424Zm0-226-57-56 198-198 57 56-198 198Z"/></svg>
@@ -0,0 +1,104 @@
+# Privacy Policy for MeshCore Open
+
+**Last Updated:** January 11, 2026
+
+## Introduction
+
+MeshCore Open ("the App") is an open-source Flutter application for communicating with MeshCore LoRa mesh networking devices. This Privacy Policy explains how the App handles your information.
+
+## Data Collection
+
+### Data We Do NOT Collect
+
+MeshCore Open does **not**:
+- Collect personal information
+- Send data to external servers (except map tile requests)
+- Track your usage or behavior
+- Use analytics services
+- Require account creation
+- Share any data with third parties
+
+### Data Stored Locally on Your Device
+
+The App stores the following data **locally on your device only**:
+
+- **Messages**: Chat messages sent and received through the mesh network
+- **Contacts**: Names and identifiers of mesh network contacts
+- **App Settings**: Your preferences (theme, language, notification settings)
+- **Channel Settings**: Configuration for mesh network channels
+- **Message History**: Path history for message routing
+- **Debug Logs**: Optional BLE and app debug logs (if enabled by user)
+- **Cached Map Tiles**: Offline map data for the mapping feature
+
+All locally stored data remains on your device and is never transmitted to us or any third party.
+
+## Permissions
+
+The App requires certain device permissions to function:
+
+### Bluetooth Permissions
+- **BLUETOOTH, BLUETOOTH_ADMIN** (Android 11 and below)
+- **BLUETOOTH_SCAN, BLUETOOTH_CONNECT, BLUETOOTH_ADVERTISE** (Android 12+)
+
+These permissions are used solely to discover and communicate with MeshCore hardware devices via Bluetooth Low Energy (BLE).
+
+### Location Permission
+- **ACCESS_FINE_LOCATION, ACCESS_COARSE_LOCATION**
+
+Required by Android for BLE scanning on Android 11 and below. The App does not track or store your location. Location data may be optionally shared over the mesh network if you choose to enable location sharing features.
+
+### Internet Permission
+- **INTERNET**
+
+Used only for downloading map tiles from OpenStreetMap tile servers when using the map feature. No personal data is transmitted.
+
+### Notification Permission
+- **POST_NOTIFICATIONS** (Android 13+)
+
+Used to display notifications for incoming messages when the app is in the background.
+
+### Background Service Permissions
+- **FOREGROUND_SERVICE, FOREGROUND_SERVICE_CONNECTED_DEVICE, WAKE_LOCK**
+
+Used to maintain BLE connection with your MeshCore device while the app is in the background.
+
+## Third-Party Services
+
+### Map Tiles
+The App uses OpenStreetMap tile servers to display maps. When viewing maps, your device's IP address may be visible to the tile server. No other data is shared. See [OpenStreetMap's Privacy Policy](https://wiki.osmfoundation.org/wiki/Privacy_Policy) for more information.
+
+### GIF Search (Giphy)
+The App includes a GIF picker feature powered by Giphy. When you use the GIF search feature:
+- Your search queries are sent to Giphy's API servers
+- Your device's IP address is visible to Giphy
+- Giphy may collect usage data according to their privacy policy
+
+GIF search is optional and only activated when you choose to use it. See [Giphy's Privacy Policy](https://support.giphy.com/hc/en-us/articles/360032872931-GIPHY-Privacy-Policy) for more information about how they handle data.
+
+## Mesh Network Communications
+
+Messages sent through the MeshCore mesh network are transmitted over radio frequencies to other mesh devices. The App itself does not control or monitor these communications beyond facilitating the connection between your mobile device and your MeshCore hardware.
+
+## Data Security
+
+All data is stored locally on your device using standard Flutter/Android storage mechanisms. The App does not implement additional encryption for locally stored data beyond what the operating system provides.
+
+## Children's Privacy
+
+The App does not knowingly collect any personal information from children under 13 years of age.
+
+## Open Source
+
+MeshCore Open is open-source software. You can review the complete source code to verify these privacy practices at [the project repository].
+
+## Changes to This Policy
+
+We may update this Privacy Policy from time to time. Any changes will be reflected in the "Last Updated" date at the top of this policy.
+
+## Contact
+
+If you have questions about this Privacy Policy or the App's privacy practices, please open an issue on the project's GitHub repository.
+
+---
+
+**Summary**: MeshCore Open is a privacy-respecting app that stores all data locally on your device. We do not collect, track, or share your personal information.
@@ -0,0 +1,61 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1770562336,
+        "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "d6c71932130818840fc8fe9509cf50be8c64634f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
@@ -0,0 +1,86 @@
+{
+  description = "MeshCore Flutter Application";
+
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs = { self, nixpkgs, flake-utils }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = nixpkgs.legacyPackages.${system};
+      in
+      {
+        devShells.default = pkgs.mkShell {
+          buildInputs = with pkgs; [
+            # Flutter and Dart
+            flutter
+            dart
+
+            # Java (required for Android development)
+            jdk17
+
+            # Android development tools
+            android-tools
+            gradle
+
+            # For the shell hook to set up the environment for Flutter development
+            gtk3
+            glib
+            sysprof
+            libclang
+            cmake
+            ninja
+            pkg-config
+            libdatrie
+
+            # Additional tools for installing Android SDK if not present
+            curl
+            unzip
+          ];
+
+          shellHook = ''
+            echo "MeshCore Flutter Development Environment"
+            export PKG_CONFIG_PATH="${pkgs.gtk3}/lib/pkgconfig:${pkgs.glib}/lib/pkgconfig:${pkgs.sysprof}/lib/pkgconfig:$PKG_CONFIG_PATH"
+            export LD_LIBRARY_PATH="${pkgs.lib.makeLibraryPath [pkgs.gtk3 pkgs.glib pkgs.sysprof pkgs.libdatrie]}:$LD_LIBRARY_PATH"
+            export CMAKE_INSTALL_PREFIX="$PWD/build/bundle"
+            
+            # Setup Android SDK in home directory (standard location)
+            export ANDROID_HOME="$HOME/Android/Sdk"
+            export ANDROID_SDK_ROOT="$ANDROID_HOME"
+            export PATH="$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools:$ANDROID_HOME/tools/bin:$PATH"
+            
+            echo "Android SDK: $ANDROID_HOME"
+            echo ""
+            
+            # Check if Android SDK exists and offer to download if not
+            if [ ! -d "$ANDROID_HOME" ]; then
+              echo "WARNING: Android SDK not found at $ANDROID_HOME"
+              echo ""
+              echo "To download and set up the Android SDK, run this command:"
+              echo ""
+              cat << 'EOF'
+mkdir -p ~/Android/Sdk && cd ~/Android/Sdk && \
+curl -o cmdline-tools.zip ${if pkgs.stdenv.isDarwin then "https://dl.google.com/android/repository/commandlinetools-mac-10406996_latest.zip" else "https://dl.google.com/android/repository/commandlinetools-linux-10406996_latest.zip"} && \
+unzip -q cmdline-tools.zip && \
+mkdir -p cmdline-tools/latest && \
+mv cmdline-tools/* cmdline-tools/latest/ 2>/dev/null || echo "Warning: failed to move Android cmdline-tools into 'latest' directory; please check your SDK layout." >&2 && \
+rm cmdline-tools.zip && \
+cd cmdline-tools/latest/bin && \
+yes | ./sdkmanager --sdk_root=~/Android/Sdk 'platform-tools' && \
+echo "Android SDK setup complete!"
+EOF
+              echo ""
+              echo "Then run 'flutter doctor' again to verify."
+              echo ""
+            else
+              echo "Android SDK found at $ANDROID_HOME"
+            fi
+            
+            echo "To check that everything is set up correctly, run 'flutter doctor' and ensure there are no issues."
+          '';
+        };
+      }
+    );
+}
@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"
@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"
@@ -1,4 +1,4 @@
-platform :ios, '12.0'
+platform :ios, '15.5'

 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

@@ -26,8 +26,6 @@ require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelpe
 flutter_ios_podfile_setup

 target 'Runner' do
-  pod 'codec2', :path => '../third_party/codec2'
-
  flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
 end

@@ -0,0 +1,145 @@
+PODS:
+  - Flutter (1.0.0)
+  - flutter_blue_plus_darwin (0.0.2):
+    - Flutter
+    - FlutterMacOS
+  - flutter_foreground_task (0.0.1):
+    - Flutter
+  - flutter_local_notifications (0.0.1):
+    - Flutter
+  - GoogleDataTransport (10.1.0):
+    - nanopb (~> 3.30910.0)
+    - PromisesObjC (~> 2.4)
+  - GoogleMLKit/BarcodeScanning (7.0.0):
+    - GoogleMLKit/MLKitCore
+    - MLKitBarcodeScanning (~> 6.0.0)
+  - GoogleMLKit/MLKitCore (7.0.0):
+    - MLKitCommon (~> 12.0.0)
+  - GoogleToolboxForMac/Defines (4.2.1)
+  - GoogleToolboxForMac/Logger (4.2.1):
+    - GoogleToolboxForMac/Defines (= 4.2.1)
+  - "GoogleToolboxForMac/NSData+zlib (4.2.1)":
+    - GoogleToolboxForMac/Defines (= 4.2.1)
+  - GoogleUtilities/Environment (8.1.0):
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Logger (8.1.0):
+    - GoogleUtilities/Environment
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Privacy (8.1.0)
+  - GoogleUtilities/UserDefaults (8.1.0):
+    - GoogleUtilities/Logger
+    - GoogleUtilities/Privacy
+  - GTMSessionFetcher/Core (3.5.0)
+  - MLImage (1.0.0-beta6)
+  - MLKitBarcodeScanning (6.0.0):
+    - MLKitCommon (~> 12.0)
+    - MLKitVision (~> 8.0)
+  - MLKitCommon (12.0.0):
+    - GoogleDataTransport (~> 10.0)
+    - GoogleToolboxForMac/Logger (< 5.0, >= 4.2.1)
+    - "GoogleToolboxForMac/NSData+zlib (< 5.0, >= 4.2.1)"
+    - GoogleUtilities/Logger (~> 8.0)
+    - GoogleUtilities/UserDefaults (~> 8.0)
+    - GTMSessionFetcher/Core (< 4.0, >= 3.3.2)
+  - MLKitVision (8.0.0):
+    - GoogleToolboxForMac/Logger (< 5.0, >= 4.2.1)
+    - "GoogleToolboxForMac/NSData+zlib (< 5.0, >= 4.2.1)"
+    - GTMSessionFetcher/Core (< 4.0, >= 3.3.2)
+    - MLImage (= 1.0.0-beta6)
+    - MLKitCommon (~> 12.0)
+  - mobile_scanner (6.0.2):
+    - Flutter
+    - GoogleMLKit/BarcodeScanning (~> 7.0.0)
+  - nanopb (3.30910.0):
+    - nanopb/decode (= 3.30910.0)
+    - nanopb/encode (= 3.30910.0)
+  - nanopb/decode (3.30910.0)
+  - nanopb/encode (3.30910.0)
+  - package_info_plus (0.4.5):
+    - Flutter
+  - PromisesObjC (2.4.0)
+  - shared_preferences_foundation (0.0.1):
+    - Flutter
+    - FlutterMacOS
+  - sqflite_darwin (0.0.4):
+    - Flutter
+    - FlutterMacOS
+  - url_launcher_ios (0.0.1):
+    - Flutter
+  - wakelock_plus (0.0.1):
+    - Flutter
+
+DEPENDENCIES:
+  - Flutter (from `Flutter`)
+  - flutter_blue_plus_darwin (from `.symlinks/plugins/flutter_blue_plus_darwin/darwin`)
+  - flutter_foreground_task (from `.symlinks/plugins/flutter_foreground_task/ios`)
+  - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
+  - mobile_scanner (from `.symlinks/plugins/mobile_scanner/ios`)
+  - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
+  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
+  - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`)
+  - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
+  - wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`)
+
+SPEC REPOS:
+  trunk:
+    - GoogleDataTransport
+    - GoogleMLKit
+    - GoogleToolboxForMac
+    - GoogleUtilities
+    - GTMSessionFetcher
+    - MLImage
+    - MLKitBarcodeScanning
+    - MLKitCommon
+    - MLKitVision
+    - nanopb
+    - PromisesObjC
+
+EXTERNAL SOURCES:
+  Flutter:
+    :path: Flutter
+  flutter_blue_plus_darwin:
+    :path: ".symlinks/plugins/flutter_blue_plus_darwin/darwin"
+  flutter_foreground_task:
+    :path: ".symlinks/plugins/flutter_foreground_task/ios"
+  flutter_local_notifications:
+    :path: ".symlinks/plugins/flutter_local_notifications/ios"
+  mobile_scanner:
+    :path: ".symlinks/plugins/mobile_scanner/ios"
+  package_info_plus:
+    :path: ".symlinks/plugins/package_info_plus/ios"
+  shared_preferences_foundation:
+    :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
+  sqflite_darwin:
+    :path: ".symlinks/plugins/sqflite_darwin/darwin"
+  url_launcher_ios:
+    :path: ".symlinks/plugins/url_launcher_ios/ios"
+  wakelock_plus:
+    :path: ".symlinks/plugins/wakelock_plus/ios"
+
+SPEC CHECKSUMS:
+  Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
+  flutter_blue_plus_darwin: 20a08bfeaa0f7804d524858d3d8744bcc1b6dbc3
+  flutter_foreground_task: a159d2c2173b33699ddb3e6c2a067045d7cebb89
+  flutter_local_notifications: 395056b3175ba4f08480a7c5de30cd36d69827e4
+  GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
+  GoogleMLKit: eff9e23ec1d90ea4157a1ee2e32a4f610c5b3318
+  GoogleToolboxForMac: d1a2cbf009c453f4d6ded37c105e2f67a32206d8
+  GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
+  GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6
+  MLImage: 0ad1c5f50edd027672d8b26b0fee78a8b4a0fc56
+  MLKitBarcodeScanning: 0a3064da0a7f49ac24ceb3cb46a5bc67496facd2
+  MLKitCommon: 07c2c33ae5640e5380beaaa6e4b9c249a205542d
+  MLKitVision: 45e79d68845a2de77e2dd4d7f07947f0ed157b0e
+  mobile_scanner: af8f71879eaba2bbcb4d86c6a462c3c0e7f23036
+  nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
+  package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
+  PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
+  shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb
+  sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
+  url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b
+  wakelock_plus: e29112ab3ef0b318e58cfa5c32326458be66b556
+
+PODFILE CHECKSUM: 570da2a631486c6bd6496bed1e605e63e2471be5
+
+COCOAPODS: 1.16.2
@@ -14,6 +14,7 @@
 		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 */; };
+		9A698254711B63C3940A64CB /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4268181FCF3E12817B700E9C /* libPods-Runner.a */; };
 /* End PBXBuildFile section */

 /* Begin PBXContainerItemProxy section */
@@ -42,9 +43,13 @@
 /* Begin PBXFileReference section */
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
+		24A76623340E493BD4C25C5C /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
 		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 = "<group>"; };
+		40AC50CE3E1D4278E82498CF /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
+		4268181FCF3E12817B700E9C /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		718BC7DCCFC5C370705C12E5 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
@@ -62,6 +67,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				9A698254711B63C3940A64CB /* libPods-Runner.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -94,6 +100,8 @@
 				97C146F01CF9000F007C117D /* Runner */,
 				97C146EF1CF9000F007C117D /* Products */,
 				331C8082294A63A400263BE5 /* RunnerTests */,
+				DEE6F094D3B70E76087722E1 /* Pods */,
+				DAE613E34DF694C2E33B64C7 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -121,6 +129,25 @@
 			path = Runner;
 			sourceTree = "<group>";
 		};
+		DAE613E34DF694C2E33B64C7 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				4268181FCF3E12817B700E9C /* libPods-Runner.a */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		DEE6F094D3B70E76087722E1 /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				40AC50CE3E1D4278E82498CF /* Pods-Runner.debug.xcconfig */,
+				24A76623340E493BD4C25C5C /* Pods-Runner.release.xcconfig */,
+				718BC7DCCFC5C370705C12E5 /* Pods-Runner.profile.xcconfig */,
+			);
+			name = Pods;
+			path = Pods;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */

 /* Begin PBXNativeTarget section */
@@ -145,12 +172,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
+				DE3B2E091393835C0B38492E /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
+				B788CEDB957A87EE8AC593BB /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -253,6 +282,45 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
 		};
+		B788CEDB957A87EE8AC593BB /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		DE3B2E091393835C0B38492E /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */

 /* Begin PBXSourcesBuildPhase section */
@@ -368,7 +436,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.meshcore.meshcoreOpen;
+				PRODUCT_BUNDLE_IDENTIFIER = com.monitormx.meshcoreopen;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -384,7 +452,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.meshcore.meshcoreOpen.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = com.monitormx.meshcoreopen.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -401,7 +469,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.meshcore.meshcoreOpen.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = com.monitormx.meshcoreopen.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
@@ -416,7 +484,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.meshcore.meshcoreOpen.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = com.monitormx.meshcoreopen.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
@@ -547,7 +615,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.meshcore.meshcoreOpen;
+				PRODUCT_BUNDLE_IDENTIFIER = com.monitormx.meshcoreopen;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -569,7 +637,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.meshcore.meshcoreOpen;
+				PRODUCT_BUNDLE_IDENTIFIER = com.monitormx.meshcoreopen;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -4,4 +4,7 @@
   <FileRef
      location = "group:Runner.xcodeproj">
   </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
 </Workspace>
@@ -53,5 +53,12 @@
 	<string>This app uses Bluetooth to communicate with MeshCore devices.</string>
 	<key>NSBluetoothPeripheralUsageDescription</key>
 	<string>This app uses Bluetooth to communicate with MeshCore devices.</string>
+	<key>NSCameraUsageDescription</key>
+	<string>This app uses the camera to scan QR codes for joining communities.</string>
+	<key>LSApplicationQueriesSchemes</key>
+	<array>
+		<string>http</string>
+		<string>https</string>
+	</array>
 </dict>
 </plist>
@@ -0,0 +1,6 @@
+arb-dir: lib/l10n
+template-arb-file: app_en.arb
+output-localization-file: app_localizations.dart
+output-class: AppLocalizations
+nullable-getter: false
+untranslated-messages-file: untranslated.json
@@ -0,0 +1,70 @@
+import 'dart:async';
+import 'dart:typed_data';
+
+import '../services/app_debug_log_service.dart';
+import '../services/tcp_transport_service.dart';
+
+/// Manages TCP transport for MeshCore devices.
+///
+/// Owns the [TcpTransportService] and TCP-specific connection state.
+/// The main [MeshCoreConnector] delegates all TCP operations here.
+class MeshCoreTcpConnector {
+  final TcpTransportService _service = TcpTransportService();
+  AppDebugLogService? _debugLog;
+  StreamSubscription<Uint8List>? _frameSubscription;
+
+  // --- Getters ---
+  String? get activeEndpoint => _service.activeEndpoint;
+  bool get isConnected => _service.isConnected;
+
+  // --- Configuration ---
+  void setDebugLogService(AppDebugLogService? service) {
+    _debugLog = service;
+    _service.setDebugLogService(service);
+  }
+
+  // --- Connection lifecycle ---
+  Future<void> connect({required String host, required int port}) async {
+    _debugLog?.info('TcpConnector.connect endpoint=$host:$port', tag: 'TCP');
+    await _frameSubscription?.cancel();
+    _frameSubscription = null;
+    await _service.connect(host: host, port: port);
+    _debugLog?.info(
+      'TcpConnector.connect done, endpoint=${_service.activeEndpoint}',
+      tag: 'TCP',
+    );
+  }
+
+  StreamSubscription<Uint8List> listenFrames({
+    required void Function(Uint8List) onFrame,
+    required void Function(Object, StackTrace?) onError,
+    required void Function() onDone,
+  }) {
+    _frameSubscription = _service.frameStream.listen(
+      onFrame,
+      onError: onError,
+      onDone: onDone,
+    );
+    return _frameSubscription!;
+  }
+
+  Future<void> cancelFrameSubscription() async {
+    await _frameSubscription?.cancel();
+    _frameSubscription = null;
+  }
+
+  Future<void> disconnect() async {
+    if (!_service.isConnected && _frameSubscription == null) return;
+    _debugLog?.info('TcpConnector.disconnect', tag: 'TCP');
+    await _frameSubscription?.cancel();
+    _frameSubscription = null;
+    await _service.disconnect();
+  }
+
+  Future<void> write(Uint8List data) => _service.write(data);
+
+  void dispose() {
+    _frameSubscription?.cancel();
+    _service.dispose();
+  }
+}
@@ -0,0 +1,76 @@
+import 'dart:typed_data';
+
+import '../services/app_debug_log_service.dart';
+import '../services/usb_serial_service.dart';
+
+/// Manages USB serial transport for MeshCore devices.
+///
+/// Owns the [UsbSerialService] and USB-specific connection state.
+/// The main [MeshCoreConnector] delegates all USB operations here.
+class MeshCoreUsbManager {
+  MeshCoreUsbManager();
+
+  final UsbSerialService _service = UsbSerialService();
+  AppDebugLogService? _debugLog;
+  String? _activePortKey;
+  String? _activePortLabel;
+
+  // --- Getters ---
+  String? get activePortKey => _activePortKey;
+  String? get activePortDisplayLabel => _activePortLabel ?? _activePortKey;
+  bool get isConnected => _service.isConnected;
+  Stream<Uint8List> get frameStream => _service.frameStream;
+
+  // --- Configuration ---
+  Future<List<String>> listPorts() => _service.listPorts();
+
+  void setRequestPortLabel(String label) => _service.setRequestPortLabel(label);
+
+  void setFallbackDeviceName(String label) =>
+      _service.setFallbackDeviceName(label);
+
+  void setDebugLogService(AppDebugLogService? service) {
+    _debugLog = service;
+    _service.setDebugLogService(service);
+  }
+
+  // --- Connection lifecycle ---
+  Future<void> connect({
+    required String portName,
+    int baudRate = 115200,
+  }) async {
+    _debugLog?.info(
+      'UsbManager.connect: portName=$portName baud=$baudRate',
+      tag: 'USB',
+    );
+    await _service.connect(portName: portName, baudRate: baudRate);
+    _activePortKey = _service.activePortKey ?? portName;
+    _activePortLabel = _service.activePortDisplayLabel ?? portName;
+    _debugLog?.info(
+      'UsbManager.connect: done, key=$_activePortKey label=$_activePortLabel',
+      tag: 'USB',
+    );
+  }
+
+  Future<void> disconnect() async {
+    if (!_service.isConnected && _activePortKey == null) {
+      return;
+    }
+    _debugLog?.info('UsbManager.disconnect', tag: 'USB');
+    await _service.disconnect();
+    _activePortKey = null;
+    _activePortLabel = null;
+  }
+
+  Future<void> write(Uint8List data) => _service.write(data);
+
+  // --- Label management ---
+  void updateConnectedLabel(String selfName) {
+    _service.updateConnectedLabel(selfName);
+    _activePortLabel = _service.activePortDisplayLabel ?? _activePortLabel;
+  }
+
+  void dispose() {
+    _service.dispose();
+  }
+}
@@ -1,6 +1,185 @@
 import 'dart:convert';
 import 'dart:typed_data';

+// Buffer Reader - sequential binary data reader with pointer tracking
+class BufferReader {
+  int _pointer = 0;
+  int _lastPointer = 0;
+  final Uint8List _buffer;
+
+  BufferReader(Uint8List data) : _buffer = Uint8List.fromList(data);
+
+  int get remaining => _buffer.length - _pointer;
+
+  int readByte() => readBytes(1)[0];
+
+  Uint8List readBytes(int count) {
+    _lastPointer = _pointer;
+    if (_pointer + count > _buffer.length) {
+      throw RangeError(
+        'Attempted to read $count bytes at offset $_pointer, but only $remaining bytes remaining in buffer of length ${_buffer.length}',
+      );
+    }
+    final data = _buffer.sublist(_pointer, _pointer + count);
+    _pointer += count;
+    return data;
+  }
+
+  void skipBytes(int count) {
+    _lastPointer = _pointer;
+    if (_pointer + count > _buffer.length) {
+      throw RangeError(
+        'Attempted to skip $count bytes at offset $_pointer, but only $remaining bytes remaining in buffer of length ${_buffer.length}',
+      );
+    }
+    _pointer += count;
+  }
+
+  Uint8List readRemainingBytes() => readBytes(remaining);
+
+  String readString() {
+    _lastPointer = _pointer;
+    final value = readRemainingBytes();
+    try {
+      return utf8.decode(Uint8List.fromList(value), allowMalformed: true);
+    } catch (e) {
+      return String.fromCharCodes(value); // Latin-1 fallback
+    }
+  }
+
+  String readCStringGreedy(int maxLength) {
+    _lastPointer = _pointer;
+    final value = <int>[];
+    final bytes = readBytes(maxLength);
+    for (final byte in bytes) {
+      if (byte == 0) break;
+      value.add(byte);
+    }
+    try {
+      return utf8.decode(Uint8List.fromList(value), allowMalformed: true);
+    } catch (e) {
+      return String.fromCharCodes(value); // Latin-1 fallback
+    }
+  }
+
+  String readCString(int maxLength) {
+    final backupPointer = _pointer;
+    final value = <int>[];
+    int counter = 0;
+    while (counter < maxLength) {
+      final byte = readByte();
+      if (byte == 0) break;
+      value.add(byte);
+      counter++;
+    }
+    _lastPointer = backupPointer;
+    try {
+      return utf8.decode(Uint8List.fromList(value), allowMalformed: true);
+    } catch (e) {
+      return String.fromCharCodes(value); // Latin-1 fallback
+    }
+  }
+
+  int readUInt8() => readBytes(1).buffer.asByteData().getUint8(0);
+  int readInt8() => readBytes(1).buffer.asByteData().getInt8(0);
+  int readUInt16LE() =>
+      readBytes(2).buffer.asByteData().getUint16(0, Endian.little);
+  int readUInt16BE() =>
+      readBytes(2).buffer.asByteData().getUint16(0, Endian.big);
+  int readUInt32LE() =>
+      readBytes(4).buffer.asByteData().getUint32(0, Endian.little);
+  int readUInt32BE() =>
+      readBytes(4).buffer.asByteData().getUint32(0, Endian.big);
+  int readInt16LE() =>
+      readBytes(2).buffer.asByteData().getInt16(0, Endian.little);
+  int readInt16BE() => readBytes(2).buffer.asByteData().getInt16(0, Endian.big);
+  int readInt32LE() =>
+      readBytes(4).buffer.asByteData().getInt32(0, Endian.little);
+
+  int readInt24BE() {
+    var value = (readByte() << 16) | (readByte() << 8) | readByte();
+    if ((value & 0x800000) != 0) value -= 0x1000000;
+    return value;
+  }
+
+  void resetPointer() => _pointer = 0;
+  void rewind() => _pointer = _lastPointer;
+}
+
+// Buffer Writer - accumulating binary data builder
+class BufferWriter {
+  final BytesBuilder _builder = BytesBuilder();
+
+  Uint8List toBytes() => _builder.toBytes();
+
+  void writeByte(int byte) => _builder.addByte(byte);
+  void writeBytes(Uint8List bytes) => _builder.add(bytes);
+
+  void writeUInt16LE(int num) {
+    final bytes = Uint8List(2)
+      ..buffer.asByteData().setUint16(0, num, Endian.little);
+    writeBytes(bytes);
+  }
+
+  void writeUInt32LE(int num) {
+    final bytes = Uint8List(4)
+      ..buffer.asByteData().setUint32(0, num, Endian.little);
+    writeBytes(bytes);
+  }
+
+  void writeInt32LE(int num) {
+    final bytes = Uint8List(4)
+      ..buffer.asByteData().setInt32(0, num, Endian.little);
+    writeBytes(bytes);
+  }
+
+  void writeString(String string) =>
+      writeBytes(Uint8List.fromList(utf8.encode(string)));
+
+  void writeCString(String string, int maxLength) {
+    final bytes = Uint8List(maxLength);
+    final encoded = utf8.encode(string);
+    for (var i = 0; i < maxLength - 1 && i < encoded.length; i++) {
+      bytes[i] = encoded[i];
+    }
+    writeBytes(bytes);
+  }
+
+  void writeHex(String hex) {
+    writeBytes(hex2Uint8List(hex));
+  }
+
+  void writeBytesPadded(Uint8List bytes, int totalLength) {
+    // Path data (64 bytes, zero-padded)
+    final bytesPadded = Uint8List(totalLength);
+    final len = bytes.length < totalLength ? bytes.length : totalLength;
+    if (bytes.isNotEmpty && len > 0) {
+      final copyLen = bytes.length < totalLength ? bytes.length : totalLength;
+      for (int i = 0; i < copyLen; i++) {
+        bytesPadded[i] = bytes[i];
+      }
+    }
+    writeBytes(bytesPadded);
+  }
+}
+
+Uint8List hex2Uint8List(String hex) {
+  // Validate hex string length is even and not empty
+  if (hex.isEmpty || hex.length % 2 != 0) {
+    throw FormatException('Invalid hex string length: ${hex.length}');
+  }
+  List<int> result = [];
+  for (int i = 0; i < hex.length ~/ 2; i++) {
+    final hexByte = hex.substring(i * 2, i * 2 + 2);
+    final byte = int.tryParse(hexByte, radix: 16);
+    if (byte == null) {
+      throw FormatException('Invalid hex characters at position $i: $hexByte');
+    }
+    result.add(byte);
+  }
+  return Uint8List.fromList(result);
+}
+
 // Command codes (to device)
 const int cmdAppStart = 1;
 const int cmdSendTxtMsg = 2;
@@ -28,7 +207,15 @@ const int cmdSendStatusReq = 27;
 const int cmdGetContactByKey = 30;
 const int cmdGetChannel = 31;
 const int cmdSetChannel = 32;
-const int cmdGetRadioSettings = 57;
+const int cmdSendTracePath = 36;
+const int cmdSetOtherParams = 38;
+const int cmdSendAnonReq = 57;
+const int cmdGetTelemetryReq = 39;
+const int cmdGetCustomVar = 40;
+const int cmdSetCustomVar = 41;
+const int cmdSendBinaryReq = 50;
+const int cmdSetAutoAddConfig = 58;
+const int cmdGetAutoAddConfig = 59;

 // Text message types
 const int txtTypePlain = 0;
@@ -39,7 +226,7 @@ const int reqTypeGetStatus = 0x01;
 const int reqTypeKeepAlive = 0x02;
 const int reqTypeGetTelemetry = 0x03;
 const int reqTypeGetAccessList = 0x05;
-const int reqTypeGetNeighbours = 0x06;
+const int reqTypeGetNeighbors = 0x06;

 // Repeater response codes
 const int respServerLoginOk = 0;
@@ -56,12 +243,14 @@ const int respCodeContactMsgRecv = 7;
 const int respCodeChannelMsgRecv = 8;
 const int respCodeCurrTime = 9;
 const int respCodeNoMoreMessages = 10;
+const int respCodeExportContact = 11;
 const int respCodeBattAndStorage = 12;
 const int respCodeDeviceInfo = 13;
 const int respCodeContactMsgRecvV3 = 16;
 const int respCodeChannelMsgRecvV3 = 17;
 const int respCodeChannelInfo = 18;
-const int respCodeRadioSettings = 25;
+const int respCodeCustomVars = 21;
+const int respCodeAutoAddConfig = 25;

 // Push codes (async from device)
 const int pushCodeAdvert = 0x80;
@@ -72,7 +261,10 @@ const int pushCodeLoginSuccess = 0x85;
 const int pushCodeLoginFail = 0x86;
 const int pushCodeStatusResponse = 0x87;
 const int pushCodeLogRxData = 0x88;
+const int pushCodeTraceData = 0x89;
 const int pushCodeNewAdvert = 0x8A;
+const int pushCodeTelemetryResponse = 0x8B;
+const int pushCodeBinaryResponse = 0x8C;

 // Contact/advertisement types
 const int advTypeChat = 1;
@@ -80,6 +272,42 @@ const int advTypeRepeater = 2;
 const int advTypeRoom = 3;
 const int advTypeSensor = 4;

+// Payload Types
+const int payloadTypeREQ =
+    0x00; // request (prefixed with dest/src hashes, MAC) (enc data: timestamp, blob)
+const int payloadTypeRESPONSE =
+    0x01; // response to REQ or ANON_REQ (prefixed with dest/src hashes, MAC) (enc data: timestamp, blob)
+const int payloadTypeTXTMSG =
+    0x02; // a plain text message (prefixed with dest/src hashes, MAC) (enc data: timestamp, text)
+const int payloadTypeACK = 0x03; // a simple ack
+const int payloadTypeADVERT = 0x04; // a node advertising its Identity
+const int payloadTypeGRPTXT =
+    0x05; // an (unverified) group text message (prefixed with channel hash, MAC) (enc data: timestamp, "name: msg")
+const int payloadTypeGRPDATA =
+    0x06; // an (unverified) group datagram (prefixed with channel hash, MAC) (enc data: timestamp, blob)
+const int payloadTypeANONREQ =
+    0x07; // generic request (prefixed with dest_hash, ephemeral pub_key, MAC) (enc data: ...)
+const int payloadTypePATH =
+    0x08; // returned path (prefixed with dest/src hashes, MAC) (enc data: path, extra)
+const int payloadTypeTRACE = 0x09; // trace a path, collecting SNI for each hop
+const int payloadTypeMULTIPART = 0x0A; // packet is one of a set of packets
+const int payloadTypeCONTROL = 0x0B; // a control/discovery packet
+//...
+const int payloadTypeRawCustom =
+    0x0F; // custom packet as raw bytes, for applications with custom encryption, payloads, etc
+
+//auto-add flags
+const int autoAddOverwriteOldestFlag =
+    1 << 0; // 0x01 - overwrite oldest non-favourite when full
+const int autoAddChatFlag =
+    1 << 1; // 0x02 - auto-add Chat (Companion) (ADV_TYPE_CHAT)
+const int autoAddRepeaterFlag =
+    1 << 2; // 0x04 - auto-add Repeater (ADV_TYPE_REPEATER)
+const int autoAddRoomServerFlag =
+    1 << 3; // 0x08 - auto-add Room Server (ADV_TYPE_ROOM)
+const int autoAddSensorFlag =
+    1 << 4; // 0x10 - auto-add Sensor (ADV_TYPE_SENSOR)
+
 // Sizes
 const int pubKeySize = 32;
 const int maxPathSize = 64;
@@ -89,8 +317,10 @@ const int maxFrameSize = 172;
 const int appProtocolVersion = 3;
 // Matches firmware MAX_TEXT_LEN (10 * CIPHER_BLOCK_SIZE).
 const int maxTextPayloadBytes = 160;
-const int _sendTextMsgOverheadBytes = 1 + 1 + 1 + 4 + 6 + 1;
-const int _sendChannelTextMsgOverheadBytes = 1 + 1 + 1 + 4 + 1;
+const int _sendTextMsgOverheadBytes =
+    1 + 1 + 1 + 4 + 6 + 1 + 2; // +2 safety margin
+const int _sendChannelTextMsgOverheadBytes =
+    1 + 1 + 1 + 4 + 1 + 2; // +2 safety margin

 int maxContactMessageBytes() {
  final byFrame = maxFrameSize - _sendTextMsgOverheadBytes;
@@ -121,13 +351,14 @@ int _minPositive(int a, int b) {
 const int contactPubKeyOffset = 1;
 const int contactTypeOffset = 33;
 const int contactFlagsOffset = 34;
+const int contactFlagFavorite = 0x01;
 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 contactLastModOffset = 144;
 const int contactFrameSize = 148;

 // Message frame offsets
@@ -140,10 +371,7 @@ class ParsedContactText {
  final Uint8List senderPrefix;
  final String text;

-  const ParsedContactText({
-    required this.senderPrefix,
-    required this.text,
-  });
+  const ParsedContactText({required this.senderPrefix, required this.text});
 }

 ParsedContactText? parseContactMessageText(Uint8List frame) {
@@ -172,10 +400,17 @@ ParsedContactText? parseContactMessageText(Uint8List frame) {
    return null;
  }

-  var text = readCString(frame, baseTextOffset, frame.length - baseTextOffset).trim();
+  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();
+    text = readCString(
+      frame,
+      baseTextOffset + 4,
+      frame.length - (baseTextOffset + 4),
+    ).trim();
  }
  if (text.isEmpty) return null;

@@ -203,19 +438,6 @@ int readInt32LE(Uint8List data, int offset) {
  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 write int32 little-endian
-void writeInt32LE(Uint8List data, int offset, int value) {
-  writeUint32LE(data, offset, value & 0xFFFFFFFF);
-}
-
 // Helper to read null-terminated UTF-8 string
 String readCString(Uint8List data, int offset, int maxLen) {
  int end = offset;
@@ -246,34 +468,32 @@ Uint8List hexToPubKey(String hex) {

 // Build CMD_GET_CONTACTS frame
 Uint8List buildGetContactsFrame({int? since}) {
+  final writer = BufferWriter();
+  writer.writeByte(cmdGetContacts);
  if (since != null) {
-    final frame = Uint8List(5);
-    frame[0] = cmdGetContacts;
-    writeUint32LE(frame, 1, since);
-    return frame;
+    writer.writeUInt32LE(since);
  }
-  return Uint8List.fromList([cmdGetContacts]);
+  return writer.toBytes();
 }

 // 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;
+  final writer = BufferWriter();
+  writer.writeByte(cmdSendLogin);
+  writer.writeBytes(recipientPubKey);
+  writer.writeString(password);
+  writer.writeByte(0);
+  return writer.toBytes();
 }

 // 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;
+  final writer = BufferWriter();
+  writer.writeByte(cmdSendStatusReq);
+  writer.writeBytes(recipientPubKey);
+  return writer.toBytes();
 }

 // Build CMD_SEND_TXT_MSG frame (companion_radio format)
@@ -284,48 +504,39 @@ Uint8List buildSendTextMsgFrame(
  int attempt = 0,
  int? timestampSeconds,
 }) {
-  final textBytes = utf8.encode(text);
-  final timestamp = timestampSeconds ?? (DateTime.now().millisecondsSinceEpoch ~/ 1000);
-  const prefixSize = 6;
-  final safeAttempt = attempt.clamp(0, 3);
-  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;
+  final timestamp =
+      timestampSeconds ?? (DateTime.now().millisecondsSinceEpoch ~/ 1000);
+  final writer = BufferWriter();
+  writer.writeByte(cmdSendTxtMsg);
+  writer.writeByte(txtTypePlain);
+  writer.writeByte(attempt.clamp(0, 3));
+  writer.writeUInt32LE(timestamp);
+  writer.writeBytes(recipientPubKey.sublist(0, 6));
+  writer.writeString(text);
+  writer.writeByte(0);
+  return writer.toBytes();
 }

 // 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;
+  final writer = BufferWriter();
+  writer.writeByte(cmdSendChannelTxtMsg);
+  writer.writeByte(txtTypePlain);
+  writer.writeByte(channelIndex);
+  writer.writeUInt32LE(timestamp);
+  writer.writeString(text);
+  writer.writeByte(0);
+  return writer.toBytes();
 }

 // 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;
+  final writer = BufferWriter();
+  writer.writeByte(cmdRemoveContact);
+  writer.writeBytes(pubKey);
+  return writer.toBytes();
 }

 // Build CMD_APP_START frame
@@ -334,14 +545,13 @@ Uint8List buildAppStartFrame({
  String appName = 'MeshCoreOpen',
  int appVersion = 1,
 }) {
-  final nameBytes = utf8.encode(appName);
-  final frame = Uint8List(8 + nameBytes.length + 1);
-  frame[0] = cmdAppStart;
-  frame[1] = appVersion;
-  // bytes 2-7 are reserved (zeros)
-  frame.setRange(8, 8 + nameBytes.length, nameBytes);
-  frame[frame.length - 1] = 0; // null terminator
-  return frame;
+  final writer = BufferWriter();
+  writer.writeByte(cmdAppStart);
+  writer.writeByte(appVersion);
+  writer.writeBytes(Uint8List(6)); // reserved bytes
+  writer.writeString(appName);
+  writer.writeByte(0);
+  return writer.toBytes();
 }

 // Build CMD_DEVICE_QUERY frame
@@ -361,10 +571,10 @@ Uint8List buildGetBattAndStorageFrame() {

 // Build CMD_SET_DEVICE_TIME frame
 Uint8List buildSetDeviceTimeFrame(int timestamp) {
-  final frame = Uint8List(5);
-  frame[0] = cmdSetDeviceTime;
-  writeUint32LE(frame, 1, timestamp);
-  return frame;
+  final writer = BufferWriter();
+  writer.writeByte(cmdSetDeviceTime);
+  writer.writeUInt32LE(timestamp);
+  return writer.toBytes();
 }

 // Build CMD_SEND_SELF_ADVERT frame
@@ -377,21 +587,31 @@ Uint8List buildSendSelfAdvertFrame({bool flood = false}) {
 // Format: [cmd][name...]
 Uint8List buildSetAdvertNameFrame(String name) {
  final nameBytes = utf8.encode(name);
-  final nameLen = nameBytes.length < maxNameSize ? nameBytes.length : maxNameSize - 1;
-  final frame = Uint8List(1 + nameLen);
-  frame[0] = cmdSetAdvertName;
-  frame.setRange(1, 1 + nameLen, nameBytes.sublist(0, nameLen));
-  return frame;
+  final nameLen = nameBytes.length < maxNameSize
+      ? nameBytes.length
+      : maxNameSize - 1;
+  final writer = BufferWriter();
+  writer.writeByte(cmdSetAdvertName);
+  writer.writeBytes(Uint8List.fromList(nameBytes.sublist(0, nameLen)));
+  return writer.toBytes();
 }

 // Build CMD_SET_ADVERT_LATLON frame
 // Format: [cmd][lat x4][lon x4]
 Uint8List buildSetAdvertLatLonFrame(double lat, double lon) {
-  final frame = Uint8List(9);
-  frame[0] = cmdSetAdvertLatLon;
-  writeInt32LE(frame, 1, (lat * 1000000).round());
-  writeInt32LE(frame, 5, (lon * 1000000).round());
-  return frame;
+  final writer = BufferWriter();
+  writer.writeByte(cmdSetAdvertLatLon);
+  writer.writeInt32LE((lat * 1000000).round());
+  writer.writeInt32LE((lon * 1000000).round());
+  return writer.toBytes();
+}
+
+Uint8List buildSetCustomVarFrame(String value) {
+  final writer = BufferWriter();
+  writer.writeByte(cmdSetCustomVar);
+  writer.writeString(value);
+  writer.writeByte(0);
+  return writer.toBytes();
 }

 // Build CMD_REBOOT frame
@@ -413,37 +633,44 @@ Uint8List buildGetChannelFrame(int 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)
+  final writer = BufferWriter();
+  writer.writeByte(cmdSetChannel);
+  writer.writeByte(channelIndex);
+  writer.writeCString(name, 32);
+  // Write PSK (16 bytes, zero-padded)
+  final pskPadded = Uint8List(16);
  for (int i = 0; i < 16 && i < psk.length; i++) {
-    frame[34 + i] = psk[i];
+    pskPadded[i] = psk[i];
  }
-  return frame;
+  writer.writeBytes(pskPadded);
+  return writer.toBytes();
 }

 // Build CMD_SET_RADIO_PARAMS frame
-// Format: [cmd][freq x4][bw x4][sf][cr]
+// Format: [cmd][freq x4][bw x4][sf][cr] (pre-v9)
+//         [cmd][freq x4][bw x4][sf][cr][repeat] (firmware v9+)
 // 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;
+// clientRepeat: enable off-grid packet repeat (firmware v9+, omit for older)
+Uint8List buildSetRadioParamsFrame(
+  int freqHz,
+  int bwHz,
+  int sf,
+  int cr, {
+  bool? clientRepeat,
+}) {
+  final writer = BufferWriter();
+  writer.writeByte(cmdSetRadioParams);
+  writer.writeUInt32LE(freqHz);
+  writer.writeUInt32LE(bwHz);
+  writer.writeByte(sf);
+  writer.writeByte(cr);
+  if (clientRepeat != null) {
+    writer.writeByte(clientRepeat ? 1 : 0);
+  }
+  return writer.toBytes();
 }

 // Build CMD_SET_RADIO_TX_POWER frame
@@ -455,71 +682,81 @@ Uint8List buildSetRadioTxPowerFrame(int 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;
+  final writer = BufferWriter();
+  writer.writeByte(cmdResetPath);
+  writer.writeBytes(pubKey);
+  return writer.toBytes();
 }

 // 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]
+// Format: [cmd][pub_key x32][type][flags][path_len][path x64][name x32][Lat? x4, Lon? x4][timestamp? x4]
 Uint8List buildUpdateContactPathFrame(
  Uint8List pubKey,
-  Uint8List customPath,
+  Uint8List path,
  int pathLen, {
  int type = 1, // ADV_TYPE_CHAT
  int flags = 0,
  String name = '',
+  double? lat,
+  double? lon,
+  DateTime? lastModified,
 }) {
-  // 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;
+  final writer = BufferWriter();
+  writer.writeByte(cmdAddUpdateContact);
+  writer.writeBytes(pubKey);
+  writer.writeByte(type);
+  writer.writeByte(flags);
+  writer.writeByte(pathLen);

-  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;
+  writer.writeBytesPadded(path, 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;
+  writer.writeCString(name, maxNameSize);

-  // Timestamp (current time)
+  // Timestamp
  final timestamp = DateTime.now().millisecondsSinceEpoch ~/ 1000;
-  writeUint32LE(frame, offset, timestamp);
+  writer.writeUInt32LE(timestamp);

-  return frame;
+  if ((lat == null || lon == null) && lastModified != null) {
+    // If lat/lon not provided, write zeros
+    writer.writeInt32LE(0);
+    writer.writeInt32LE(0);
+  } else {
+    // Latitude and Longitude are expected in degrees, convert to int by multiplying by 1e6
+    // Latitude
+    final latitude = lat ?? 0.0;
+    writer.writeInt32LE((latitude * 1e6).round());
+
+    // Longitude
+    final longitude = lon ?? 0.0;
+    writer.writeInt32LE((longitude * 1e6).round());
+  }
+
+  if (lastModified != null) {
+    // Last modified
+    final lastModifiedTimestamp = lastModified.millisecondsSinceEpoch ~/ 1000;
+    writer.writeUInt32LE(lastModifiedTimestamp);
+  }
+
+  return writer.toBytes();
 }

 // Build CMD_GET_CONTACT_BY_KEY frame
 // Format: [cmd][pub_key x32]
 Uint8List buildGetContactByKeyFrame(Uint8List pubKey) {
-  final frame = Uint8List(1 + pubKeySize);
-  frame[0] = cmdGetContactByKey;
-  frame.setRange(1, 1 + pubKeySize, pubKey);
-  return frame;
+  final writer = BufferWriter();
+  writer.writeByte(cmdGetContactByKey);
+  writer.writeBytes(pubKey);
+  return writer.toBytes();
 }

-// Build CMD_GET_RADIO_SETTINGS frame
-Uint8List buildGetRadioSettingsFrame() {
-  return Uint8List.fromList([cmdGetRadioSettings]);
+//Build CMD_GET_CUSTOM_VARS frame
+Uint8List buildGetCustomVarsFrame() {
+  return Uint8List.fromList([cmdGetCustomVar]);
+}
+
+Uint8List buildGetAutoAddFlagsFrame() {
+  return Uint8List.fromList([cmdGetAutoAddConfig]);
 }

 // Calculate LoRa airtime for a packet
@@ -545,9 +782,11 @@ int calculateLoRaAirtime({
  final crc = 1; // CRC enabled
  final de = lowDataRateOptimize ? 1 : 0;

-  final numerator = 8 * payloadBytes - 4 * spreadingFactor + 28 + 16 * crc - headerBytes;
+  final numerator =
+      8 * payloadBytes - 4 * spreadingFactor + 28 + 16 * crc - headerBytes;
  final denominator = 4 * (spreadingFactor - 2 * de);
-  var payloadSymbols = 8 + ((numerator / denominator).ceil()) * (codingRate + 4);
+  var payloadSymbols =
+      8 + ((numerator / denominator).ceil()) * (codingRate + 4);

  if (payloadSymbols < 0) {
    payloadSymbols = 8;
@@ -592,23 +831,109 @@ Uint8List buildSendCliCommandFrame(
  Uint8List repeaterPubKey,
  String command, {
  int attempt = 0,
+  int? timestampSeconds,
 }) {
-  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;
+  final timestamp =
+      timestampSeconds ?? (DateTime.now().millisecondsSinceEpoch ~/ 1000);
+  final writer = BufferWriter();
+  writer.writeByte(cmdSendTxtMsg);
+  writer.writeByte(txtTypeCliData);
+  writer.writeByte(attempt.clamp(0, 3));
+  writer.writeUInt32LE(timestamp);
+  writer.writeBytes(repeaterPubKey.sublist(0, 6));
+  writer.writeString(command);
+  writer.writeByte(0);
+  return writer.toBytes();
+}
+
+// Build a telemetry request frame
+// Format: [cmd][pub_key x32][payload]
+Uint8List buildSendBinaryReq(Uint8List repeaterPubKey, {Uint8List? payload}) {
+  final writer = BufferWriter();
+  writer.writeByte(cmdSendBinaryReq);
+  writer.writeBytes(repeaterPubKey);
+  if (payload != null && payload.isNotEmpty) {
+    writer.writeBytes(payload);
+  }
+  return writer.toBytes();
+}
+
+//Build a trace request frame
+//[cmd][tag x4][auth x4][flag][payload]
+Uint8List buildTraceReq(int tag, int auth, int flag, {Uint8List? payload}) {
+  final writer = BufferWriter();
+  writer.writeByte(cmdSendTracePath);
+  writer.writeUInt32LE(tag);
+  writer.writeUInt32LE(auth);
+  writer.writeByte(flag);
+  if (payload != null && payload.isNotEmpty) {
+    writer.writeBytes(payload);
+  }
+  return writer.toBytes();
+}
+
+// Build a export contact frame
+// [cmd][pub_key x32 / if empty exports your contact info]
+Uint8List buildExportContactFrame(Uint8List pubKey) {
+  final writer = BufferWriter();
+  writer.writeByte(cmdExportContact);
+  writer.writeBytes(pubKey);
+  return writer.toBytes();
+}
+
+// Build a import contact frame
+// [cmd][contact_frame x98+]
+Uint8List buildImportContactFrame(Uint8List contactFrame) {
+  final writer = BufferWriter();
+  writer.writeByte(cmdImportContact);
+  writer.writeBytes(contactFrame);
+  return writer.toBytes();
+}
+
+// Build a export contact frame
+// [cmd][pub_key x32]
+Uint8List buildZeroHopContact(Uint8List pubKey) {
+  final writer = BufferWriter();
+  writer.writeByte(cmdShareContact);
+  writer.writeBytes(pubKey);
+  return writer.toBytes();
+}
+
+// Build CMD_SET_OTHER_PARAMS frame
+// Format: [cmd][allowTelemetryFlags][advertLocationPolicy][multiAcks]
+Uint8List buildSetOtherParamsFrame(
+  int allowTelemetryFlags,
+  int advertLocationPolicy,
+  int multiAcks,
+) {
+  final writer = BufferWriter();
+  writer.writeByte(cmdSetOtherParams);
+  //Going forward the app will just set Auto Add Contacts to disabled, and use the filter flags
+  //Allow Auto Add Contacts use inverted logic (0x01 = disabled, 0x00 = enabled).
+  writer.writeByte(0x01);
+  writer.writeByte(allowTelemetryFlags); // Allow Telemetry Flags
+  writer.writeByte(advertLocationPolicy); // Advertisement Location Policy
+  writer.writeByte(multiAcks); // Multi Acknowledgements
+  return writer.toBytes();
+}
+
+// Build CMD_SET_AUTO_ADD_CONFIG frame
+// Format: [cmd][flags]
+Uint8List buildSetAutoAddConfigFrame({
+  required bool autoAddChat,
+  required bool autoAddRepeater,
+  required bool autoAddRoomServer,
+  required bool autoAddSensor,
+  required bool overwriteOldest,
+}) {
+  final writer = BufferWriter();
+  writer.writeByte(cmdSetAutoAddConfig);
+  int flags = 0;
+  if (autoAddChat) flags |= autoAddChatFlag;
+  if (autoAddRepeater) flags |= autoAddRepeaterFlag;
+  if (autoAddRoomServer) flags |= autoAddRoomServerFlag;
+  if (autoAddSensor) flags |= autoAddSensorFlag;
+  if (overwriteOldest) flags |= autoAddOverwriteOldestFlag;
+  writer.writeByte(flags);
+  return writer.toBytes();
 }
@@ -0,0 +1,277 @@
+import 'dart:typed_data';
+import 'package:meshcore_open/utils/app_logger.dart';
+
+import '../connector/meshcore_protocol.dart';
+
+class CayenneLpp {
+  static const int lppDigitalInput = 0; // 1 byte
+  static const int lppDigitalOutput = 1; // 1 byte
+  static const int lppAnalogInput = 2; // 2 bytes, 0.01 signed
+  static const int lppAnalogOutput = 3; // 2 bytes, 0.01 signed
+  static const int lppGenericSensor = 100; // 4 bytes, unsigned
+  static const int lppLuminosity = 101; // 2 bytes, 1 lux unsigned
+  static const int lppPresence = 102; // 1 byte, bool
+  static const int lppTemperature = 103; // 2 bytes, 0.1°C signed
+  static const int lppRelativeHumidity = 104; // 1 byte, 0.5% unsigned
+  static const int lppAccelerometer = 113; // 2 bytes per axis, 0.001G
+  static const int lppBarometricPressure = 115; // 2 bytes 0.1hPa unsigned
+  static const int lppVoltage = 116; // 2 bytes 0.01V unsigned
+  static const int lppCurrent = 117; // 2 bytes 0.001A unsigned
+  static const int lppFrequency = 118; // 4 bytes 1Hz unsigned
+  static const int lppPercentage = 120; // 1 byte 1-100% unsigned
+  static const int lppAltitude = 121; // 2 byte 1m signed
+  static const int lppConcentration = 125; // 2 bytes, 1 ppm unsigned
+  static const int lppPower = 128; // 2 byte, 1W, unsigned
+  static const int lppDistance = 130; // 4 byte, 0.001m, unsigned
+  static const int lppEnergy = 131; // 4 byte, 0.001kWh, unsigned
+  static const int lppDirection = 132; // 2 bytes, 1deg, unsigned
+  static const int lppUnixTime = 133; // 4 bytes, unsigned
+  static const int lppGyrometer = 134; // 2 bytes per axis, 0.01 °/s
+  static const int lppColour = 135; // 1 byte per RGB Color
+  static const int lppGps =
+      136; // 3 byte lon/lat 0.0001 °, 3 bytes alt 0.01 meter
+  static const int lppSwitch = 142; // 1 byte, 0/1
+  static const int lppPolyline =
+      240; // 1 byte size, 1 byte delta factor, 3 byte lon/lat 0.0001° * factor, n (size-8) bytes deltas
+
+  final BufferWriter _writer = BufferWriter();
+
+  Uint8List toBytes() {
+    return _writer.toBytes();
+  }
+
+  void addDigitalInput(int channel, int value) {
+    _writer.writeByte(channel);
+    _writer.writeByte(lppDigitalInput);
+    _writer.writeByte(value);
+  }
+
+  void addTemperature(int channel, double value) {
+    _writer.writeByte(channel);
+    _writer.writeByte(lppTemperature);
+    final val = (value * 10).toInt();
+    _writer.writeBytes(_int16ToBE(val));
+  }
+
+  void addVoltage(int channel, double value) {
+    _writer.writeByte(channel);
+    _writer.writeByte(lppVoltage);
+    final val = (value * 100).toInt();
+    _writer.writeBytes(_int16ToBE(val));
+  }
+
+  void addGps(int channel, double lat, double lon, double alt) {
+    _writer.writeByte(channel);
+    _writer.writeByte(lppGps);
+    _writer.writeBytes(_int24ToBE((lat * 10000).toInt()));
+    _writer.writeBytes(_int24ToBE((lon * 10000).toInt()));
+    _writer.writeBytes(_int24ToBE((alt * 100).toInt()));
+  }
+
+  Uint8List _int16ToBE(int value) {
+    final bytes = Uint8List(2);
+    final data = ByteData.view(bytes.buffer);
+    data.setInt16(0, value, Endian.big);
+    return bytes;
+  }
+
+  Uint8List _int24ToBE(int value) {
+    final bytes = Uint8List(3);
+    bytes[0] = (value >> 16) & 0xFF;
+    bytes[1] = (value >> 8) & 0xFF;
+    bytes[2] = value & 0xFF;
+    return bytes;
+  }
+
+  static List<Map<String, dynamic>> parse(Uint8List bytes) {
+    final buffer = BufferReader(bytes);
+    final telemetry = <Map<String, dynamic>>[];
+    try {
+      while (buffer.remaining >= 2) {
+        final channel = buffer.readUInt8();
+        final type = buffer.readUInt8();
+
+        if (channel == 0 && type == 0) {
+          break;
+        }
+
+        switch (type) {
+          case lppGenericSensor:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readUInt32BE(),
+            });
+            break;
+          case lppLuminosity:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readUInt16BE(),
+            });
+            break;
+          case lppPresence:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readUInt8(),
+            });
+            break;
+          case lppTemperature:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readInt16BE() / 10,
+            });
+            break;
+          case lppRelativeHumidity:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readUInt8() / 2,
+            });
+            break;
+          case lppBarometricPressure:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readUInt16BE() / 10,
+            });
+            break;
+          case lppVoltage:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readInt16BE() / 100,
+            });
+            break;
+          case lppCurrent:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readInt16BE() / 1000,
+            });
+            break;
+          case lppPercentage:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readUInt8(),
+            });
+            break;
+          case lppConcentration:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readUInt16BE(),
+            });
+            break;
+          case lppPower:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readUInt16BE(),
+            });
+            break;
+          case lppGps:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': {
+                'latitude': buffer.readInt24BE() / 10000,
+                'longitude': buffer.readInt24BE() / 10000,
+                'altitude': buffer.readInt24BE() / 100,
+              },
+            });
+            break;
+          default:
+            return telemetry;
+        }
+      }
+      return telemetry;
+    } catch (e) {
+      // Handle parsing errors, possibly due to malformed data
+      appLogger.error('Error parsing Cayenne LPP data: $e');
+      // Return any telemetry parsed so far to preserve partial data
+      return telemetry;
+    }
+  }
+
+  static List<Map<String, dynamic>> parseByChannel(Uint8List bytes) {
+    final buffer = BufferReader(bytes);
+    final Map<int, Map<String, dynamic>> channels = {};
+    try {
+      while (buffer.remaining >= 2) {
+        final channel = buffer.readUInt8();
+        final type = buffer.readUInt8();
+
+        // Optional: stop on padding (00 00)
+        if (channel == 0 && type == 0) {
+          break;
+        }
+
+        final channelData = channels.putIfAbsent(
+          channel,
+          () => {'channel': channel, 'values': <String, dynamic>{}},
+        );
+
+        switch (type) {
+          case lppGenericSensor:
+            channelData['values']['generic'] = buffer.readUInt32BE();
+            break;
+          case lppLuminosity:
+            channelData['values']['luminosity'] = buffer.readUInt16BE();
+            break;
+          case lppPresence:
+            channelData['values']['presence'] = buffer.readUInt8() != 0;
+            break;
+          case lppTemperature:
+            channelData['values']['temperature'] = buffer.readInt16BE() / 10.0;
+            break;
+          case lppRelativeHumidity:
+            channelData['values']['humidity'] = buffer.readUInt8() / 2.0;
+            break;
+          case lppBarometricPressure:
+            channelData['values']['pressure'] = buffer.readUInt16BE() / 10.0;
+            break;
+          case lppVoltage:
+            channelData['values']['voltage'] = buffer.readInt16BE() / 100.0;
+            break;
+          case lppCurrent:
+            channelData['values']['current'] = buffer.readInt16BE() / 1000.0;
+            break;
+          case lppPercentage:
+            channelData['values']['percentage'] = buffer.readUInt8();
+            break;
+          case lppConcentration:
+            channelData['values']['concentration'] = buffer.readUInt16BE();
+            break;
+          case lppPower:
+            channelData['values']['power'] = buffer.readUInt16BE();
+            break;
+          case lppGps:
+            channelData['values']['gps'] = {
+              'latitude': buffer.readInt24BE() / 10000.0,
+              'longitude': buffer.readInt24BE() / 10000.0,
+              'altitude': buffer.readInt24BE() / 100.0,
+            };
+            break;
+          // Add more types as needed...
+          default:
+            //Stopped parsing to avoid misalignment
+            return channels.values.toList();
+        }
+      }
+
+      final List<Map<String, dynamic>> channelsOut = channels.values.toList();
+      channelsOut.sort((a, b) => a['channel'].compareTo(b['channel']));
+      return channelsOut;
+    } catch (e) {
+      // Handle parsing errors, possibly due to malformed data
+      appLogger.error('Error parsing Cayenne LPP data: $e');
+      return <
+        Map<String, dynamic>
+      >[]; // Return an empty list on error to avoid crashing the app
+    }
+  }
+}
@@ -0,0 +1,68 @@
+import 'package:flutter/material.dart';
+
+class ChatScrollController extends ScrollController {
+  final ValueNotifier<bool> showJumpToBottom = ValueNotifier(false);
+  VoidCallback? onScrollNearTop;
+
+  static const _bottomThreshold = 100.0;
+  static const _topThreshold = 50.0;
+
+  ChatScrollController() {
+    addListener(_handleScroll);
+  }
+
+  void _handleScroll() {
+    if (!hasClients) return;
+    final pos = position;
+
+    // With reverse: true, position 0 is bottom, maxScrollExtent is top
+    // Show jump button when scrolled away from bottom (position > threshold)
+    final isAtBottom = pos.pixels <= _bottomThreshold;
+    if (showJumpToBottom.value == isAtBottom) {
+      showJumpToBottom.value = !isAtBottom;
+    }
+
+    // Pagination trigger when scrolled near top (maxScrollExtent)
+    if (pos.pixels >= pos.maxScrollExtent - _topThreshold) {
+      onScrollNearTop?.call();
+    }
+  }
+
+  void jumpToBottom() {
+    if (hasClients && position.maxScrollExtent > 0) {
+      animateTo(
+        0, // With reverse: true, position 0 is bottom
+        duration: const Duration(milliseconds: 300),
+        curve: Curves.easeOut,
+      );
+    }
+  }
+
+  void handleKeyboardOpen() {
+    // Simple: just scroll to bottom when keyboard opens
+    if (hasClients) {
+      animateTo(
+        0, // With reverse: true, position 0 is bottom
+        duration: const Duration(milliseconds: 200),
+        curve: Curves.easeOut,
+      );
+    }
+  }
+
+  void scrollToBottomIfAtBottom() {
+    // Only scroll if jump button is NOT showing (i.e., already at bottom)
+    if (!showJumpToBottom.value && hasClients && position.maxScrollExtent > 0) {
+      animateTo(
+        0, // With reverse: true, position 0 is bottom
+        duration: const Duration(milliseconds: 200),
+        curve: Curves.easeOut,
+      );
+    }
+  }
+
+  @override
+  void dispose() {
+    showJumpToBottom.dispose();
+    super.dispose();
+  }
+}
@@ -0,0 +1,73 @@
+import 'package:flutter/material.dart';
+import 'package:url_launcher/url_launcher.dart';
+import '../l10n/l10n.dart';
+
+class LinkHandler {
+  static Future<void> handleLinkTap(BuildContext context, String url) async {
+    // Show confirmation dialog
+    final shouldOpen = await showDialog<bool>(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: Text(context.l10n.chat_openLink),
+        content: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(
+              context.l10n.chat_openLinkConfirmation,
+              style: const TextStyle(fontSize: 14),
+            ),
+            const SizedBox(height: 16),
+            Container(
+              padding: const EdgeInsets.all(12),
+              decoration: BoxDecoration(
+                color: Theme.of(context).colorScheme.surfaceContainerHighest,
+                borderRadius: BorderRadius.circular(8),
+              ),
+              child: SelectableText(
+                url,
+                style: const TextStyle(fontSize: 12, fontFamily: 'monospace'),
+              ),
+            ),
+          ],
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.pop(context, false),
+            child: Text(context.l10n.common_cancel),
+          ),
+          FilledButton(
+            onPressed: () => Navigator.pop(context, true),
+            child: Text(context.l10n.chat_open),
+          ),
+        ],
+      ),
+    );
+
+    if (shouldOpen != true) return;
+
+    // Launch URL
+    try {
+      final uri = Uri.parse(url);
+      if (!await launchUrl(uri, mode: LaunchMode.externalApplication)) {
+        if (context.mounted) {
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(
+              content: Text(context.l10n.chat_couldNotOpenLink(url)),
+              backgroundColor: Colors.red,
+            ),
+          );
+        }
+      }
+    } catch (e) {
+      if (context.mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text(context.l10n.chat_invalidLink),
+            backgroundColor: Colors.red,
+          ),
+        );
+      }
+    }
+  }
+}
@@ -1,53 +1,68 @@
-class ReactionInfo {
-  final String targetMessageId;
-  final String emoji;
-  final String? reactionKey; // Lightweight key for deduplication: timestamp_senderPrefix
+import '../widgets/emoji_picker.dart';

-  ReactionInfo({
-    required this.targetMessageId,
-    required this.emoji,
-    this.reactionKey,
-  });
+class ReactionInfo {
+  final String targetHash;
+  final String emoji;
+
+  ReactionInfo({required this.targetHash, required this.emoji});
 }

 class ReactionHelper {
-  /// Parse reaction format: r:[messageId]:[emoji]
-  /// Supports both old format (full messageId) and new format (timestamp_senderPrefix)
+  static List<String>? _cachedEmojis;
+
+  /// Combined list of all reaction emojis in fixed order.
+  /// Order must stay stable for index compatibility.
+  static List<String> get reactionEmojis {
+    return _cachedEmojis ??= [
+      ...EmojiPicker.quickEmojis,
+      ...EmojiPicker.smileys,
+      ...EmojiPicker.gestures,
+      ...EmojiPicker.hearts,
+      ...EmojiPicker.objects,
+    ];
+  }
+
+  /// Convert emoji to 2-char hex index. Returns null if emoji not in list.
+  static String? emojiToIndex(String emoji) {
+    final idx = reactionEmojis.indexOf(emoji);
+    if (idx < 0) return null;
+    return idx.toRadixString(16).padLeft(2, '0');
+  }
+
+  /// Convert 2-char hex index to emoji. Returns null if invalid index.
+  static String? indexToEmoji(String hexIndex) {
+    final idx = int.tryParse(hexIndex, radix: 16);
+    if (idx == null || idx < 0 || idx >= reactionEmojis.length) return null;
+    return reactionEmojis[idx];
+  }
+
+  /// Compute a 4-char hex hash for a message reaction.
+  /// Hash input: timestampSeconds + [senderName] + first 5 chars of text
+  /// For 1:1 chats, senderName can be null (sender is implicit).
+  static String computeReactionHash(
+    int timestampSeconds,
+    String? senderName,
+    String text,
+  ) {
+    final first5 = text.length >= 5 ? text.substring(0, 5) : text;
+    final input = senderName != null
+        ? '$timestampSeconds$senderName$first5'
+        : '$timestampSeconds$first5';
+    // Use hashCode and take lower 16 bits, format as 4 hex chars
+    final hash = input.hashCode & 0xFFFF;
+    return hash.toRadixString(16).padLeft(4, '0');
+  }
+
+  /// Parse reaction format: r:HASH:INDEX (where INDEX is 2-char hex emoji index)
+  /// Returns null if text is not a valid reaction format
  static ReactionInfo? parseReaction(String text) {
-    final regex = RegExp(r'^r:([^:]+):(.+)$');
+    final regex = RegExp(r'^r:([0-9a-f]{4}):([0-9a-f]{2})$');
    final match = regex.firstMatch(text);
    if (match == null) return null;

-    final targetId = match.group(1)!;
-    final emoji = match.group(2)!;
+    final emoji = indexToEmoji(match.group(2)!);
+    if (emoji == null) return null;

-    // Extract reaction key for deduplication
-    // If targetId is in new format (timestamp_senderPrefix), use it directly
-    // Otherwise, extract timestamp from old format (timestamp_nameHash_textHash)
-    String? reactionKey;
-    if (targetId.contains('_')) {
-      final parts = targetId.split('_');
-      if (parts.length >= 2) {
-        // New format: timestamp_senderPrefix, or old format with at least timestamp
-        reactionKey = '${parts[0]}_${parts[1]}';
-      }
-    }
-
-    return ReactionInfo(
-      targetMessageId: targetId,
-      emoji: emoji,
-      reactionKey: reactionKey,
-    );
-  }
-
-  /// Generate a lightweight reaction key for a message
-  /// Format: r:[timestamp]_[senderPrefix]:[emoji]
-  static String buildReactionText(String timestamp, String senderPrefix, String emoji) {
-    return 'r:${timestamp}_$senderPrefix:$emoji';
-  }
-
-  /// Extract sender prefix from public key hex (first 8 chars)
-  static String getSenderPrefix(String senderKeyHex) {
-    return senderKeyHex.substring(0, 8);
+    return ReactionInfo(targetHash: match.group(1)!, emoji: emoji);
  }
 }
@@ -262,8 +262,9 @@ class Smaz {
    ".com",
  ];

-  static final List<Uint8List> _rcbBytes =
-      _rcb.map((s) => Uint8List.fromList(ascii.encode(s))).toList(growable: false);
+  static final List<Uint8List> _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;
  });
@@ -358,24 +359,32 @@ class Smaz {
      final code = input[index];
      if (code == _verbatimSingle) {
        if (index + 1 >= input.length) {
-          throw const FormatException('Invalid SMAZ stream: truncated verbatim byte.');
+          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.');
+          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.');
+          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.');
+          throw const FormatException(
+            'Invalid SMAZ stream: code out of range.',
+          );
        }
        out.add(_rcbBytes[code]);
        index += 1;
@@ -8,7 +8,10 @@ class Utf8LengthLimitingTextInputFormatter extends TextInputFormatter {
  const Utf8LengthLimitingTextInputFormatter(this.maxBytes);

  @override
-  TextEditingValue formatEditUpdate(TextEditingValue oldValue, TextEditingValue newValue) {
+  TextEditingValue formatEditUpdate(
+    TextEditingValue oldValue,
+    TextEditingValue newValue,
+  ) {
    if (maxBytes <= 0) return oldValue;
    final bytes = utf8.encode(newValue.text);
    if (bytes.length <= maxBytes) return newValue;
@@ -0,0 +1,22 @@
+import 'package:flutter/material.dart';
+import 'package:material_symbols_icons/material_symbols_icons.dart';
+
+class LosIcon extends StatelessWidget {
+  final double size;
+  final Color? color;
+
+  const LosIcon({super.key, this.size = 24, this.color});
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final iconTheme = IconTheme.of(context);
+    final iconColor =
+        color ??
+        iconTheme.color ??
+        theme.iconTheme.color ??
+        theme.colorScheme.onSurface;
+
+    return Icon(Symbols.elevation, size: size, color: iconColor);
+  }
+}
@@ -0,0 +1,6 @@
+import 'package:flutter/widgets.dart';
+import 'app_localizations.dart';
+
+extension LocalizationExtension on BuildContext {
+  AppLocalizations get l10n => AppLocalizations.of(this);
+}
@@ -1,6 +1,12 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:flutter/foundation.dart';
+import 'l10n/app_localizations.dart';
 import 'package:provider/provider.dart';

+import 'screens/chrome_required_screen.dart';
+import 'utils/platform_info.dart';
+
 import 'connector/meshcore_connector.dart';
 import 'screens/scanner_screen.dart';
 import 'services/storage_service.dart';
@@ -9,9 +15,12 @@ import 'services/path_history_service.dart';
 import 'services/app_settings_service.dart';
 import 'services/notification_service.dart';
 import 'services/ble_debug_log_service.dart';
+import 'services/app_debug_log_service.dart';
 import 'services/background_service.dart';
 import 'services/map_tile_cache_service.dart';
+import 'services/chat_text_scale_service.dart';
 import 'storage/prefs_manager.dart';
+import 'utils/app_logger.dart';

 void main() async {
  WidgetsFlutterBinding.ensureInitialized();
@@ -23,19 +32,30 @@ void main() async {
  final storage = StorageService();
  final connector = MeshCoreConnector();
  final pathHistoryService = PathHistoryService(storage);
-  final retryService = MessageRetryService(storage);
+  final retryService = MessageRetryService();
  final appSettingsService = AppSettingsService();
  final bleDebugLogService = BleDebugLogService();
+  final appDebugLogService = AppDebugLogService();
  final backgroundService = BackgroundService();
  final mapTileCacheService = MapTileCacheService();
+  final chatTextScaleService = ChatTextScaleService();

  // Load settings
  await appSettingsService.loadSettings();

+  // Initialize app logger
+  appLogger.initialize(
+    appDebugLogService,
+    enabled: appSettingsService.settings.appDebugLogEnabled,
+  );
+
  // Initialize notification service
  final notificationService = NotificationService();
  await notificationService.initialize();
  await backgroundService.initialize();
+  _registerThirdPartyLicenses();
+
+  await chatTextScaleService.initialize();

  // Wire up connector with services
  connector.initialize(
@@ -43,25 +63,52 @@ void main() async {
    pathHistoryService: pathHistoryService,
    appSettingsService: appSettingsService,
    bleDebugLogService: bleDebugLogService,
+    appDebugLogService: appDebugLogService,
    backgroundService: backgroundService,
  );

  await connector.loadContactCache();
  await connector.loadChannelSettings();
+  await connector.loadCachedChannels();

  // Load persisted channel messages
  await connector.loadAllChannelMessages();
  await connector.loadUnreadState();

-  runApp(MeshCoreApp(
-    connector: connector,
-    retryService: retryService,
-    pathHistoryService: pathHistoryService,
-    storage: storage,
-    appSettingsService: appSettingsService,
-    bleDebugLogService: bleDebugLogService,
-    mapTileCacheService: mapTileCacheService,
-  ));
+  runApp(
+    MeshCoreApp(
+      connector: connector,
+      retryService: retryService,
+      pathHistoryService: pathHistoryService,
+      storage: storage,
+      appSettingsService: appSettingsService,
+      bleDebugLogService: bleDebugLogService,
+      appDebugLogService: appDebugLogService,
+      mapTileCacheService: mapTileCacheService,
+      chatTextScaleService: chatTextScaleService,
+    ),
+  );
+}
+
+void _registerThirdPartyLicenses() {
+  LicenseRegistry.addLicense(() async* {
+    yield const LicenseEntryWithLineBreaks(
+      <String>['Open-Meteo Elevation API Data'],
+      '''
+Data used by LOS elevation lookups is provided by Open-Meteo.
+
+Open-Meteo terms and attribution:
+https://open-meteo.com/en/terms
+
+Elevation API:
+https://open-meteo.com/en/docs/elevation-api
+
+Attribution license reference:
+Creative Commons Attribution 4.0 International (CC BY 4.0)
+https://creativecommons.org/licenses/by/4.0/
+''',
+    );
+  });
 }

 class MeshCoreApp extends StatelessWidget {
@@ -71,7 +118,9 @@ class MeshCoreApp extends StatelessWidget {
  final StorageService storage;
  final AppSettingsService appSettingsService;
  final BleDebugLogService bleDebugLogService;
+  final AppDebugLogService appDebugLogService;
  final MapTileCacheService mapTileCacheService;
+  final ChatTextScaleService chatTextScaleService;

  const MeshCoreApp({
    super.key,
@@ -81,7 +130,9 @@ class MeshCoreApp extends StatelessWidget {
    required this.storage,
    required this.appSettingsService,
    required this.bleDebugLogService,
+    required this.appDebugLogService,
    required this.mapTileCacheService,
+    required this.chatTextScaleService,
  });

  @override
@@ -93,6 +144,8 @@ class MeshCoreApp extends StatelessWidget {
        ChangeNotifierProvider.value(value: pathHistoryService),
        ChangeNotifierProvider.value(value: appSettingsService),
        ChangeNotifierProvider.value(value: bleDebugLogService),
+        ChangeNotifierProvider.value(value: appDebugLogService),
+        ChangeNotifierProvider.value(value: chatTextScaleService),
        Provider.value(value: storage),
        Provider.value(value: mapTileCacheService),
      ],
@@ -101,9 +154,22 @@ class MeshCoreApp extends StatelessWidget {
          return MaterialApp(
            title: 'MeshCore Open',
            debugShowCheckedModeBanner: false,
+            localizationsDelegates: const [
+              AppLocalizations.delegate,
+              GlobalMaterialLocalizations.delegate,
+              GlobalWidgetsLocalizations.delegate,
+              GlobalCupertinoLocalizations.delegate,
+            ],
+            supportedLocales: AppLocalizations.supportedLocales,
+            locale: _localeFromSetting(
+              settingsService.settings.languageOverride,
+            ),
            theme: ThemeData(
              colorScheme: ColorScheme.fromSeed(seedColor: Colors.blue),
              useMaterial3: true,
+              snackBarTheme: const SnackBarThemeData(
+                behavior: SnackBarBehavior.floating,
+              ),
            ),
            darkTheme: ThemeData(
              colorScheme: ColorScheme.fromSeed(
@@ -111,9 +177,22 @@ class MeshCoreApp extends StatelessWidget {
                brightness: Brightness.dark,
              ),
              useMaterial3: true,
+              snackBarTheme: const SnackBarThemeData(
+                behavior: SnackBarBehavior.floating,
+              ),
            ),
-            themeMode: _themeModeFromSetting(settingsService.settings.themeMode),
-            home: const ScannerScreen(),
+            themeMode: _themeModeFromSetting(
+              settingsService.settings.themeMode,
+            ),
+            builder: (context, child) {
+              // Update notification service with resolved locale
+              final locale = Localizations.localeOf(context);
+              NotificationService().setLocale(locale);
+              return child ?? const SizedBox.shrink();
+            },
+            home: (PlatformInfo.isWeb && !PlatformInfo.isChrome)
+                ? const ChromeRequiredScreen()
+                : const ScannerScreen(),
          );
        },
      ),
@@ -130,4 +209,9 @@ class MeshCoreApp extends StatelessWidget {
        return ThemeMode.system;
    }
  }
+
+  Locale? _localeFromSetting(String? languageCode) {
+    if (languageCode == null) return null;
+    return Locale(languageCode);
+  }
 }
@@ -1,3 +1,16 @@
+enum UnitSystem { metric, imperial }
+
+extension UnitSystemValue on UnitSystem {
+  String get value {
+    switch (this) {
+      case UnitSystem.imperial:
+        return 'imperial';
+      case UnitSystem.metric:
+        return 'metric';
+    }
+  }
+}
+
 class AppSettings {
  static const Object _unset = Object();

@@ -9,6 +22,8 @@ class AppSettings {
  final bool mapKeyPrefixEnabled;
  final String mapKeyPrefix;
  final bool mapShowMarkers;
+  final bool mapShowGuessedLocations;
+  final bool enableMessageTracing;
  final Map<String, double>? mapCacheBounds;
  final int mapCacheMinZoom;
  final int mapCacheMaxZoom;
@@ -18,7 +33,13 @@ class AppSettings {
  final bool notifyOnNewAdvert;
  final bool autoRouteRotationEnabled;
  final String themeMode;
+  final String? languageOverride; // null = system default
+  final bool appDebugLogEnabled;
  final Map<String, String> batteryChemistryByDeviceId;
+  final Map<String, String> batteryChemistryByRepeaterId;
+  final UnitSystem unitSystem;
+  final Set<String> mutedChannels;
+  final bool mapShowDiscoveryContacts;

  AppSettings({
    this.clearPathOnMaxRetry = false,
@@ -29,6 +50,8 @@ class AppSettings {
    this.mapKeyPrefixEnabled = false,
    this.mapKeyPrefix = '',
    this.mapShowMarkers = true,
+    this.mapShowGuessedLocations = true,
+    this.enableMessageTracing = false,
    this.mapCacheBounds,
    this.mapCacheMinZoom = 10,
    this.mapCacheMaxZoom = 15,
@@ -38,8 +61,16 @@ class AppSettings {
    this.notifyOnNewAdvert = true,
    this.autoRouteRotationEnabled = false,
    this.themeMode = 'system',
+    this.languageOverride,
+    this.appDebugLogEnabled = false,
    Map<String, String>? batteryChemistryByDeviceId,
-  }) : batteryChemistryByDeviceId = batteryChemistryByDeviceId ?? {};
+    Map<String, String>? batteryChemistryByRepeaterId,
+    this.unitSystem = UnitSystem.metric,
+    Set<String>? mutedChannels,
+    this.mapShowDiscoveryContacts = true,
+  }) : batteryChemistryByDeviceId = batteryChemistryByDeviceId ?? {},
+       batteryChemistryByRepeaterId = batteryChemistryByRepeaterId ?? {},
+       mutedChannels = mutedChannels ?? {};

  Map<String, dynamic> toJson() {
    return {
@@ -51,6 +82,8 @@ class AppSettings {
      'map_key_prefix_enabled': mapKeyPrefixEnabled,
      'map_key_prefix': mapKeyPrefix,
      'map_show_markers': mapShowMarkers,
+      'map_show_guessed_locations': mapShowGuessedLocations,
+      'enable_message_tracing': enableMessageTracing,
      'map_cache_bounds': mapCacheBounds,
      'map_cache_min_zoom': mapCacheMinZoom,
      'map_cache_max_zoom': mapCacheMaxZoom,
@@ -60,23 +93,40 @@ class AppSettings {
      'notify_on_new_advert': notifyOnNewAdvert,
      'auto_route_rotation_enabled': autoRouteRotationEnabled,
      'theme_mode': themeMode,
+      'language_override': languageOverride,
+      'app_debug_log_enabled': appDebugLogEnabled,
      'battery_chemistry_by_device_id': batteryChemistryByDeviceId,
+      'battery_chemistry_by_repeater_id': batteryChemistryByRepeaterId,
+      'unit_system': unitSystem.value,
+      'muted_channels': mutedChannels.toList(),
+      'map_show_discovery_contacts': mapShowDiscoveryContacts,
    };
  }

  factory AppSettings.fromJson(Map<String, dynamic> json) {
+    UnitSystem parseUnitSystem(dynamic value) {
+      if (value is String && value.toLowerCase() == 'imperial') {
+        return UnitSystem.imperial;
+      }
+      return UnitSystem.metric;
+    }
+
    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,
+      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,
+      mapShowGuessedLocations:
+          json['map_show_guessed_locations'] as bool? ?? true,
+      enableMessageTracing: json['enable_message_tracing'] as bool? ?? false,
      mapCacheBounds: (json['map_cache_bounds'] as Map?)?.map(
-            (key, value) => MapEntry(key.toString(), (value as num).toDouble()),
-          ),
+        (key, value) => MapEntry(key.toString(), (value as num).toDouble()),
+      ),
      mapCacheMinZoom: json['map_cache_min_zoom'] as int? ?? 10,
      mapCacheMaxZoom: json['map_cache_max_zoom'] as int? ?? 15,
      notificationsEnabled: json['notifications_enabled'] as bool? ?? true,
@@ -84,12 +134,29 @@ class AppSettings {
      notifyOnNewChannelMessage:
          json['notify_on_new_channel_message'] as bool? ?? true,
      notifyOnNewAdvert: json['notify_on_new_advert'] as bool? ?? true,
-      autoRouteRotationEnabled: json['auto_route_rotation_enabled'] as bool? ?? false,
+      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(
+      languageOverride: json['language_override'] as String?,
+      appDebugLogEnabled: json['app_debug_log_enabled'] as bool? ?? false,
+      batteryChemistryByDeviceId:
+          (json['battery_chemistry_by_device_id'] as Map?)?.map(
            (key, value) => MapEntry(key.toString(), value.toString()),
          ) ??
          {},
+      batteryChemistryByRepeaterId:
+          (json['battery_chemistry_by_repeater_id'] as Map?)?.map(
+            (key, value) => MapEntry(key.toString(), value.toString()),
+          ) ??
+          {},
+      unitSystem: parseUnitSystem(json['unit_system']),
+      mutedChannels:
+          ((json['muted_channels'] as List?)
+              ?.map((e) => e.toString())
+              .toSet()) ??
+          {},
+      mapShowDiscoveryContacts:
+          json['map_show_discovery_contacts'] as bool? ?? true,
    );
  }

@@ -102,6 +169,8 @@ class AppSettings {
    bool? mapKeyPrefixEnabled,
    String? mapKeyPrefix,
    bool? mapShowMarkers,
+    bool? mapShowGuessedLocations,
+    bool? enableMessageTracing,
    Object? mapCacheBounds = _unset,
    int? mapCacheMinZoom,
    int? mapCacheMaxZoom,
@@ -111,7 +180,13 @@ class AppSettings {
    bool? notifyOnNewAdvert,
    bool? autoRouteRotationEnabled,
    String? themeMode,
+    Object? languageOverride = _unset,
+    bool? appDebugLogEnabled,
    Map<String, String>? batteryChemistryByDeviceId,
+    Map<String, String>? batteryChemistryByRepeaterId,
+    UnitSystem? unitSystem,
+    Set<String>? mutedChannels,
+    bool? mapShowDiscoveryContacts,
  }) {
    return AppSettings(
      clearPathOnMaxRetry: clearPathOnMaxRetry ?? this.clearPathOnMaxRetry,
@@ -122,8 +197,12 @@ class AppSettings {
      mapKeyPrefixEnabled: mapKeyPrefixEnabled ?? this.mapKeyPrefixEnabled,
      mapKeyPrefix: mapKeyPrefix ?? this.mapKeyPrefix,
      mapShowMarkers: mapShowMarkers ?? this.mapShowMarkers,
-      mapCacheBounds:
-          mapCacheBounds == _unset ? this.mapCacheBounds : mapCacheBounds as Map<String, double>?,
+      mapShowGuessedLocations:
+          mapShowGuessedLocations ?? this.mapShowGuessedLocations,
+      enableMessageTracing: enableMessageTracing ?? this.enableMessageTracing,
+      mapCacheBounds: mapCacheBounds == _unset
+          ? this.mapCacheBounds
+          : mapCacheBounds as Map<String, double>?,
      mapCacheMinZoom: mapCacheMinZoom ?? this.mapCacheMinZoom,
      mapCacheMaxZoom: mapCacheMaxZoom ?? this.mapCacheMaxZoom,
      notificationsEnabled: notificationsEnabled ?? this.notificationsEnabled,
@@ -131,9 +210,21 @@ class AppSettings {
      notifyOnNewChannelMessage:
          notifyOnNewChannelMessage ?? this.notifyOnNewChannelMessage,
      notifyOnNewAdvert: notifyOnNewAdvert ?? this.notifyOnNewAdvert,
-      autoRouteRotationEnabled: autoRouteRotationEnabled ?? this.autoRouteRotationEnabled,
+      autoRouteRotationEnabled:
+          autoRouteRotationEnabled ?? this.autoRouteRotationEnabled,
      themeMode: themeMode ?? this.themeMode,
-      batteryChemistryByDeviceId: batteryChemistryByDeviceId ?? this.batteryChemistryByDeviceId,
+      languageOverride: languageOverride == _unset
+          ? this.languageOverride
+          : languageOverride as String?,
+      appDebugLogEnabled: appDebugLogEnabled ?? this.appDebugLogEnabled,
+      batteryChemistryByDeviceId:
+          batteryChemistryByDeviceId ?? this.batteryChemistryByDeviceId,
+      batteryChemistryByRepeaterId:
+          batteryChemistryByRepeaterId ?? this.batteryChemistryByRepeaterId,
+      unitSystem: unitSystem ?? this.unitSystem,
+      mutedChannels: mutedChannels ?? this.mutedChannels,
+      mapShowDiscoveryContacts:
+          mapShowDiscoveryContacts ?? this.mapShowDiscoveryContacts,
    );
  }
 }
@@ -1,16 +1,21 @@
+import 'dart:convert';
 import 'dart:typed_data';

+import 'package:crypto/crypto.dart' as crypto;
+
 import '../connector/meshcore_protocol.dart';

 class Channel {
  final int index;
  final String name;
  final Uint8List psk; // 16 bytes
+  int unreadCount;

  Channel({
    required this.index,
    required this.name,
    required this.psk,
+    this.unreadCount = 0,
  });

  String get pskHex => _bytesToHex(psk);
@@ -36,11 +41,7 @@ class Channel {
  }

  static Channel empty(int index) {
-    return Channel(
-      index: index,
-      name: '',
-      psk: Uint8List(16),
-    );
+    return Channel(index: index, name: '', psk: Uint8List(16));
  }

  static Channel fromHex(int index, String name, String pskHex) {
@@ -61,6 +62,44 @@ class Channel {
    return bytes;
  }

+  /// Derive PSK from hashtag name using SHA256.
+  /// The hashtag is normalized to include '#' prefix.
+  /// Returns first 16 bytes of SHA256 hash as PSK.
+  static Uint8List derivePskFromHashtag(String hashtag) {
+    final name = hashtag.startsWith('#') ? hashtag : '#$hashtag';
+    final hash = crypto.sha256.convert(utf8.encode(name)).bytes;
+    return Uint8List.fromList(hash.sublist(0, 16));
+  }
+
+  /// Derive PSK for community public channel using HMAC-SHA256.
+  /// PSK = HMAC-SHA256(K, "channel:v1:__public__")[:16]
+  ///
+  /// This creates a channel that is "public" only to members who have
+  /// the community secret. Outsiders see only opaque IDs.
+  static Uint8List deriveCommunityPublicPsk(Uint8List secret) {
+    final hmac = crypto.Hmac(crypto.sha256, secret);
+    final digest = hmac.convert(utf8.encode('channel:v1:__public__'));
+    return Uint8List.fromList(digest.bytes.sublist(0, 16));
+  }
+
+  /// Derive PSK for community hashtag channel using HMAC-SHA256.
+  /// PSK = HMAC-SHA256(K, "channel:v1:" + normalized_name)[:16]
+  ///
+  /// Community hashtag channels are deterministic for all members
+  /// (same name => same id) but impossible to enumerate/guess without K.
+  static Uint8List deriveCommunityHashtagPsk(Uint8List secret, String hashtag) {
+    final normalized = _normalizeCommunityHashtag(hashtag);
+    final hmac = crypto.Hmac(crypto.sha256, secret);
+    final digest = hmac.convert(utf8.encode('channel:v1:$normalized'));
+    return Uint8List.fromList(digest.bytes.sublist(0, 16));
+  }
+
+  /// Normalize a hashtag name for consistent community PSK derivation.
+  /// Strips leading #, converts to lowercase, trims whitespace.
+  static String _normalizeCommunityHashtag(String hashtag) {
+    return hashtag.replaceFirst(RegExp(r'^#'), '').toLowerCase().trim();
+  }
+
  static String formatPskHex(Uint8List psk) {
    return _bytesToHex(psk);
  }
@@ -59,15 +59,18 @@ class ChannelMessage {
    this.replyToSenderName,
    this.replyToText,
    Map<String, int>? reactions,
-  })  : messageId = messageId ?? '${timestamp.millisecondsSinceEpoch}_${senderName.hashCode}_${text.hashCode}',
-        reactions = reactions ?? {},
-        pathBytes = pathBytes ?? Uint8List(0),
-        pathVariants = _mergePathVariants(
-          pathBytes ?? Uint8List(0),
-          pathVariants,
-        );
+  }) : messageId =
+           messageId ??
+           '${timestamp.millisecondsSinceEpoch}_${senderName.hashCode}_${text.hashCode}',
+       reactions = reactions ?? {},
+       pathBytes = pathBytes ?? Uint8List(0),
+       pathVariants = _mergePathVariants(
+         pathBytes ?? Uint8List(0),
+         pathVariants,
+       );

-  String? get senderKeyHex => senderKey != null ? pubKeyToHex(senderKey!) : null;
+  String? get senderKeyHex =>
+      senderKey != null ? pubKeyToHex(senderKey!) : null;

  ChannelMessage copyWith({
    ChannelMessageStatus? status,
@@ -125,8 +128,10 @@ class ChannelMessage {
      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) {
+          cursor < data.length &&
+          (data[cursor] == txtTypePlain || data[cursor] == txtTypeCliData);
+      if ((hasPathBytesFlag || (canFitPath && !hasValidTxtType)) &&
+          canFitPath) {
        pathBytes = Uint8List.fromList(data.sublist(cursor, cursor + pathLen));
        cursor += pathLen;
      }
@@ -162,7 +167,8 @@ class ChannelMessage {
      final potentialSender = text.substring(0, colonIndex);
      if (!RegExp(r'[:\[\]]').hasMatch(potentialSender)) {
        senderName = potentialSender;
-        final offset = (colonIndex + 1 < text.length && text[colonIndex + 1] == ' ')
+        final offset =
+            (colonIndex + 1 < text.length && text[colonIndex + 1] == ' ')
            ? colonIndex + 2
            : colonIndex + 1;
        actualText = text.substring(offset);
@@ -184,7 +190,11 @@ class ChannelMessage {
    );
  }

-  static ChannelMessage outgoing(String text, String senderName, int channelIndex) {
+  static ChannelMessage outgoing(
+    String text,
+    String senderName,
+    int channelIndex,
+  ) {
    return ChannelMessage(
      senderKey: null,
      senderName: senderName,
@@ -249,8 +259,5 @@ class ReplyInfo {
  final String mentionedNode;
  final String actualMessage;

-  ReplyInfo({
-    required this.mentionedNode,
-    required this.actualMessage,
-  });
+  ReplyInfo({required this.mentionedNode, required this.actualMessage});
 }
@@ -0,0 +1,239 @@
+import 'dart:convert';
+import 'dart:math';
+import 'dart:typed_data';
+
+import 'package:crypto/crypto.dart' as crypto;
+
+/// Represents a community with a shared secret for deriving channel PSKs.
+///
+/// A Community is a namespace with a shared secret K (32 random bytes),
+/// distributed via QR code. Members can create Community Public Channels
+/// and Community Hashtag Channels that are opaque to outsiders.
+class Community {
+  /// Unique identifier for local storage
+  final String id;
+
+  /// Display name for the community
+  final String name;
+
+  /// The 32-byte shared secret (K)
+  final Uint8List secret;
+
+  /// Timestamp when the community was created/joined
+  final DateTime createdAt;
+
+  /// List of hashtag channel names (without #) that have been added
+  final List<String> hashtagChannels;
+
+  Community({
+    required this.id,
+    required this.name,
+    required this.secret,
+    required this.createdAt,
+    List<String>? hashtagChannels,
+  }) : hashtagChannels = hashtagChannels ?? [];
+
+  /// Generate a new community with a random 32-byte secret
+  factory Community.create({required String id, required String name}) {
+    final random = Random.secure();
+    final secret = Uint8List(32);
+    for (int i = 0; i < 32; i++) {
+      secret[i] = random.nextInt(256);
+    }
+    return Community(
+      id: id,
+      name: name,
+      secret: secret,
+      createdAt: DateTime.now(),
+    );
+  }
+
+  /// Parse a community from QR code JSON data
+  factory Community.fromQrData(String id, String qrData) {
+    final json = jsonDecode(qrData) as Map<String, dynamic>;
+    if (json['type'] != 'meshcore_community') {
+      throw const FormatException('Invalid QR code type');
+    }
+    if (json['v'] != 1) {
+      throw const FormatException('Unsupported QR code version');
+    }
+
+    final name = json['name'] as String;
+    final secretBase64 = json['k'] as String;
+    final secret = base64Url.decode(secretBase64);
+
+    if (secret.length != 32) {
+      throw const FormatException('Invalid secret length');
+    }
+
+    return Community(
+      id: id,
+      name: name,
+      secret: Uint8List.fromList(secret),
+      createdAt: DateTime.now(),
+    );
+  }
+
+  /// Parse a community from storage JSON
+  factory Community.fromJson(Map<String, dynamic> json) {
+    return Community(
+      id: json['id'] as String,
+      name: json['name'] as String,
+      secret: base64Decode(json['secret'] as String),
+      createdAt: DateTime.fromMillisecondsSinceEpoch(json['created_at'] as int),
+      hashtagChannels:
+          (json['hashtag_channels'] as List<dynamic>?)
+              ?.map((e) => e as String)
+              .toList() ??
+          [],
+    );
+  }
+
+  /// Convert to JSON for storage
+  Map<String, dynamic> toJson() {
+    return {
+      'id': id,
+      'name': name,
+      'secret': base64Encode(secret),
+      'created_at': createdAt.millisecondsSinceEpoch,
+      'hashtag_channels': hashtagChannels,
+    };
+  }
+
+  /// Generate QR code JSON payload for sharing
+  String toQrJson() {
+    return jsonEncode({
+      'v': 1,
+      'type': 'meshcore_community',
+      'name': name,
+      'k': base64Url.encode(secret),
+    });
+  }
+
+  /// Derive the public Community ID from the secret.
+  /// This is safe to display/log since it's one-way derived.
+  /// CID = SHA256("community:v1" || K)
+  String get communityId {
+    final data = utf8.encode('community:v1') + secret;
+    final hash = crypto.sha256.convert(data).bytes;
+    return _bytesToHex(Uint8List.fromList(hash));
+  }
+
+  /// Short version of community ID for display (first 8 chars)
+  String get shortCommunityId => communityId.substring(0, 8);
+
+  /// Derive PSK for community public channel.
+  /// PSK = HMAC-SHA256(K, "channel:v1:__public__")[:16]
+  Uint8List deriveCommunityPublicPsk() {
+    final hmac = crypto.Hmac(crypto.sha256, secret);
+    final digest = hmac.convert(utf8.encode('channel:v1:__public__'));
+    return Uint8List.fromList(digest.bytes.sublist(0, 16));
+  }
+
+  /// Derive PSK for community hashtag channel.
+  /// PSK = HMAC-SHA256(K, "channel:v1:" + normalized_name)[:16]
+  Uint8List deriveCommunityHashtagPsk(String hashtag) {
+    final normalized = _normalizeCommunityHashtag(hashtag);
+    final hmac = crypto.Hmac(crypto.sha256, secret);
+    final digest = hmac.convert(utf8.encode('channel:v1:$normalized'));
+    return Uint8List.fromList(digest.bytes.sublist(0, 16));
+  }
+
+  /// Check if QR data is valid community data
+  static bool isValidQrData(String data) {
+    try {
+      final json = jsonDecode(data) as Map<String, dynamic>;
+      if (json['type'] != 'meshcore_community') return false;
+      if (json['v'] != 1) return false;
+      if (json['name'] == null || (json['name'] as String).isEmpty) {
+        return false;
+      }
+      if (json['k'] == null) return false;
+      final secret = base64Url.decode(json['k'] as String);
+      return secret.length == 32;
+    } catch (_) {
+      return false;
+    }
+  }
+
+  /// Normalize a hashtag name for consistent PSK derivation.
+  /// Strips leading #, converts to lowercase, trims whitespace.
+  static String _normalizeCommunityHashtag(String hashtag) {
+    return hashtag.replaceFirst(RegExp(r'^#'), '').toLowerCase().trim();
+  }
+
+  /// Add a hashtag channel to this community's list
+  Community addHashtagChannel(String hashtag) {
+    final normalized = _normalizeCommunityHashtag(hashtag);
+    if (hashtagChannels.contains(normalized)) {
+      return this;
+    }
+    return Community(
+      id: id,
+      name: name,
+      secret: secret,
+      createdAt: createdAt,
+      hashtagChannels: [...hashtagChannels, normalized],
+    );
+  }
+
+  /// Remove a hashtag channel from this community's list
+  Community removeHashtagChannel(String hashtag) {
+    final normalized = _normalizeCommunityHashtag(hashtag);
+    return Community(
+      id: id,
+      name: name,
+      secret: secret,
+      createdAt: createdAt,
+      hashtagChannels: hashtagChannels.where((h) => h != normalized).toList(),
+    );
+  }
+
+  /// Create a copy of this community with a new secret
+  Community withNewSecret(Uint8List newSecret) {
+    return Community(
+      id: id,
+      name: name,
+      secret: newSecret,
+      createdAt: createdAt,
+      hashtagChannels: hashtagChannels,
+    );
+  }
+
+  /// Create a copy of this community with a regenerated random secret
+  Community withRegeneratedSecret() {
+    final random = Random.secure();
+    final newSecret = Uint8List(32);
+    for (int i = 0; i < 32; i++) {
+      newSecret[i] = random.nextInt(256);
+    }
+    return withNewSecret(newSecret);
+  }
+
+  /// Extract secret from QR data (for updating existing community)
+  static Uint8List? extractSecretFromQrData(String qrData) {
+    try {
+      final json = jsonDecode(qrData) as Map<String, dynamic>;
+      if (json['type'] != 'meshcore_community') return null;
+      if (json['v'] != 1) return null;
+      final secretBase64 = json['k'] as String;
+      final secret = base64Url.decode(secretBase64);
+      if (secret.length != 32) return null;
+      return Uint8List.fromList(secret);
+    } catch (_) {
+      return null;
+    }
+  }
+
+  static String _bytesToHex(Uint8List bytes) {
+    return bytes.map((b) => b.toRadixString(16).padLeft(2, '0')).join();
+  }
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is Community && runtimeType == other.runtimeType && id == other.id;
+
+  @override
+  int get hashCode => id.hashCode;
+}
@@ -1,23 +1,30 @@
 import 'dart:typed_data';
+import 'package:meshcore_open/utils/app_logger.dart';
+
 import '../connector/meshcore_protocol.dart';

 class Contact {
  final Uint8List publicKey;
  final String name;
  final int type;
+  final int flags;
  final int pathLength; // -1 = flood, 0+ = direct hops (from device)
  final Uint8List path; // Path bytes from device
-  final int? pathOverride; // User's path override: -1 = force flood, null = auto
+  final int?
+  pathOverride; // User's path override: -1 = force flood, null = auto
  final Uint8List? pathOverrideBytes; // User's path override bytes
  final double? latitude;
  final double? longitude;
  final DateTime lastSeen;
  final DateTime lastMessageAt;
+  final bool isActive;
+  final Uint8List? rawPacket;

  Contact({
    required this.publicKey,
    required this.name,
    required this.type,
+    this.flags = 0,
    required this.pathLength,
    required this.path,
    this.pathOverride,
@@ -26,6 +33,8 @@ class Contact {
    this.longitude,
    required this.lastSeen,
    DateTime? lastMessageAt,
+    this.isActive = true,
+    this.rawPacket,
  }) : lastMessageAt = lastMessageAt ?? lastSeen;

  String get publicKeyHex => pubKeyToHex(publicKey);
@@ -46,17 +55,24 @@ class Contact {
  }

  String get pathLabel {
+    if (pathOverride != null) {
+      if (pathOverride! < 0) return 'Flood (forced)';
+      if (pathOverride == 0) return 'Direct (forced)';
+      return '$pathOverride hops (forced)';
+    }
    if (pathLength < 0) return 'Flood';
    if (pathLength == 0) return 'Direct';
    return '$pathLength hops';
  }

  bool get hasLocation => latitude != null && longitude != null;
+  bool get isFavorite => (flags & contactFlagFavorite) != 0;

  Contact copyWith({
    Uint8List? publicKey,
    String? name,
    int? type,
+    int? flags,
    int? pathLength,
    Uint8List? path,
    int? pathOverride,
@@ -66,74 +82,143 @@ class Contact {
    double? longitude,
    DateTime? lastSeen,
    DateTime? lastMessageAt,
+    bool? isActive,
+    Uint8List? rawPacket,
  }) {
    return Contact(
      publicKey: publicKey ?? this.publicKey,
      name: name ?? this.name,
      type: type ?? this.type,
+      flags: flags ?? this.flags,
      pathLength: pathLength ?? this.pathLength,
      path: path ?? this.path,
-      pathOverride: clearPathOverride ? null : (pathOverride ?? this.pathOverride),
-      pathOverrideBytes: clearPathOverride ? null : (pathOverrideBytes ?? this.pathOverrideBytes),
+      pathOverride: clearPathOverride
+          ? null
+          : (pathOverride ?? this.pathOverride),
+      pathOverrideBytes: clearPathOverride
+          ? null
+          : (pathOverrideBytes ?? this.pathOverrideBytes),
      latitude: latitude ?? this.latitude,
      longitude: longitude ?? this.longitude,
      lastSeen: lastSeen ?? this.lastSeen,
      lastMessageAt: lastMessageAt ?? this.lastMessageAt,
+      isActive: isActive ?? this.isActive,
+      rawPacket: rawPacket ?? this.rawPacket,
    );
  }

  String get pathIdList {
-    if (path.isEmpty) return '';
+    final pathBytes = _pathBytesForDisplay;
+    if (pathBytes.isEmpty) return '';
    final parts = <String>[];
    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);
+    for (int i = 0; i < pathBytes.length; i += groupSize) {
+      final end = (i + groupSize) <= pathBytes.length
+          ? (i + groupSize)
+          : pathBytes.length;
+      final chunk = pathBytes.sublist(i, end);
      parts.add(
-        chunk.map((b) => b.toRadixString(16).padLeft(2, '0').toUpperCase()).join(),
+        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;
+  String get shortPubKeyHex {
+    return "<${publicKeyHex.substring(0, 8)}...${publicKeyHex.substring(publicKeyHex.length - 8)}>";
+  }

-    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);
+  Uint8List? get traceRouteBytes {
+    final pathBytes = _pathBytesForDisplay;
+    Uint8List? traceBytes;

-    double? lat, lon;
-    final latRaw = readInt32LE(data, contactLatOffset);
-    final lonRaw = readInt32LE(data, contactLonOffset);
-    if (latRaw != 0 || lonRaw != 0) {
-      lat = latRaw / 1e6;
-      lon = lonRaw / 1e6;
+    if (pathBytes.isEmpty) {
+      traceBytes = Uint8List(1);
+      traceBytes[0] = publicKey[0];
+      return traceBytes;
    }

-    return Contact(
-      publicKey: pubKey,
-      name: name.isEmpty ? 'Unknown' : name,
-      type: type,
-      pathLength: pathLen,
-      path: pathBytes,
-      latitude: lat,
-      longitude: lon,
-      lastSeen: DateTime.fromMillisecondsSinceEpoch(lastmod * 1000),
-    );
+    if (type == advTypeRepeater || type == advTypeRoom) {
+      final len = (pathBytes.length + pathBytes.length + 1);
+      traceBytes = Uint8List(len);
+      traceBytes[pathBytes.length] = publicKey[0];
+      for (int i = 0; i < pathBytes.length; i++) {
+        traceBytes[i] = pathBytes[i];
+        if (i < pathBytes.length) {
+          traceBytes[len - 1 - i] = pathBytes[i];
+        }
+      }
+    } else {
+      if (pathBytes.length < 2) {
+        return pathBytes[0] == 0 ? null : pathBytes;
+      }
+      final len = (pathBytes.length + pathBytes.length - 1);
+      traceBytes = Uint8List(len);
+      for (int i = 0; i < pathBytes.length; i++) {
+        traceBytes[i] = pathBytes[i];
+        if (i < pathBytes.length - 1) {
+          traceBytes[len - 1 - i] = pathBytes[i];
+        }
+      }
+    }
+    return traceBytes;
+  }
+
+  Uint8List get _pathBytesForDisplay {
+    if (pathOverride != null) {
+      if (pathOverride! < 0) return Uint8List(0);
+      return pathOverrideBytes ?? Uint8List(0);
+    }
+    return path;
+  }
+
+  static Contact? fromFrame(Uint8List data) {
+    if (data.isEmpty) return null;
+    final reader = BufferReader(data);
+    try {
+      final respCode = reader.readByte();
+      if (respCode != respCodeContact && respCode != pushCodeNewAdvert) {
+        return null;
+      }
+      final pubKey = reader.readBytes(pubKeySize);
+      final type = reader.readByte();
+      final flags = reader.readByte();
+      final pathLen = reader.readByte();
+      final safePathLen = pathLen > 0
+          ? (pathLen > maxPathSize ? maxPathSize : pathLen)
+          : 0;
+      final pathBytes = reader.readBytes(maxPathSize).sublist(0, safePathLen);
+      final name = reader.readCStringGreedy(maxNameSize);
+
+      final lastMod = reader.readUInt32LE();
+
+      double? lat, lon;
+      final latRaw = reader.readInt32LE();
+      final lonRaw = reader.readInt32LE();
+      if (latRaw != 0 || lonRaw != 0) {
+        lat = latRaw / 1e6;
+        lon = lonRaw / 1e6;
+      }
+
+      return Contact(
+        publicKey: pubKey,
+        name: name.isEmpty ? 'Unknown' : name,
+        type: type,
+        flags: flags,
+        pathLength: pathLen > 0 ? (pathLen > maxPathSize ? -1 : pathLen) : -1,
+        path: pathBytes,
+        latitude: lat,
+        longitude: lon,
+        lastSeen: DateTime.fromMillisecondsSinceEpoch(lastMod * 1000),
+        isActive: true,
+        rawPacket: null,
+      );
+    } catch (e) {
+      appLogger.error('Failed to parse contact frame: $e');
+      return null;
+    }
  }

  @override
@@ -2,15 +2,9 @@ class ContactGroup {
  final String name;
  final List<String> memberKeys;

-  const ContactGroup({
-    required this.name,
-    required this.memberKeys,
-  });
+  const ContactGroup({required this.name, required this.memberKeys});

-  ContactGroup copyWith({
-    String? name,
-    List<String>? memberKeys,
-  }) {
+  ContactGroup copyWith({String? name, List<String>? memberKeys}) {
    return ContactGroup(
      name: name ?? this.name,
      memberKeys: memberKeys ?? List<String>.from(this.memberKeys),
@@ -18,16 +12,12 @@ class ContactGroup {
  }

  Map<String, dynamic> toJson() {
-    return {
-      'name': name,
-      'members': memberKeys,
-    };
+    return {'name': name, 'members': memberKeys};
  }

  factory ContactGroup.fromJson(Map<String, dynamic> json) {
-    final members = (json['members'] as List?)
-            ?.map((value) => value.toString())
-            .toList() ??
+    final members =
+        (json['members'] as List?)?.map((value) => value.toString()).toList() ??
        <String>[];
    return ContactGroup(
      name: json['name'] as String? ?? '',
@@ -23,6 +23,7 @@ class Message {
  final int? pathLength;
  final Uint8List pathBytes;
  final Map<String, int> reactions;
+  final Uint8List fourByteRoomContactKey;

  Message({
    required this.senderKey,
@@ -40,9 +41,11 @@ class Message {
    this.tripTimeMs,
    this.pathLength,
    Uint8List? pathBytes,
+    Uint8List? fourByteRoomContactKey,
    Map<String, int>? reactions,
-  })  : pathBytes = pathBytes ?? Uint8List(0),
-        reactions = reactions ?? {};
+  }) : pathBytes = pathBytes ?? Uint8List(0),
+       fourByteRoomContactKey = fourByteRoomContactKey ?? Uint8List(0),
+       reactions = reactions ?? {};

  String get senderKeyHex => pubKeyToHex(senderKey);

@@ -58,6 +61,7 @@ class Message {
    Uint8List? pathBytes,
    bool? isCli,
    Map<String, int>? reactions,
+    Uint8List? fourByteRoomContactKey,
  }) {
    return Message(
      senderKey: senderKey,
@@ -76,6 +80,8 @@ class Message {
      pathLength: pathLength ?? this.pathLength,
      pathBytes: pathBytes ?? this.pathBytes,
      reactions: reactions ?? this.reactions,
+      fourByteRoomContactKey:
+          fourByteRoomContactKey ?? this.fourByteRoomContactKey,
    );
  }

@@ -38,7 +38,8 @@ class PathRecord {
      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() ?? [],
+      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,
    );
@@ -65,14 +66,15 @@ class ContactPathHistory {
  }

  Map<String, dynamic> toJson() {
-    return {
-      'recent_paths': recentPaths.map((p) => p.toJson()).toList(),
-    };
+    return {'recent_paths': recentPaths.map((p) => p.toJson()).toList()};
  }

  factory ContactPathHistory.fromJson(
-      String contactPubKeyHex, Map<String, dynamic> json) {
-    final pathsList = (json['recent_paths'] as List?)
+    String contactPubKeyHex,
+    Map<String, dynamic> json,
+  ) {
+    final pathsList =
+        (json['recent_paths'] as List?)
            ?.map((p) => PathRecord.fromJson(p as Map<String, dynamic>))
            .toList() ??
        [];
@@ -59,46 +59,200 @@ class RadioSettings {
    required this.txPowerDbm,
  });

-  // Preset configurations
-  static RadioSettings get preset915MHz => RadioSettings(
-        frequencyMHz: 915.0,
-        bandwidth: LoRaBandwidth.bw125,
+  // Regional preset configurations
+  static final List<(String, RadioSettings)> presets = [
+    (
+      'Australia',
+      RadioSettings(
+        frequencyMHz: 915.8,
+        bandwidth: LoRaBandwidth.bw250,
+        spreadingFactor: LoRaSpreadingFactor.sf10,
+        codingRate: LoRaCodingRate.cr4_5,
+        txPowerDbm: 20,
+      ),
+    ),
+    (
+      'Australia (Narrow)',
+      RadioSettings(
+        frequencyMHz: 916.575,
+        bandwidth: LoRaBandwidth.bw62_5,
        spreadingFactor: LoRaSpreadingFactor.sf7,
        codingRate: LoRaCodingRate.cr4_5,
        txPowerDbm: 20,
-      );
-
-  static RadioSettings get preset868MHz => RadioSettings(
-        frequencyMHz: 868.0,
-        bandwidth: LoRaBandwidth.bw125,
+      ),
+    ),
+    (
+      'Australia SA, WA, QLD',
+      RadioSettings(
+        frequencyMHz: 923.125,
+        bandwidth: LoRaBandwidth.bw62_5,
+        spreadingFactor: LoRaSpreadingFactor.sf8,
+        codingRate: LoRaCodingRate.cr4_5,
+        txPowerDbm: 20,
+      ),
+    ),
+    (
+      'Czech Republic',
+      RadioSettings(
+        frequencyMHz: 869.432,
+        bandwidth: LoRaBandwidth.bw62_5,
        spreadingFactor: LoRaSpreadingFactor.sf7,
        codingRate: LoRaCodingRate.cr4_5,
        txPowerDbm: 14,
-      );
-
-  static RadioSettings get preset433MHz => RadioSettings(
+      ),
+    ),
+    (
+      'EU 433MHz',
+      RadioSettings(
+        frequencyMHz: 433.650,
+        bandwidth: LoRaBandwidth.bw250,
+        spreadingFactor: LoRaSpreadingFactor.sf11,
+        codingRate: LoRaCodingRate.cr4_5,
+        txPowerDbm: 20,
+      ),
+    ),
+    (
+      'EU/UK (Long Range)',
+      RadioSettings(
+        frequencyMHz: 869.525,
+        bandwidth: LoRaBandwidth.bw250,
+        spreadingFactor: LoRaSpreadingFactor.sf11,
+        codingRate: LoRaCodingRate.cr4_5,
+        txPowerDbm: 14,
+      ),
+    ),
+    (
+      'EU/UK (Medium Range)',
+      RadioSettings(
+        frequencyMHz: 869.525,
+        bandwidth: LoRaBandwidth.bw250,
+        spreadingFactor: LoRaSpreadingFactor.sf10,
+        codingRate: LoRaCodingRate.cr4_5,
+        txPowerDbm: 14,
+      ),
+    ),
+    (
+      'EU/UK (Narrow)',
+      RadioSettings(
+        frequencyMHz: 869.618,
+        bandwidth: LoRaBandwidth.bw62_5,
+        spreadingFactor: LoRaSpreadingFactor.sf8,
+        codingRate: LoRaCodingRate.cr4_5,
+        txPowerDbm: 14,
+      ),
+    ),
+    (
+      'New Zealand',
+      RadioSettings(
+        frequencyMHz: 917.375,
+        bandwidth: LoRaBandwidth.bw250,
+        spreadingFactor: LoRaSpreadingFactor.sf11,
+        codingRate: LoRaCodingRate.cr4_5,
+        txPowerDbm: 20,
+      ),
+    ),
+    (
+      'New Zealand (Narrow)',
+      RadioSettings(
+        frequencyMHz: 917.375,
+        bandwidth: LoRaBandwidth.bw62_5,
+        spreadingFactor: LoRaSpreadingFactor.sf7,
+        codingRate: LoRaCodingRate.cr4_5,
+        txPowerDbm: 20,
+      ),
+    ),
+    (
+      'Portugal 433',
+      RadioSettings(
+        frequencyMHz: 433.375,
+        bandwidth: LoRaBandwidth.bw62_5,
+        spreadingFactor: LoRaSpreadingFactor.sf9,
+        codingRate: LoRaCodingRate.cr4_5,
+        txPowerDbm: 20,
+      ),
+    ),
+    (
+      'Portugal 869',
+      RadioSettings(
+        frequencyMHz: 869.618,
+        bandwidth: LoRaBandwidth.bw62_5,
+        spreadingFactor: LoRaSpreadingFactor.sf7,
+        codingRate: LoRaCodingRate.cr4_5,
+        txPowerDbm: 14,
+      ),
+    ),
+    (
+      'Switzerland',
+      RadioSettings(
+        frequencyMHz: 869.618,
+        bandwidth: LoRaBandwidth.bw62_5,
+        spreadingFactor: LoRaSpreadingFactor.sf8,
+        codingRate: LoRaCodingRate.cr4_5,
+        txPowerDbm: 14,
+      ),
+    ),
+    (
+      'USA Arizona',
+      RadioSettings(
+        frequencyMHz: 908.205,
+        bandwidth: LoRaBandwidth.bw62_5,
+        spreadingFactor: LoRaSpreadingFactor.sf10,
+        codingRate: LoRaCodingRate.cr4_5,
+        txPowerDbm: 20,
+      ),
+    ),
+    (
+      'USA/Canada',
+      RadioSettings(
+        frequencyMHz: 910.525,
+        bandwidth: LoRaBandwidth.bw62_5,
+        spreadingFactor: LoRaSpreadingFactor.sf7,
+        codingRate: LoRaCodingRate.cr4_5,
+        txPowerDbm: 20,
+      ),
+    ),
+    (
+      'Vietnam',
+      RadioSettings(
+        frequencyMHz: 920.250,
+        bandwidth: LoRaBandwidth.bw250,
+        spreadingFactor: LoRaSpreadingFactor.sf11,
+        codingRate: LoRaCodingRate.cr4_5,
+        txPowerDbm: 20,
+      ),
+    ),
+    // Off-grid repeat presets (valid client_repeat frequencies)
+    (
+      'Off-Grid 433',
+      RadioSettings(
        frequencyMHz: 433.0,
-        bandwidth: LoRaBandwidth.bw125,
-        spreadingFactor: LoRaSpreadingFactor.sf7,
+        bandwidth: LoRaBandwidth.bw250,
+        spreadingFactor: LoRaSpreadingFactor.sf11,
        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,
+      ),
+    ),
+    (
+      'Off-Grid 869',
+      RadioSettings(
+        frequencyMHz: 869.0,
+        bandwidth: LoRaBandwidth.bw250,
+        spreadingFactor: LoRaSpreadingFactor.sf11,
+        codingRate: LoRaCodingRate.cr4_5,
+        txPowerDbm: 14,
+      ),
+    ),
+    (
+      'Off-Grid 918',
+      RadioSettings(
+        frequencyMHz: 918.0,
+        bandwidth: LoRaBandwidth.bw250,
+        spreadingFactor: LoRaSpreadingFactor.sf11,
        codingRate: LoRaCodingRate.cr4_5,
        txPowerDbm: 20,
-      );
+      ),
+    ),
+  ];

  int get frequencyHz => (frequencyMHz * 1000).round();
  int get bandwidthHz => bandwidth.hz;
@@ -0,0 +1,130 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:provider/provider.dart';
+
+import '../l10n/l10n.dart';
+import '../services/app_debug_log_service.dart';
+import '../widgets/adaptive_app_bar_title.dart';
+
+class AppDebugLogScreen extends StatelessWidget {
+  const AppDebugLogScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Consumer<AppDebugLogService>(
+      builder: (context, logService, _) {
+        final entries = logService.entries.reversed.toList();
+        final hasEntries = entries.isNotEmpty;
+
+        return Scaffold(
+          appBar: AppBar(
+            title: AdaptiveAppBarTitle(context.l10n.debugLog_appTitle),
+            centerTitle: true,
+            actions: [
+              IconButton(
+                tooltip: context.l10n.debugLog_copyLog,
+                icon: const Icon(Icons.copy),
+                onPressed: hasEntries
+                    ? () async {
+                        final text = entries
+                            .map(
+                              (entry) =>
+                                  '[${entry.formattedTime}] [${entry.levelLabel}] [${entry.tag}] ${entry.message}',
+                            )
+                            .join('\n');
+                        await Clipboard.setData(ClipboardData(text: text));
+                        if (!context.mounted) return;
+                        ScaffoldMessenger.of(context).showSnackBar(
+                          SnackBar(content: Text(context.l10n.debugLog_copied)),
+                        );
+                      }
+                    : null,
+              ),
+              IconButton(
+                tooltip: context.l10n.debugLog_clearLog,
+                icon: const Icon(Icons.delete_outline),
+                onPressed: hasEntries
+                    ? () {
+                        logService.clear();
+                      }
+                    : null,
+              ),
+            ],
+          ),
+          body: SafeArea(
+            top: false,
+            child: hasEntries
+                ? ListView.separated(
+                    itemCount: entries.length,
+                    separatorBuilder: (_, _) => const Divider(height: 1),
+                    itemBuilder: (context, index) {
+                      final entry = entries[index];
+                      return ListTile(
+                        dense: true,
+                        leading: _buildLevelIcon(entry.level),
+                        title: Text(
+                          '[${entry.tag}] ${entry.message}',
+                          style: const TextStyle(
+                            fontSize: 12,
+                            fontFamily: 'monospace',
+                          ),
+                        ),
+                        subtitle: Text(
+                          entry.formattedTime,
+                          style: TextStyle(
+                            fontSize: 10,
+                            color: Colors.grey[600],
+                          ),
+                        ),
+                      );
+                    },
+                  )
+                : Center(
+                    child: Column(
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      children: [
+                        Icon(
+                          Icons.bug_report_outlined,
+                          size: 64,
+                          color: Colors.grey[400],
+                        ),
+                        const SizedBox(height: 16),
+                        Text(
+                          context.l10n.debugLog_noEntries,
+                          style: TextStyle(
+                            fontSize: 16,
+                            color: Colors.grey[600],
+                          ),
+                        ),
+                        const SizedBox(height: 8),
+                        Text(
+                          context.l10n.debugLog_enableInSettings,
+                          style: TextStyle(
+                            fontSize: 12,
+                            color: Colors.grey[500],
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+          ),
+        );
+      },
+    );
+  }
+
+  Widget _buildLevelIcon(AppDebugLogLevel level) {
+    switch (level) {
+      case AppDebugLogLevel.info:
+        return const Icon(Icons.info_outline, size: 18, color: Colors.blue);
+      case AppDebugLogLevel.warning:
+        return const Icon(
+          Icons.warning_amber_outlined,
+          size: 18,
+          color: Colors.orange,
+        );
+      case AppDebugLogLevel.error:
+        return const Icon(Icons.error_outline, size: 18, color: Colors.red);
+    }
+  }
+}
@@ -2,8 +2,11 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';

 import '../connector/meshcore_connector.dart';
+import '../l10n/l10n.dart';
+import '../models/app_settings.dart';
 import '../services/app_settings_service.dart';
 import '../services/notification_service.dart';
+import '../widgets/adaptive_app_bar_title.dart';
 import 'map_cache_screen.dart';

 class AppSettingsScreen extends StatelessWidget {
@@ -13,7 +16,7 @@ class AppSettingsScreen extends StatelessWidget {
  Widget build(BuildContext context) {
    return Scaffold(
      appBar: AppBar(
-        title: const Text('App Settings'),
+        title: AdaptiveAppBarTitle(context.l10n.appSettings_title),
        centerTitle: true,
      ),
      body: SafeArea(
@@ -32,6 +35,8 @@ class AppSettingsScreen extends StatelessWidget {
                _buildBatteryCard(context, settingsService, connector),
                const SizedBox(height: 16),
                _buildMapSettingsCard(context, settingsService),
+                const SizedBox(height: 16),
+                _buildDebugCard(context, settingsService),
              ],
            );
          },
@@ -40,57 +45,95 @@ class AppSettingsScreen extends StatelessWidget {
    );
  }

-  Widget _buildAppearanceCard(BuildContext context, AppSettingsService settingsService) {
+  Widget _buildAppearanceCard(
+    BuildContext context,
+    AppSettingsService settingsService,
+  ) {
    return Card(
      child: Column(
        crossAxisAlignment: CrossAxisAlignment.start,
        children: [
-          const Padding(
-            padding: EdgeInsets.fromLTRB(16, 16, 16, 8),
+          Padding(
+            padding: const EdgeInsets.fromLTRB(16, 16, 16, 8),
            child: Text(
-              'Appearance',
-              style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
+              context.l10n.appSettings_appearance,
+              style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
            ),
          ),
          ListTile(
            leading: const Icon(Icons.brightness_6_outlined),
-            title: const Text('Theme'),
-            subtitle: Text(_themeModeLabel(settingsService.settings.themeMode)),
+            title: Text(context.l10n.appSettings_theme),
+            subtitle: Text(
+              _themeModeLabel(context, settingsService.settings.themeMode),
+            ),
            trailing: const Icon(Icons.chevron_right),
            onTap: () => _showThemeModeDialog(context, settingsService),
          ),
+          const Divider(height: 1),
+          ListTile(
+            leading: const Icon(Icons.language_outlined),
+            title: Text(context.l10n.appSettings_language),
+            subtitle: Text(
+              _languageLabel(
+                context,
+                settingsService.settings.languageOverride,
+              ),
+            ),
+            trailing: const Icon(Icons.chevron_right),
+            onTap: () => _showLanguageDialog(context, settingsService),
+          ),
+          const Divider(height: 1),
+          SwitchListTile(
+            secondary: const Icon(Icons.location_searching),
+            title: Text(context.l10n.appSettings_enableMessageTracing),
+            subtitle: Text(
+              context.l10n.appSettings_enableMessageTracingSubtitle,
+            ),
+            value: settingsService.settings.enableMessageTracing,
+            onChanged: (value) {
+              settingsService.setEnableMessageTracing(value);
+            },
+          ),
        ],
      ),
    );
  }

-  Widget _buildNotificationsCard(BuildContext context, AppSettingsService settingsService) {
+  Widget _buildNotificationsCard(
+    BuildContext context,
+    AppSettingsService settingsService,
+  ) {
    return Card(
      child: Column(
        crossAxisAlignment: CrossAxisAlignment.start,
        children: [
-          const Padding(
-            padding: EdgeInsets.fromLTRB(16, 16, 16, 8),
+          Padding(
+            padding: const EdgeInsets.fromLTRB(16, 16, 16, 8),
            child: Text(
-              'Notifications',
-              style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
+              context.l10n.appSettings_notifications,
+              style: const 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'),
+            title: Text(context.l10n.appSettings_enableNotifications),
+            subtitle: Text(
+              context.l10n.appSettings_enableNotificationsSubtitle,
+            ),
            value: settingsService.settings.notificationsEnabled,
            onChanged: (value) async {
              if (value) {
                // Request permission when enabling
-                final granted = await NotificationService().requestPermissions();
+                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),
+                      SnackBar(
+                        content: Text(
+                          context.l10n.appSettings_notificationPermissionDenied,
+                        ),
+                        duration: const Duration(seconds: 2),
                      ),
                    );
                  }
@@ -102,9 +145,11 @@ class AppSettingsScreen extends StatelessWidget {
              if (context.mounted) {
                ScaffoldMessenger.of(context).showSnackBar(
                  SnackBar(
-                    content: Text(value
-                        ? 'Notifications enabled'
-                        : 'Notifications disabled'),
+                    content: Text(
+                      value
+                          ? context.l10n.appSettings_notificationsEnabled
+                          : context.l10n.appSettings_notificationsDisabled,
+                    ),
                    duration: const Duration(seconds: 2),
                  ),
                );
@@ -115,18 +160,24 @@ class AppSettingsScreen extends StatelessWidget {
          SwitchListTile(
            secondary: Icon(
              Icons.message_outlined,
-              color: settingsService.settings.notificationsEnabled ? null : Colors.grey,
+              color: settingsService.settings.notificationsEnabled
+                  ? null
+                  : Colors.grey,
            ),
            title: Text(
-              'Message Notifications',
+              context.l10n.appSettings_messageNotifications,
              style: TextStyle(
-                color: settingsService.settings.notificationsEnabled ? null : Colors.grey,
+                color: settingsService.settings.notificationsEnabled
+                    ? null
+                    : Colors.grey,
              ),
            ),
            subtitle: Text(
-              'Show notification when receiving new messages',
+              context.l10n.appSettings_messageNotificationsSubtitle,
              style: TextStyle(
-                color: settingsService.settings.notificationsEnabled ? null : Colors.grey,
+                color: settingsService.settings.notificationsEnabled
+                    ? null
+                    : Colors.grey,
              ),
            ),
            value: settingsService.settings.notifyOnNewMessage,
@@ -140,18 +191,24 @@ class AppSettingsScreen extends StatelessWidget {
          SwitchListTile(
            secondary: Icon(
              Icons.forum_outlined,
-              color: settingsService.settings.notificationsEnabled ? null : Colors.grey,
+              color: settingsService.settings.notificationsEnabled
+                  ? null
+                  : Colors.grey,
            ),
            title: Text(
-              'Channel Message Notifications',
+              context.l10n.appSettings_channelMessageNotifications,
              style: TextStyle(
-                color: settingsService.settings.notificationsEnabled ? null : Colors.grey,
+                color: settingsService.settings.notificationsEnabled
+                    ? null
+                    : Colors.grey,
              ),
            ),
            subtitle: Text(
-              'Show notification when receiving channel messages',
+              context.l10n.appSettings_channelMessageNotificationsSubtitle,
              style: TextStyle(
-                color: settingsService.settings.notificationsEnabled ? null : Colors.grey,
+                color: settingsService.settings.notificationsEnabled
+                    ? null
+                    : Colors.grey,
              ),
            ),
            value: settingsService.settings.notifyOnNewChannelMessage,
@@ -165,18 +222,24 @@ class AppSettingsScreen extends StatelessWidget {
          SwitchListTile(
            secondary: Icon(
              Icons.cell_tower,
-              color: settingsService.settings.notificationsEnabled ? null : Colors.grey,
+              color: settingsService.settings.notificationsEnabled
+                  ? null
+                  : Colors.grey,
            ),
            title: Text(
-              'Advertisement Notifications',
+              context.l10n.appSettings_advertisementNotifications,
              style: TextStyle(
-                color: settingsService.settings.notificationsEnabled ? null : Colors.grey,
+                color: settingsService.settings.notificationsEnabled
+                    ? null
+                    : Colors.grey,
              ),
            ),
            subtitle: Text(
-              'Show notification when new nodes are discovered',
+              context.l10n.appSettings_advertisementNotificationsSubtitle,
              style: TextStyle(
-                color: settingsService.settings.notificationsEnabled ? null : Colors.grey,
+                color: settingsService.settings.notificationsEnabled
+                    ? null
+                    : Colors.grey,
              ),
            ),
            value: settingsService.settings.notifyOnNewAdvert,
@@ -191,30 +254,37 @@ class AppSettingsScreen extends StatelessWidget {
    );
  }

-  Widget _buildMessagingCard(BuildContext context, AppSettingsService settingsService) {
+  Widget _buildMessagingCard(
+    BuildContext context,
+    AppSettingsService settingsService,
+  ) {
    return Card(
      child: Column(
        crossAxisAlignment: CrossAxisAlignment.start,
        children: [
-          const Padding(
-            padding: EdgeInsets.fromLTRB(16, 16, 16, 8),
+          Padding(
+            padding: const EdgeInsets.fromLTRB(16, 16, 16, 8),
            child: Text(
-              'Messaging',
-              style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
+              context.l10n.appSettings_messaging,
+              style: const 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'),
+            title: Text(context.l10n.appSettings_clearPathOnMaxRetry),
+            subtitle: Text(
+              context.l10n.appSettings_clearPathOnMaxRetrySubtitle,
+            ),
            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'),
+                  content: Text(
+                    value
+                        ? context.l10n.appSettings_pathsWillBeCleared
+                        : context.l10n.appSettings_pathsWillNotBeCleared,
+                  ),
                  duration: const Duration(seconds: 2),
                ),
              );
@@ -223,16 +293,18 @@ class AppSettingsScreen extends StatelessWidget {
          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'),
+            title: Text(context.l10n.appSettings_autoRouteRotation),
+            subtitle: Text(context.l10n.appSettings_autoRouteRotationSubtitle),
            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'),
+                  content: Text(
+                    value
+                        ? context.l10n.appSettings_autoRouteRotationEnabled
+                        : context.l10n.appSettings_autoRouteRotationDisabled,
+                  ),
                  duration: const Duration(seconds: 2),
                ),
              );
@@ -243,22 +315,25 @@ class AppSettingsScreen extends StatelessWidget {
    );
  }

-  Widget _buildMapSettingsCard(BuildContext context, AppSettingsService settingsService) {
+  Widget _buildMapSettingsCard(
+    BuildContext context,
+    AppSettingsService settingsService,
+  ) {
    return Card(
      child: Column(
        crossAxisAlignment: CrossAxisAlignment.start,
        children: [
-          const Padding(
-            padding: EdgeInsets.fromLTRB(16, 16, 16, 8),
+          Padding(
+            padding: const EdgeInsets.fromLTRB(16, 16, 16, 8),
            child: Text(
-              'Map Display',
-              style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
+              context.l10n.appSettings_mapDisplay,
+              style: const 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'),
+            title: Text(context.l10n.appSettings_showRepeaters),
+            subtitle: Text(context.l10n.appSettings_showRepeatersSubtitle),
            value: settingsService.settings.mapShowRepeaters,
            onChanged: (value) {
              settingsService.setMapShowRepeaters(value);
@@ -267,8 +342,8 @@ class AppSettingsScreen extends StatelessWidget {
          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'),
+            title: Text(context.l10n.appSettings_showChatNodes),
+            subtitle: Text(context.l10n.appSettings_showChatNodesSubtitle),
            value: settingsService.settings.mapShowChatNodes,
            onChanged: (value) {
              settingsService.setMapShowChatNodes(value);
@@ -277,8 +352,8 @@ class AppSettingsScreen extends StatelessWidget {
          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'),
+            title: Text(context.l10n.appSettings_showOtherNodes),
+            subtitle: Text(context.l10n.appSettings_showOtherNodesSubtitle),
            value: settingsService.settings.mapShowOtherNodes,
            onChanged: (value) {
              settingsService.setMapShowOtherNodes(value);
@@ -287,24 +362,40 @@ class AppSettingsScreen extends StatelessWidget {
          const Divider(height: 1),
          ListTile(
            leading: const Icon(Icons.timer_outlined),
-            title: const Text('Time Filter'),
+            title: Text(context.l10n.appSettings_timeFilter),
            subtitle: Text(
              settingsService.settings.mapTimeFilterHours == 0
-                  ? 'Show all nodes'
-                  : 'Show nodes from last ${settingsService.settings.mapTimeFilterHours.toInt()} hours',
+                  ? context.l10n.appSettings_timeFilterShowAll
+                  : context.l10n.appSettings_timeFilterShowLast(
+                      settingsService.settings.mapTimeFilterHours.toInt(),
+                    ),
            ),
            trailing: const Icon(Icons.chevron_right),
            onTap: () => _showTimeFilterDialog(context, settingsService),
          ),
          const Divider(height: 1),
+          ListTile(
+            leading: const Icon(Icons.straighten),
+            title: Text(context.l10n.appSettings_unitsTitle),
+            subtitle: Text(
+              settingsService.settings.unitSystem == UnitSystem.imperial
+                  ? context.l10n.appSettings_unitsImperial
+                  : context.l10n.appSettings_unitsMetric,
+            ),
+            trailing: const Icon(Icons.chevron_right),
+            onTap: () => _showUnitsDialog(context, settingsService),
+          ),
+          const Divider(height: 1),
          ListTile(
            leading: const Icon(Icons.download_outlined),
-            title: const Text('Offline Map Cache'),
+            title: Text(context.l10n.appSettings_offlineMapCache),
            subtitle: Text(
              settingsService.settings.mapCacheBounds == null
-                  ? 'No area selected'
-                  : 'Area selected (zoom ${settingsService.settings.mapCacheMinZoom}'
-                      '-${settingsService.settings.mapCacheMaxZoom})',
+                  ? context.l10n.appSettings_noAreaSelected
+                  : context.l10n.appSettings_areaSelectedZoom(
+                      settingsService.settings.mapCacheMinZoom,
+                      settingsService.settings.mapCacheMaxZoom,
+                    ),
            ),
            trailing: const Icon(Icons.chevron_right),
            onTap: () {
@@ -319,6 +410,7 @@ class AppSettingsScreen extends StatelessWidget {
    );
  }

+  // Fixed rendering issues
  Widget _buildBatteryCard(
    BuildContext context,
    AppSettingsService settingsService,
@@ -326,49 +418,69 @@ class AppSettingsScreen extends StatelessWidget {
  ) {
    final deviceId = connector.deviceId;
    final isConnected = connector.isConnected && deviceId != null;
-    final selection =
-        isConnected ? settingsService.batteryChemistryForDevice(deviceId) : 'nmc';
+    final selection = isConnected
+        ? settingsService.batteryChemistryForDevice(deviceId)
+        : 'nmc';

    return Card(
      child: Column(
        crossAxisAlignment: CrossAxisAlignment.start,
        children: [
-          const Padding(
-            padding: EdgeInsets.fromLTRB(16, 16, 16, 8),
+          const SizedBox(height: 4),
+          Padding(
+            padding: const EdgeInsets.fromLTRB(16, 16, 16, 8),
            child: Text(
-              'Battery',
-              style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
+              context.l10n.appSettings_battery,
+              style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
            ),
          ),
+
+          // Main tile (icon + text only)
          ListTile(
            leading: const Icon(Icons.battery_full),
-            title: const Text('Battery Chemistry'),
+            title: Text(context.l10n.appSettings_batteryChemistry),
            subtitle: Text(
              isConnected
-                  ? 'Set per device (${connector.deviceDisplayName})'
-                  : 'Connect to a device to choose',
+                  ? context.l10n.appSettings_batteryChemistryPerDevice(
+                      connector.deviceDisplayName,
+                    )
+                  : context.l10n.appSettings_batteryChemistryConnectFirst,
            ),
-            trailing: DropdownButton<String>(
-              value: selection,
+            contentPadding: const EdgeInsets.symmetric(horizontal: 16),
+          ),
+
+          // Dropdown (separate full-width row)
+          Padding(
+            padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
+            child: DropdownButtonFormField<String>(
+              initialValue: selection,
+              isExpanded: true,
+              decoration: const InputDecoration(
+                border: UnderlineInputBorder(),
+                isDense: true,
+              ),
              onChanged: isConnected
                  ? (value) {
                      if (value != null) {
-                        settingsService.setBatteryChemistryForDevice(deviceId, value);
+                        settingsService.setBatteryChemistryForDevice(
+                          deviceId,
+                          value,
+                        );
                      }
                    }
                  : null,
-              items: const [
+              items: [
                DropdownMenuItem(
                  value: 'nmc',
-                  child: Text('18650 NMC (3.0-4.2V)'),
+                  child: Text(context.l10n.appSettings_batteryNmc),
                ),
                DropdownMenuItem(
                  value: 'lifepo4',
-                  child: Text('LiFePO4 (2.6-3.65V)'),
+                  child: Text(context.l10n.appSettings_batteryLifepo4),
                ),
                DropdownMenuItem(
                  value: 'lipo',
-                  child: Text('LiPo (3.0-4.2V)'),
+                  child: Text(context.l10n.appSettings_batteryLipo),
                ),
              ],
            ),
@@ -378,151 +490,322 @@ class AppSettingsScreen extends StatelessWidget {
    );
  }

-  void _showThemeModeDialog(BuildContext context, AppSettingsService settingsService) {
+  void _showThemeModeDialog(
+    BuildContext context,
+    AppSettingsService settingsService,
+  ) {
    showDialog(
      context: context,
      builder: (context) => AlertDialog(
-        title: const Text('Theme'),
-        content: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            RadioListTile<String>(
-              title: const Text('System default'),
-              value: 'system',
-              groupValue: settingsService.settings.themeMode,
-              onChanged: (value) {
-                if (value != null) {
-                  settingsService.setThemeMode(value);
-                  Navigator.pop(context);
-                }
-              },
-            ),
-            RadioListTile<String>(
-              title: const Text('Light'),
-              value: 'light',
-              groupValue: settingsService.settings.themeMode,
-              onChanged: (value) {
-                if (value != null) {
-                  settingsService.setThemeMode(value);
-                  Navigator.pop(context);
-                }
-              },
-            ),
-            RadioListTile<String>(
-              title: const Text('Dark'),
-              value: 'dark',
-              groupValue: settingsService.settings.themeMode,
-              onChanged: (value) {
-                if (value != null) {
-                  settingsService.setThemeMode(value);
-                  Navigator.pop(context);
-                }
-              },
-            ),
-          ],
+        title: Text(context.l10n.appSettings_theme),
+        content: RadioGroup<String>(
+          groupValue: settingsService.settings.themeMode,
+          onChanged: (value) {
+            if (value != null) {
+              settingsService.setThemeMode(value);
+              Navigator.pop(context);
+            }
+          },
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              RadioListTile<String>(
+                title: Text(context.l10n.appSettings_themeSystem),
+                value: 'system',
+              ),
+              RadioListTile<String>(
+                title: Text(context.l10n.appSettings_themeLight),
+                value: 'light',
+              ),
+              RadioListTile<String>(
+                title: Text(context.l10n.appSettings_themeDark),
+                value: 'dark',
+              ),
+            ],
+          ),
        ),
        actions: [
          TextButton(
            onPressed: () => Navigator.pop(context),
-            child: const Text('Close'),
+            child: Text(context.l10n.common_close),
          ),
        ],
      ),
    );
  }

-  String _themeModeLabel(String value) {
+  String _themeModeLabel(BuildContext context, String value) {
    switch (value) {
      case 'light':
-        return 'Light';
+        return context.l10n.appSettings_themeLight;
      case 'dark':
-        return 'Dark';
+        return context.l10n.appSettings_themeDark;
      default:
-        return 'System default';
+        return context.l10n.appSettings_themeSystem;
    }
  }

-  void _showTimeFilterDialog(BuildContext context, AppSettingsService settingsService) {
+  String _languageLabel(BuildContext context, String? languageCode) {
+    switch (languageCode) {
+      case 'en':
+        return context.l10n.appSettings_languageEn;
+      case 'fr':
+        return context.l10n.appSettings_languageFr;
+      case 'es':
+        return context.l10n.appSettings_languageEs;
+      case 'de':
+        return context.l10n.appSettings_languageDe;
+      case 'pl':
+        return context.l10n.appSettings_languagePl;
+      case 'sl':
+        return context.l10n.appSettings_languageSl;
+      case 'pt':
+        return context.l10n.appSettings_languagePt;
+      case 'it':
+        return context.l10n.appSettings_languageIt;
+      case 'zh':
+        return context.l10n.appSettings_languageZh;
+      case 'sv':
+        return context.l10n.appSettings_languageSv;
+      case 'nl':
+        return context.l10n.appSettings_languageNl;
+      case 'sk':
+        return context.l10n.appSettings_languageSk;
+      case 'bg':
+        return context.l10n.appSettings_languageBg;
+      case 'ru':
+        return context.l10n.appSettings_languageRu;
+      case 'uk':
+        return context.l10n.appSettings_languageUk;
+      default:
+        return context.l10n.appSettings_languageSystem;
+    }
+  }
+
+  void _showLanguageDialog(
+    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<double>(
-                value: 0,
-                groupValue: settingsService.settings.mapTimeFilterHours,
-                onChanged: (value) {
-                  if (value != null) {
-                    settingsService.setMapTimeFilterHours(value);
-                    Navigator.pop(context);
-                  }
-                },
-              ),
+        title: Text(context.l10n.appSettings_language),
+        content: SingleChildScrollView(
+          child: RadioGroup<String?>(
+            groupValue: settingsService.settings.languageOverride,
+            onChanged: (value) {
+              settingsService.setLanguageOverride(value);
+              Navigator.pop(context);
+            },
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                RadioListTile<String?>(
+                  title: Text(context.l10n.appSettings_languageSystem),
+                  value: null,
+                ),
+                RadioListTile<String?>(
+                  title: Text(context.l10n.appSettings_languageEn),
+                  value: 'en',
+                ),
+                RadioListTile<String?>(
+                  title: Text(context.l10n.appSettings_languageFr),
+                  value: 'fr',
+                ),
+                RadioListTile<String?>(
+                  title: Text(context.l10n.appSettings_languageEs),
+                  value: 'es',
+                ),
+                RadioListTile<String?>(
+                  title: Text(context.l10n.appSettings_languageDe),
+                  value: 'de',
+                ),
+                RadioListTile<String?>(
+                  title: Text(context.l10n.appSettings_languagePl),
+                  value: 'pl',
+                ),
+                RadioListTile<String?>(
+                  title: Text(context.l10n.appSettings_languageSl),
+                  value: 'sl',
+                ),
+                RadioListTile<String?>(
+                  title: Text(context.l10n.appSettings_languagePt),
+                  value: 'pt',
+                ),
+                RadioListTile<String?>(
+                  title: Text(context.l10n.appSettings_languageIt),
+                  value: 'it',
+                ),
+                RadioListTile<String?>(
+                  title: Text(context.l10n.appSettings_languageZh),
+                  value: 'zh',
+                ),
+                RadioListTile<String?>(
+                  title: Text(context.l10n.appSettings_languageSv),
+                  value: 'sv',
+                ),
+                RadioListTile<String?>(
+                  title: Text(context.l10n.appSettings_languageNl),
+                  value: 'nl',
+                ),
+                RadioListTile<String?>(
+                  title: Text(context.l10n.appSettings_languageSk),
+                  value: 'sk',
+                ),
+                RadioListTile<String?>(
+                  title: Text(context.l10n.appSettings_languageBg),
+                  value: 'bg',
+                ),
+                RadioListTile<String?>(
+                  title: Text(context.l10n.appSettings_languageRu),
+                  value: 'ru',
+                ),
+                RadioListTile<String?>(
+                  title: Text(context.l10n.appSettings_languageUk),
+                  value: 'uk',
+                ),
+              ],
            ),
-            ListTile(
-              title: const Text('Last hour'),
-              leading: Radio<double>(
-                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<double>(
-                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<double>(
-                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<double>(
-                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'),
+            child: Text(context.l10n.common_close),
+          ),
+        ],
+      ),
+    );
+  }
+
+  void _showTimeFilterDialog(
+    BuildContext context,
+    AppSettingsService settingsService,
+  ) {
+    showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: Text(context.l10n.appSettings_mapTimeFilter),
+        content: RadioGroup<double>(
+          groupValue: settingsService.settings.mapTimeFilterHours,
+          onChanged: (value) {
+            if (value != null) {
+              settingsService.setMapTimeFilterHours(value);
+              Navigator.pop(context);
+            }
+          },
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              Text(context.l10n.appSettings_showNodesDiscoveredWithin),
+              const SizedBox(height: 16),
+              ListTile(
+                title: Text(context.l10n.appSettings_allTime),
+                leading: Radio<double>(value: 0),
+              ),
+              ListTile(
+                title: Text(context.l10n.appSettings_lastHour),
+                leading: Radio<double>(value: 1),
+              ),
+              ListTile(
+                title: Text(context.l10n.appSettings_last6Hours),
+                leading: Radio<double>(value: 6),
+              ),
+              ListTile(
+                title: Text(context.l10n.appSettings_last24Hours),
+                leading: Radio<double>(value: 24),
+              ),
+              ListTile(
+                title: Text(context.l10n.appSettings_lastWeek),
+                leading: Radio<double>(value: 168),
+              ),
+            ],
+          ),
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.pop(context),
+            child: Text(context.l10n.common_close),
+          ),
+        ],
+      ),
+    );
+  }
+
+  void _showUnitsDialog(
+    BuildContext context,
+    AppSettingsService settingsService,
+  ) {
+    showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: Text(context.l10n.appSettings_unitsTitle),
+        content: RadioGroup<UnitSystem>(
+          groupValue: settingsService.settings.unitSystem,
+          onChanged: (value) {
+            if (value != null) {
+              settingsService.setUnitSystem(value);
+              Navigator.pop(context);
+            }
+          },
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              ListTile(
+                title: Text(context.l10n.appSettings_unitsMetric),
+                leading: const Radio<UnitSystem>(value: UnitSystem.metric),
+              ),
+              ListTile(
+                title: Text(context.l10n.appSettings_unitsImperial),
+                leading: const Radio<UnitSystem>(value: UnitSystem.imperial),
+              ),
+            ],
+          ),
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.pop(context),
+            child: Text(context.l10n.common_close),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildDebugCard(
+    BuildContext context,
+    AppSettingsService settingsService,
+  ) {
+    return Card(
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Padding(
+            padding: const EdgeInsets.fromLTRB(16, 16, 16, 8),
+            child: Text(
+              context.l10n.appSettings_debugCard,
+              style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
+            ),
+          ),
+          SwitchListTile(
+            secondary: const Icon(Icons.bug_report_outlined),
+            title: Text(context.l10n.appSettings_appDebugLogging),
+            subtitle: Text(context.l10n.appSettings_appDebugLoggingSubtitle),
+            value: settingsService.settings.appDebugLogEnabled,
+            onChanged: (value) async {
+              await settingsService.setAppDebugLogEnabled(value);
+              if (!context.mounted) return;
+              ScaffoldMessenger.of(context).showSnackBar(
+                SnackBar(
+                  content: Text(
+                    value
+                        ? context.l10n.appSettings_appDebugLoggingEnabled
+                        : context.l10n.appSettings_appDebugLoggingDisabled,
+                  ),
+                  duration: const Duration(seconds: 2),
+                ),
+              );
+            },
          ),
        ],
      ),
@@ -1,8 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:flutter/services.dart';
+import '../l10n/l10n.dart';
 import '../services/ble_debug_log_service.dart';
 import '../connector/meshcore_protocol.dart';
+import '../widgets/adaptive_app_bar_title.dart';

 enum _BleLogView { frames, rawLogRx }

@@ -23,33 +25,43 @@ class _BleDebugLogScreenState extends State<BleDebugLogScreen> {
        final entries = logService.entries.reversed.toList();
        final rawEntries = logService.rawLogRxEntries.reversed.toList();
        final showingFrames = _view == _BleLogView.frames;
-        final hasEntries = showingFrames ? entries.isNotEmpty : rawEntries.isNotEmpty;
+        final hasEntries = showingFrames
+            ? entries.isNotEmpty
+            : rawEntries.isNotEmpty;
        return Scaffold(
          appBar: AppBar(
-            title: const Text('BLE Debug Log'),
+            title: AdaptiveAppBarTitle(context.l10n.debugLog_bleTitle),
            actions: [
              IconButton(
-                tooltip: 'Copy log',
+                tooltip: context.l10n.debugLog_copyLog,
                icon: const Icon(Icons.copy),
                onPressed: hasEntries
                    ? () async {
                        final text = showingFrames
                            ? entries
-                                .map((entry) => '${entry.description}\n${entry.hexPreview}\n')
-                                .join('\n')
+                                  .map(
+                                    (entry) =>
+                                        '${entry.description}\n${entry.hexPreview}\n',
+                                  )
+                                  .join('\n')
                            : rawEntries
-                                .map((entry) => 'RX RAW_LOG_RX_DATA\n${entry.hexPreview}\n')
-                                .join('\n');
+                                  .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')),
+                          SnackBar(
+                            content: Text(context.l10n.debugLog_bleCopied),
+                          ),
                        );
                      }
                    : null,
              ),
              IconButton(
-                tooltip: 'Clear log',
+                tooltip: context.l10n.debugLog_clearLog,
                icon: const Icon(Icons.delete_outline),
                onPressed: hasEntries
                    ? () {
@@ -66,9 +78,15 @@ class _BleDebugLogScreenState extends State<BleDebugLogScreen> {
                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')),
+                    segments: [
+                      ButtonSegment(
+                        value: _BleLogView.frames,
+                        label: Text(context.l10n.debugLog_frames),
+                      ),
+                      ButtonSegment(
+                        value: _BleLogView.rawLogRx,
+                        label: Text(context.l10n.debugLog_rawLogRx),
+                      ),
                    ],
                    selected: {_view},
                    onSelectionChanged: (selection) {
@@ -80,8 +98,10 @@ class _BleDebugLogScreenState extends State<BleDebugLogScreen> {
                Expanded(
                  child: hasEntries
                      ? ListView.separated(
-                          itemCount: showingFrames ? entries.length : rawEntries.length,
-                          separatorBuilder: (_, __) => const Divider(height: 1),
+                          itemCount: showingFrames
+                              ? entries.length
+                              : rawEntries.length,
+                          separatorBuilder: (_, _) => const Divider(height: 1),
                          itemBuilder: (context, index) {
                            if (showingFrames) {
                              final entry = entries[index];
@@ -93,9 +113,24 @@ class _BleDebugLogScreenState extends State<BleDebugLogScreen> {
                                subtitle: Text('${entry.hexPreview}\n$time'),
                                isThreeLine: true,
                                leading: Icon(
-                                  entry.outgoing ? Icons.upload : Icons.download,
+                                  entry.outgoing
+                                      ? Icons.upload
+                                      : Icons.download,
                                  size: 18,
                                ),
+                                onLongPress: () async {
+                                  await Clipboard.setData(
+                                    ClipboardData(
+                                      text: entry.payload
+                                          .map(
+                                            (b) => b
+                                                .toRadixString(16)
+                                                .padLeft(2, '0'),
+                                          )
+                                          .join(''),
+                                    ),
+                                  );
+                                },
                              );
                            }

@@ -113,8 +148,8 @@ class _BleDebugLogScreenState extends State<BleDebugLogScreen> {
                            );
                          },
                        )
-                      : const Center(
-                          child: Text('No BLE activity yet'),
+                      : Center(
+                          child: Text(context.l10n.debugLog_noBleActivity),
                        ),
                ),
              ],
@@ -130,13 +165,11 @@ class _BleDebugLogScreenState extends State<BleDebugLogScreen> {
      context: context,
      builder: (context) => AlertDialog(
        title: Text(info.title),
-        content: SingleChildScrollView(
-          child: SelectableText(info.rawHex),
-        ),
+        content: SingleChildScrollView(child: SelectableText(info.rawHex)),
        actions: [
          TextButton(
            onPressed: () => Navigator.pop(context),
-            child: const Text('Close'),
+            child: Text(context.l10n.common_close),
          ),
        ],
      ),
@@ -194,11 +227,18 @@ class _BleDebugLogScreenState extends State<BleDebugLogScreen> {
    }
    final payload = raw.sublist(index);

-    final title = 'RX ${_payloadTypeLabel(payloadType)} • ${_routeLabel(routeType)} • v$payloadVer';
+    final title =
+        'RX ${_payloadTypeLabel(payloadType)} • ${_routeLabel(routeType)} • v$payloadVer';
    final summary = _decodePayloadSummary(payloadType, payload);
-    final pathSummary = pathLen > 0 ? 'Path=${_bytesToHex(pathBytes)}' : 'Path=none';
+    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));
+    return _RawPacketInfo(
+      title: title,
+      summary: detail,
+      rawHex: _bytesToHex(raw),
+    );
  }

  String _decodePayloadSummary(int payloadType, Uint8List payload) {
@@ -244,7 +284,10 @@ class _BleDebugLogScreenState extends State<BleDebugLogScreen> {
      return 'ADVERT (short)';
    }
    var offset = 0;
-    final pubKey = _bytesToHex(payload.sublist(offset, offset + 32), spaced: false);
+    final pubKey = _bytesToHex(
+      payload.sublist(offset, offset + 32),
+      spaced: false,
+    );
    offset += 32;
    final timestamp = readUint32LE(payload, offset);
    offset += 4;
@@ -4,45 +4,79 @@ import 'dart:typed_data';
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:latlong2/latlong.dart';
+import 'package:meshcore_open/screens/path_trace_map.dart';
 import 'package:provider/provider.dart';

 import '../connector/meshcore_connector.dart';
 import '../services/map_tile_cache_service.dart';
+import '../services/app_settings_service.dart';
 import '../connector/meshcore_protocol.dart';
+import '../l10n/app_localizations.dart';
+import '../l10n/l10n.dart';
 import '../models/channel_message.dart';
+import '../models/app_settings.dart';
 import '../models/contact.dart';
+import '../widgets/adaptive_app_bar_title.dart';

 class ChannelMessagePathScreen extends StatelessWidget {
  final ChannelMessage message;
-
+  final bool channelMessage;
  const ChannelMessagePathScreen({
    super.key,
    required this.message,
+    this.channelMessage = false,
  });

  @override
  Widget build(BuildContext context) {
    return Consumer<MeshCoreConnector>(
      builder: (context, connector, _) {
-        final primaryPath = _selectPrimaryPath(message.pathBytes, message.pathVariants);
-        final hops = _buildPathHops(primaryPath, connector.contacts);
+        final l10n = context.l10n;
+        final primaryPathTmp = _selectPrimaryPath(
+          message.pathBytes,
+          message.pathVariants,
+        );
+
+        final primaryPath = !channelMessage && !message.isOutgoing
+            ? Uint8List.fromList(primaryPathTmp.reversed.toList())
+            : primaryPathTmp;
+        final contacts = <Contact>[
+          ...connector.contacts,
+          ...connector.discoveredContacts,
+        ];
+        final hops = _buildPathHops(primaryPath, contacts, l10n);
        final hasHopDetails = primaryPath.isNotEmpty;
        final observedLabel = _formatObservedHops(
          primaryPath.length,
          message.pathLength,
+          l10n,
        );
        final extraPaths = _otherPaths(primaryPath, message.pathVariants);
-
        return Scaffold(
          appBar: AppBar(
-            title: const Text('Packet Path'),
+            title: AdaptiveAppBarTitle(l10n.channelPath_title),
            actions: [
+              IconButton(
+                icon: const Icon(Icons.radar_outlined),
+                tooltip: l10n.channelPath_viewMap,
+                onPressed: () => Navigator.push(
+                  context,
+                  MaterialPageRoute(
+                    builder: (context) => PathTraceMapScreen(
+                      title: context.l10n.contacts_repeaterPathTrace,
+                      path: primaryPath,
+                      flipPathRound: true,
+                      reversePathRound: !message.isOutgoing && !channelMessage,
+                    ),
+                  ),
+                ),
+              ),
              IconButton(
                icon: const Icon(Icons.map_outlined),
-                tooltip: 'View map',
+                tooltip: l10n.channelPath_viewMap,
                onPressed: hasHopDetails
                    ? () {
-                        _openPathMap(context);
+                        _openPathMap(context, channelMessage: channelMessage);
                      }
                    : null,
              ),
@@ -57,7 +91,7 @@ class ChannelMessagePathScreen extends StatelessWidget {
                const SizedBox(height: 16),
                if (extraPaths.isNotEmpty) ...[
                  Text(
-                    'Other Observed Paths',
+                    l10n.channelPath_otherObservedPaths,
                    style: Theme.of(context).textTheme.titleSmall,
                  ),
                  const SizedBox(height: 8),
@@ -65,17 +99,17 @@ class ChannelMessagePathScreen extends StatelessWidget {
                  const SizedBox(height: 16),
                ],
                Text(
-                  'Repeater Hops',
+                  l10n.channelPath_repeaterHops,
                  style: Theme.of(context).textTheme.titleSmall,
                ),
                const SizedBox(height: 8),
                if (!hasHopDetails)
-                  const Text(
-                    'Hop details are not provided for this packet.',
-                    style: TextStyle(color: Colors.grey),
+                  Text(
+                    l10n.channelPath_noHopDetails,
+                    style: const TextStyle(color: Colors.grey),
                  )
                else
-                  ..._buildHopTiles(hops),
+                  ..._buildHopTiles(context, hops),
              ],
            ),
          ),
@@ -84,10 +118,8 @@ class ChannelMessagePathScreen extends StatelessWidget {
    );
  }

-  Widget _buildSummaryCard(
-    BuildContext context, {
-    String? observedLabel,
-  }) {
+  Widget _buildSummaryCard(BuildContext context, {String? observedLabel}) {
+    final l10n = context.l10n;
    return Card(
      child: Padding(
        padding: const EdgeInsets.all(12),
@@ -95,26 +127,34 @@ class ChannelMessagePathScreen extends StatelessWidget {
          crossAxisAlignment: CrossAxisAlignment.start,
          children: [
            Text(
-              'Message Details',
+              l10n.channelPath_messageDetails,
              style: Theme.of(context).textTheme.titleSmall,
            ),
            const SizedBox(height: 8),
-            _buildDetailRow('Sender', message.senderName),
-            _buildDetailRow('Time', _formatTime(message.timestamp)),
+            _buildDetailRow(l10n.channelPath_senderLabel, message.senderName),
+            _buildDetailRow(
+              l10n.channelPath_timeLabel,
+              _formatTime(message.timestamp, l10n),
+            ),
            if (message.repeatCount > 0)
-              _buildDetailRow('Repeats', message.repeatCount.toString()),
-            _buildDetailRow('Path', _formatPathLabel(message.pathLength)),
-            if (observedLabel != null) _buildDetailRow('Observed', observedLabel),
+              _buildDetailRow(
+                l10n.channelPath_repeatsLabel,
+                message.repeatCount.toString(),
+              ),
+            _buildDetailRow(
+              l10n.channelPath_pathLabelTitle,
+              _formatPathLabel(message.pathLength, l10n),
+            ),
+            if (observedLabel != null)
+              _buildDetailRow(l10n.channelPath_observedLabel, observedLabel),
          ],
        ),
      ),
    );
  }

-  Widget _buildPathVariants(
-    BuildContext context,
-    List<Uint8List> variants,
-  ) {
+  Widget _buildPathVariants(BuildContext context, List<Uint8List> variants) {
+    final l10n = context.l10n;
    return Column(
      crossAxisAlignment: CrossAxisAlignment.start,
      children: [
@@ -124,18 +164,26 @@ class ChannelMessagePathScreen extends StatelessWidget {
            child: ListTile(
              dense: true,
              title: Text(
-                'Observed path ${i + 1} • ${_formatHopCount(variants[i].length)}',
+                l10n.channelPath_observedPathTitle(
+                  i + 1,
+                  _formatHopCount(variants[i].length, l10n),
+                ),
              ),
              subtitle: Text(_formatPathPrefixes(variants[i])),
              trailing: const Icon(Icons.map_outlined, size: 20),
-              onTap: () => _openPathMap(context, initialPath: variants[i]),
+              onTap: () => _openPathMap(
+                context,
+                initialPath: variants[i],
+                channelMessage: channelMessage,
+              ),
            ),
          ),
      ],
    );
  }

-  List<Widget> _buildHopTiles(List<_PathHop> hops) {
+  List<Widget> _buildHopTiles(BuildContext context, List<_PathHop> hops) {
+    final l10n = context.l10n;
    return [
      for (final hop in hops)
        Card(
@@ -153,46 +201,53 @@ class ChannelMessagePathScreen extends StatelessWidget {
            subtitle: Text(
              hop.hasLocation
                  ? '${hop.position!.latitude.toStringAsFixed(5)}, '
-                      '${hop.position!.longitude.toStringAsFixed(5)}'
-                  : 'No location data',
+                        '${hop.position!.longitude.toStringAsFixed(5)}'
+                  : l10n.channelPath_noLocationData,
            ),
          ),
        ),
    ];
  }

-  String _formatTime(DateTime time) {
+  String _formatTime(DateTime time, AppLocalizations l10n) {
    final now = DateTime.now();
    final diff = now.difference(time);

    if (diff.inDays > 0) {
-      return '${time.day}/${time.month} '
+      final timeLabel =
          '${time.hour}:${time.minute.toString().padLeft(2, '0')}';
+      return l10n.channelPath_timeWithDate(time.day, time.month, timeLabel);
    }
-    return '${time.hour}:${time.minute.toString().padLeft(2, '0')}';
+    return l10n.channelPath_timeOnly(
+      '${time.hour}:${time.minute.toString().padLeft(2, '0')}',
+    );
  }

-  String _formatPathLabel(int? pathLength) {
-    if (pathLength == null) return 'Unknown';
-    if (pathLength < 0) return 'Flood';
-    if (pathLength == 0) return 'Direct';
-    return '$pathLength hops';
+  String _formatPathLabel(int? pathLength, AppLocalizations l10n) {
+    if (pathLength == null) return l10n.channelPath_unknownPath;
+    if (pathLength < 0) return l10n.channelPath_floodPath;
+    if (pathLength == 0) return l10n.channelPath_directPath;
+    return l10n.chat_hopsCount(pathLength);
  }

-  String? _formatObservedHops(int observedCount, int? pathLength) {
+  String? _formatObservedHops(
+    int observedCount,
+    int? pathLength,
+    AppLocalizations l10n,
+  ) {
    if (observedCount <= 0 && (pathLength == null || pathLength <= 0)) {
      return null;
    }
    if (pathLength == null || pathLength < 0) {
-      return observedCount > 0 ? '$observedCount hops' : null;
+      return observedCount > 0 ? l10n.chat_hopsCount(observedCount) : null;
    }
    if (observedCount == 0) {
-      return '0 of $pathLength hops';
+      return l10n.channelPath_observedZeroOf(pathLength);
    }
    if (observedCount == pathLength) {
-      return '$observedCount hops';
+      return l10n.chat_hopsCount(observedCount);
    }
-    return '$observedCount of $pathLength hops';
+    return l10n.channelPath_observedSomeOf(observedCount, pathLength);
  }

  Widget _buildDetailRow(String label, String value) {
@@ -211,28 +266,34 @@ class ChannelMessagePathScreen extends StatelessWidget {
    );
  }

-  void _openPathMap(BuildContext context, {Uint8List? initialPath}) {
+  void _openPathMap(
+    BuildContext context, {
+    Uint8List? initialPath,
+    bool channelMessage = false,
+  }) {
    Navigator.push(
      context,
      MaterialPageRoute(
        builder: (context) => ChannelMessagePathMapScreen(
          message: message,
          initialPath: initialPath,
+          channelMessage: channelMessage,
        ),
      ),
    );
  }
-
 }

 class ChannelMessagePathMapScreen extends StatefulWidget {
  final ChannelMessage message;
  final Uint8List? initialPath;
+  final bool channelMessage;

  const ChannelMessagePathMapScreen({
    super.key,
    required this.message,
    this.initialPath,
+    this.channelMessage = false,
  });

  @override
@@ -240,8 +301,14 @@ class ChannelMessagePathMapScreen extends StatefulWidget {
      _ChannelMessagePathMapScreenState();
 }

-class _ChannelMessagePathMapScreenState extends State<ChannelMessagePathMapScreen> {
+class _ChannelMessagePathMapScreenState
+    extends State<ChannelMessagePathMapScreen> {
+  static const double _labelZoomThreshold = 8.5;
+
  Uint8List? _selectedPath;
+  double _pathDistance = 0.0;
+  bool _showNodeLabels = true;
+  bool _didReceivePositionUpdate = false;

  @override
  void initState() {
@@ -253,32 +320,77 @@ class _ChannelMessagePathMapScreenState extends State<ChannelMessagePathMapScree
  void didUpdateWidget(ChannelMessagePathMapScreen oldWidget) {
    super.didUpdateWidget(oldWidget);
    if (oldWidget.message != widget.message ||
-        !_pathsEqual(oldWidget.initialPath ?? Uint8List(0),
-            widget.initialPath ?? Uint8List(0))) {
+        !_pathsEqual(
+          oldWidget.initialPath ?? Uint8List(0),
+          widget.initialPath ?? Uint8List(0),
+        )) {
      _selectedPath = widget.initialPath;
    }
  }

+  double _getPathDistance(List<LatLng> points) {
+    double totalDistance = 0.0;
+    final distanceCalculator = Distance();
+
+    for (int i = 0; i < points.length - 1; i++) {
+      totalDistance += distanceCalculator(points[i], points[i + 1]);
+    }
+
+    return totalDistance;
+  }
+
  @override
  Widget build(BuildContext context) {
    return Consumer<MeshCoreConnector>(
      builder: (context, connector, _) {
+        final settings = context.watch<AppSettingsService>().settings;
+        final isImperial = settings.unitSystem == UnitSystem.imperial;
        final tileCache = context.read<MapTileCacheService>();
-        final primaryPath =
-            _selectPrimaryPath(widget.message.pathBytes, widget.message.pathVariants);
-        final observedPaths =
-            _buildObservedPaths(primaryPath, widget.message.pathVariants);
-        final selectedPath = _resolveSelectedPath(
+        final primaryPath = _selectPrimaryPath(
+          widget.message.pathBytes,
+          widget.message.pathVariants,
+        );
+        final observedPaths = _buildObservedPaths(
+          primaryPath,
+          widget.message.pathVariants,
+        );
+        final selectedPathTmp = _resolveSelectedPath(
          _selectedPath,
          observedPaths,
          primaryPath,
        );
+
+        final selectedPath =
+            ((!widget.message.isOutgoing && !widget.channelMessage) ||
+                (widget.message.isOutgoing && widget.channelMessage))
+            ? Uint8List.fromList(selectedPathTmp.reversed.toList())
+            : selectedPathTmp;
+
        final selectedIndex = _indexForPath(selectedPath, observedPaths);
-        final hops = _buildPathHops(selectedPath, connector.contacts);
-        final points = hops
-            .where((hop) => hop.hasLocation)
-            .map((hop) => hop.position!)
-            .toList();
+        final contacts = <Contact>[
+          ...connector.contacts,
+          ...connector.discoveredContacts,
+        ];
+        final hops = _buildPathHops(selectedPath, contacts, context.l10n);
+
+        final points = <LatLng>[];
+
+        if ((widget.message.isOutgoing && !widget.channelMessage) ||
+            (widget.message.isOutgoing && widget.channelMessage)) {
+          points.add(LatLng(connector.selfLatitude!, connector.selfLongitude!));
+        }
+
+        for (final hop in hops) {
+          if (hop.hasLocation) {
+            points.add(hop.position!);
+          }
+        }
+
+        if ((!widget.message.isOutgoing && !widget.channelMessage) ||
+            (!widget.message.isOutgoing && widget.channelMessage)) {
+          points.add(LatLng(connector.selfLatitude!, connector.selfLongitude!));
+        }
+
        final polylines = points.length > 1
            ? [
                Polyline(
@@ -289,15 +401,24 @@ class _ChannelMessagePathMapScreenState extends State<ChannelMessagePathMapScree
              ]
            : <Polyline>[];

-        final initialCenter =
-            points.isNotEmpty ? points.first : const LatLng(0, 0);
+        final initialCenter = points.isNotEmpty
+            ? points.first
+            : const LatLng(0, 0);
        final initialZoom = points.isNotEmpty ? 13.0 : 2.0;
-        final bounds = points.length > 1 ? LatLngBounds.fromPoints(points) : null;
-        final mapKey = ValueKey(_formatPathPrefixes(selectedPath));
+        if (!_didReceivePositionUpdate) {
+          _showNodeLabels = initialZoom >= _labelZoomThreshold;
+        }
+        final bounds = points.length > 1
+            ? LatLngBounds.fromPoints(points)
+            : null;
+        final mapKey = ValueKey(
+          '${_formatPathPrefixes(selectedPath)},${context.l10n.pathTrace_you}',
+        );
+        _pathDistance = _getPathDistance(points);

        return Scaffold(
          appBar: AppBar(
-            title: const Text('Path Map'),
+            title: AdaptiveAppBarTitle(context.l10n.channelPath_mapTitle),
          ),
          body: SafeArea(
            top: false,
@@ -317,6 +438,20 @@ class _ChannelMessagePathMapScreenState extends State<ChannelMessagePathMapScree
                          ),
                    minZoom: 2.0,
                    maxZoom: 18.0,
+                    interactionOptions: InteractionOptions(
+                      flags: ~InteractiveFlag.rotate,
+                    ),
+                    onPositionChanged: (camera, hasGesture) {
+                      final shouldShow = camera.zoom >= _labelZoomThreshold;
+                      if (!_didReceivePositionUpdate ||
+                          shouldShow != _showNodeLabels) {
+                        if (!mounted) return;
+                        setState(() {
+                          _didReceivePositionUpdate = true;
+                          _showNodeLabels = shouldShow;
+                        });
+                      }
+                    },
                  ),
                  children: [
                    TileLayer(
@@ -326,34 +461,37 @@ class _ChannelMessagePathMapScreenState extends State<ChannelMessagePathMapScree
                          MapTileCacheService.userAgentPackageName,
                      maxZoom: 19,
                    ),
-                    if (polylines.isNotEmpty) PolylineLayer(polylines: polylines),
+                    if (polylines.isNotEmpty)
+                      PolylineLayer(polylines: polylines),
                    MarkerLayer(
-                      markers: _buildHopMarkers(hops),
+                      markers: _buildHopMarkers(
+                        hops,
+                        showLabels: _showNodeLabels,
+                      ),
                    ),
                  ],
                ),
                if (observedPaths.length > 1)
-                  _buildPathSelector(
-                    context,
-                    observedPaths,
-                    selectedIndex,
-                    (index) {
-                      setState(() {
-                        _selectedPath = observedPaths[index].pathBytes;
-                      });
-                    },
-                  ),
+                  _buildPathSelector(context, observedPaths, selectedIndex, (
+                    index,
+                  ) {
+                    setState(() {
+                      _selectedPath = observedPaths[index].pathBytes;
+                    });
+                  }),
                if (points.isEmpty)
                  Center(
                    child: Card(
                      color: Colors.white.withValues(alpha: 0.9),
-                      child: const Padding(
+                      child: Padding(
                        padding: EdgeInsets.all(12),
-                        child: Text('No repeater locations available for this path.'),
+                        child: Text(
+                          context.l10n.channelPath_noRepeaterLocations,
+                        ),
                      ),
                    ),
                  ),
-                _buildLegendCard(context, hops),
+                _buildLegendCard(context, hops, isImperial),
              ],
            ),
          ),
@@ -368,10 +506,11 @@ class _ChannelMessagePathMapScreenState extends State<ChannelMessagePathMapScree
    int selectedIndex,
    ValueChanged<int> onSelected,
  ) {
+    final l10n = context.l10n;
    final selectedPath = paths[selectedIndex];
    final label = selectedPath.isPrimary
-        ? 'Path ${selectedIndex + 1} (Primary)'
-        : 'Path ${selectedIndex + 1}';
+        ? l10n.channelPath_primaryPath(selectedIndex + 1)
+        : l10n.channelPath_pathLabel(selectedIndex + 1);
    return Positioned(
      left: 16,
      right: 16,
@@ -383,9 +522,9 @@ class _ChannelMessagePathMapScreenState extends State<ChannelMessagePathMapScree
            child: Column(
              crossAxisAlignment: CrossAxisAlignment.start,
              children: [
-                const Text(
-                  'Observed Path',
-                  style: TextStyle(fontWeight: FontWeight.w600),
+                Text(
+                  l10n.channelPath_observedPathHeader,
+                  style: const TextStyle(fontWeight: FontWeight.w600),
                ),
                const SizedBox(height: 4),
                DropdownButtonHideUnderline(
@@ -397,8 +536,8 @@ class _ChannelMessagePathMapScreenState extends State<ChannelMessagePathMapScree
                        DropdownMenuItem(
                          value: i,
                          child: Text(
-                            '${paths[i].isPrimary ? 'Path ${i + 1} (Primary)' : 'Path ${i + 1}'}'
-                            ' • ${_formatHopCount(paths[i].pathBytes.length)}',
+                            '${paths[i].isPrimary ? l10n.channelPath_primaryPath(i + 1) : l10n.channelPath_pathLabel(i + 1)}'
+                            ' • ${_formatHopCount(paths[i].pathBytes.length, l10n)}',
                          ),
                        ),
                    ],
@@ -410,7 +549,10 @@ class _ChannelMessagePathMapScreenState extends State<ChannelMessagePathMapScree
                ),
                const SizedBox(height: 4),
                Text(
-                  '$label • ${_formatPathPrefixes(selectedPath.pathBytes)}',
+                  l10n.channelPath_selectedPathLabel(
+                    label,
+                    _formatPathPrefixes(selectedPath.pathBytes),
+                  ),
                  style: TextStyle(color: Colors.grey[700], fontSize: 12),
                ),
              ],
@@ -421,42 +563,142 @@ class _ChannelMessagePathMapScreenState extends State<ChannelMessagePathMapScree
    );
  }

-  List<Marker> _buildHopMarkers(List<_PathHop> hops) {
-    return [
-      for (final hop in hops)
-        if (hop.hasLocation)
-          Marker(
-            point: hop.position!,
-            width: 40,
-            height: 40,
+  List<Marker> _buildHopMarkers(
+    List<_PathHop> hops, {
+    required bool showLabels,
+  }) {
+    final markers = <Marker>[];
+    for (final hop in hops) {
+      if (!hop.hasLocation) continue;
+      final point = hop.position!;
+      markers.add(
+        Marker(
+          point: point,
+          width: 35,
+          height: 35,
+          child: Container(
+            decoration: BoxDecoration(
+              color: Colors.green,
+              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),
+                ),
+              ],
+            ),
+            alignment: Alignment.center,
+            child: Text(
+              hop.index.toString(),
+              style: const TextStyle(
+                color: Colors.white,
+                fontWeight: FontWeight.bold,
+                fontSize: 12,
+              ),
+            ),
+          ),
+        ),
+      );
+      if (showLabels) {
+        markers.add(
+          _buildNodeLabelMarker(
+            point: point,
+            label: hop.contact?.name ?? _formatPrefix(hop.prefix),
+          ),
+        );
+      }
+    }
+
+    final selfLat = context.read<MeshCoreConnector>().selfLatitude;
+    final selfLon = context.read<MeshCoreConnector>().selfLongitude;
+    if (selfLat != null && selfLon != null) {
+      final selfPoint = LatLng(selfLat, selfLon);
+      markers.add(
+        Marker(
+          point: selfPoint,
+          width: 35,
+          height: 35,
+          child: Container(
+            decoration: BoxDecoration(
+              color: Colors.teal,
+              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),
+                ),
+              ],
+            ),
+            alignment: Alignment.center,
+            child: Text(
+              context.l10n.pathTrace_you,
+              style: const TextStyle(
+                color: Colors.white,
+                fontWeight: FontWeight.bold,
+                fontSize: 12,
+              ),
+            ),
+          ),
+        ),
+      );
+      if (showLabels) {
+        markers.add(
+          _buildNodeLabelMarker(
+            point: selfPoint,
+            label: context.l10n.pathTrace_you,
+          ),
+        );
+      }
+    }
+
+    return markers;
+  }
+
+  Marker _buildNodeLabelMarker({required LatLng point, required String label}) {
+    return Marker(
+      point: point,
+      width: 120,
+      height: 24,
+      alignment: Alignment.topCenter,
+      child: IgnorePointer(
+        child: Transform.translate(
+          offset: const Offset(0, -20),
+          child: FittedBox(
+            fit: BoxFit.contain,
            child: Container(
+              padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
              decoration: BoxDecoration(
-                color: Colors.green,
-                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),
-                  ),
-                ],
+                color: Colors.black54,
+                borderRadius: BorderRadius.circular(8),
              ),
              alignment: Alignment.center,
              child: Text(
-                hop.index.toString(),
+                label,
+                maxLines: 1,
+                overflow: TextOverflow.ellipsis,
                style: const TextStyle(
                  color: Colors.white,
-                  fontWeight: FontWeight.bold,
-                  fontSize: 12,
+                  fontSize: 11,
+                  fontWeight: FontWeight.w500,
                ),
              ),
            ),
          ),
-    ];
+        ),
+      ),
+    );
  }

-  Widget _buildLegendCard(BuildContext context, List<_PathHop> hops) {
+  Widget _buildLegendCard(
+    BuildContext context,
+    List<_PathHop> hops,
+    bool isImperial,
+  ) {
+    final l10n = context.l10n;
    final maxHeight = MediaQuery.of(context).size.height * 0.35;
    final estimatedHeight = 72.0 + (hops.length * 56.0);
    final cardHeight = max(96.0, min(maxHeight, estimatedHeight));
@@ -471,23 +713,23 @@ class _ChannelMessagePathMapScreenState extends State<ChannelMessagePathMapScree
          child: Column(
            crossAxisAlignment: CrossAxisAlignment.start,
            children: [
-              const Padding(
-                padding: EdgeInsets.all(12),
+              Padding(
+                padding: const EdgeInsets.all(12),
                child: Text(
-                  'Repeater Hops',
-                  style: TextStyle(fontWeight: FontWeight.w600),
+                  '${l10n.channelPath_repeaterHops} ${formatDistance(_pathDistance, isImperial: isImperial)}',
+                  style: const TextStyle(fontWeight: FontWeight.w600),
                ),
              ),
              const Divider(height: 1),
              Expanded(
                child: hops.isEmpty
-                    ? const Center(
-                        child: Text('No hop details available for this packet.'),
+                    ? Center(
+                        child: Text(l10n.channelPath_noHopDetailsAvailable),
                      )
                    : ListView.separated(
                        padding: const EdgeInsets.symmetric(vertical: 4),
                        itemCount: hops.length,
-                        separatorBuilder: (_, __) => const Divider(height: 1),
+                        separatorBuilder: (_, _) => const Divider(height: 1),
                        itemBuilder: (context, index) {
                          final hop = hops[index];
                          return ListTile(
@@ -503,8 +745,8 @@ class _ChannelMessagePathMapScreenState extends State<ChannelMessagePathMapScree
                            subtitle: Text(
                              hop.hasLocation
                                  ? '${hop.position!.latitude.toStringAsFixed(5)}, '
-                                      '${hop.position!.longitude.toStringAsFixed(5)}'
-                                  : 'No location data',
+                                        '${hop.position!.longitude.toStringAsFixed(5)}'
+                                  : l10n.channelPath_noLocationData,
                            ),
                          );
                        },
@@ -523,19 +765,21 @@ class _PathHop {
  final int prefix;
  final Contact? contact;
  final LatLng? position;
+  final AppLocalizations l10n;

  const _PathHop({
    required this.index,
    required this.prefix,
    required this.contact,
    required this.position,
+    required this.l10n,
  });

  bool get hasLocation => position != null;

  String get displayLabel {
    final prefixLabel = _formatPrefix(prefix);
-    return '($prefixLabel) ${_resolveName(contact)}';
+    return '($prefixLabel) ${_resolveName(contact, l10n)}';
  }
 }

@@ -543,13 +787,14 @@ class _ObservedPath {
  final Uint8List pathBytes;
  final bool isPrimary;

-  const _ObservedPath({
-    required this.pathBytes,
-    required this.isPrimary,
-  });
+  const _ObservedPath({required this.pathBytes, required this.isPrimary});
 }

-List<_PathHop> _buildPathHops(Uint8List pathBytes, List<Contact> contacts) {
+List<_PathHop> _buildPathHops(
+  Uint8List pathBytes,
+  List<Contact> contacts,
+  AppLocalizations l10n,
+) {
  final hops = <_PathHop>[];
  for (var i = 0; i < pathBytes.length; i++) {
    final prefix = pathBytes[i];
@@ -560,6 +805,7 @@ List<_PathHop> _buildPathHops(Uint8List pathBytes, List<Contact> contacts) {
        prefix: prefix,
        contact: contact,
        position: _resolvePosition(contact),
+        l10n: l10n,
      ),
    );
  }
@@ -568,10 +814,12 @@ List<_PathHop> _buildPathHops(Uint8List pathBytes, List<Contact> contacts) {

 Contact? _matchContactForPrefix(List<Contact> contacts, int prefix) {
  final matches = contacts
-      .where((contact) =>
-          (contact.type == advTypeRepeater || contact.type == advTypeRoom) &&
-          contact.publicKey.isNotEmpty &&
-          contact.publicKey[0] == prefix)
+      .where(
+        (contact) =>
+            (contact.type == advTypeRepeater || contact.type == advTypeRoom) &&
+            contact.publicKey.isNotEmpty &&
+            contact.publicKey[0] == prefix,
+      )
      .toList();
  if (matches.isEmpty) return null;

@@ -612,15 +860,15 @@ String _formatPathPrefixes(Uint8List pathBytes) {
      .join(',');
 }

-String _formatHopCount(int count) {
-  return '$count ${count == 1 ? 'hop' : 'hops'}';
+String _formatHopCount(int count, AppLocalizations l10n) {
+  return l10n.chat_hopsCount(count);
 }

-String _resolveName(Contact? contact) {
-  if (contact == null) return 'Unknown Repeater';
+String _resolveName(Contact? contact, AppLocalizations l10n) {
+  if (contact == null) return l10n.channelPath_unknownRepeater;
  final name = contact.name.trim();
  if (name.isEmpty || name.toLowerCase() == 'unknown') {
-    return 'Unknown Repeater';
+    return l10n.channelPath_unknownRepeater;
  }
  return name;
 }
@@ -0,0 +1,89 @@
+import 'package:flutter/material.dart';
+import '../l10n/l10n.dart';
+
+class ChromeRequiredScreen extends StatelessWidget {
+  const ChromeRequiredScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = context.l10n;
+    final theme = Theme.of(context);
+    final isDark = theme.brightness == Brightness.dark;
+
+    return Scaffold(
+      body: Container(
+        width: double.infinity,
+        padding: const EdgeInsets.symmetric(horizontal: 32),
+        decoration: BoxDecoration(
+          gradient: LinearGradient(
+            begin: Alignment.topLeft,
+            end: Alignment.bottomRight,
+            colors: isDark
+                ? [const Color(0xFF1A1A1A), const Color(0xFF0D0D0D)]
+                : [const Color(0xFFF5F7FA), const Color(0xFFE4E7EB)],
+          ),
+        ),
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Container(
+              padding: const EdgeInsets.all(24),
+              decoration: BoxDecoration(
+                color: Colors.orange.withValues(alpha: 0.1),
+                shape: BoxShape.circle,
+              ),
+              child: const Icon(
+                Icons.browser_not_supported_rounded,
+                size: 80,
+                color: Colors.orange,
+              ),
+            ),
+            const SizedBox(height: 32),
+            Text(
+              l10n.scanner_chromeRequired,
+              textAlign: TextAlign.center,
+              style: theme.textTheme.headlineMedium?.copyWith(
+                fontWeight: FontWeight.bold,
+                color: isDark ? Colors.white : Colors.black87,
+              ),
+            ),
+            const SizedBox(height: 16),
+            Text(
+              l10n.scanner_chromeRequiredMessage,
+              textAlign: TextAlign.center,
+              style: theme.textTheme.bodyLarge?.copyWith(
+                color: isDark ? Colors.white70 : Colors.black54,
+                height: 1.5,
+              ),
+            ),
+            const SizedBox(height: 48),
+            // We can't really "fix" it for them other than telling them to use Chrome
+            // but we can provide a nice visual.
+            Container(
+              padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 12),
+              decoration: BoxDecoration(
+                color: Colors.blue.withValues(alpha: 0.1),
+                borderRadius: BorderRadius.circular(30),
+                border: Border.all(color: Colors.blue.withValues(alpha: 0.3)),
+              ),
+              child: Row(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  const Icon(Icons.info_outline, size: 20, color: Colors.blue),
+                  const SizedBox(width: 12),
+                  Text(
+                    "Web Bluetooth requires a Chromium browser",
+                    style: theme.textTheme.bodyMedium?.copyWith(
+                      color: Colors.blue,
+                      fontWeight: FontWeight.w500,
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
@@ -0,0 +1,251 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:uuid/uuid.dart';
+
+import '../connector/meshcore_connector.dart';
+import '../l10n/l10n.dart';
+import '../models/community.dart';
+import '../storage/community_store.dart';
+import '../widgets/adaptive_app_bar_title.dart';
+import '../widgets/qr_scanner_widget.dart';
+
+/// Screen for scanning community QR codes to join communities.
+///
+/// After successful scan, the user can:
+/// 1. Join the community (saves to local storage)
+/// 2. Optionally add the Community Public Channel to the device
+class CommunityQrScannerScreen extends StatefulWidget {
+  const CommunityQrScannerScreen({super.key});
+
+  @override
+  State<CommunityQrScannerScreen> createState() =>
+      _CommunityQrScannerScreenState();
+}
+
+class _CommunityQrScannerScreenState extends State<CommunityQrScannerScreen> {
+  final CommunityStore _communityStore = CommunityStore();
+  bool _isProcessing = false;
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: AdaptiveAppBarTitle(context.l10n.community_scanQr),
+        centerTitle: true,
+      ),
+      body: _isProcessing
+          ? const Center(child: CircularProgressIndicator())
+          : QrScannerWidget(
+              onScanned: (data) => _handleScannedData(context, data),
+              validator: Community.isValidQrData,
+              onValidationFailed: (_) => _showInvalidQrError(context),
+              instructions: context.l10n.community_scanInstructions,
+            ),
+    );
+  }
+
+  Future<void> _handleScannedData(BuildContext context, String data) async {
+    if (_isProcessing) return;
+
+    setState(() {
+      _isProcessing = true;
+    });
+
+    final connector = context.read<MeshCoreConnector>();
+    _communityStore.setPublicKeyHex = connector.selfPublicKeyHex;
+
+    try {
+      // Parse the community data
+      final community = Community.fromQrData(const Uuid().v4(), data);
+
+      // Check if this community already exists
+      final existing = await _communityStore.findByCommunityId(
+        community.communityId,
+      );
+
+      if (existing != null) {
+        if (context.mounted) {
+          _showAlreadyMemberDialog(context, existing);
+        }
+        return;
+      }
+
+      // Show confirmation dialog
+      if (context.mounted) {
+        await _showJoinConfirmationDialog(context, community);
+      }
+    } catch (e) {
+      if (context.mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text(context.l10n.community_invalidQrCode),
+            backgroundColor: Colors.red,
+          ),
+        );
+      }
+    } finally {
+      if (mounted) {
+        setState(() {
+          _isProcessing = false;
+        });
+      }
+    }
+  }
+
+  void _showInvalidQrError(BuildContext context) {
+    ScaffoldMessenger.of(context).showSnackBar(
+      SnackBar(
+        content: Text(context.l10n.community_invalidQrCode),
+        backgroundColor: Colors.orange,
+        duration: const Duration(seconds: 2),
+      ),
+    );
+  }
+
+  void _showAlreadyMemberDialog(BuildContext context, Community community) {
+    showDialog(
+      context: context,
+      builder: (dialogContext) => AlertDialog(
+        title: Text(context.l10n.community_alreadyMember),
+        content: Text(
+          context.l10n.community_alreadyMemberMessage(community.name),
+        ),
+        actions: [
+          TextButton(
+            onPressed: () {
+              Navigator.pop(dialogContext);
+              Navigator.pop(context);
+            },
+            child: Text(context.l10n.common_ok),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Future<void> _showJoinConfirmationDialog(
+    BuildContext context,
+    Community community,
+  ) async {
+    bool addPublicChannel = true;
+
+    final result = await showDialog<bool>(
+      context: context,
+      builder: (dialogContext) => StatefulBuilder(
+        builder: (dialogContext, setDialogState) => AlertDialog(
+          title: Text(context.l10n.community_joinTitle),
+          content: Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(context.l10n.community_joinConfirmation(community.name)),
+              const SizedBox(height: 16),
+              Row(
+                children: [
+                  Icon(
+                    Icons.groups,
+                    color: Theme.of(dialogContext).colorScheme.primary,
+                  ),
+                  const SizedBox(width: 12),
+                  Expanded(
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Text(
+                          community.name,
+                          style: const TextStyle(fontWeight: FontWeight.bold),
+                        ),
+                        Text(
+                          'ID: ${community.shortCommunityId}...',
+                          style: TextStyle(
+                            fontSize: 12,
+                            color: Colors.grey[600],
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                ],
+              ),
+              const SizedBox(height: 16),
+              const Divider(),
+              const SizedBox(height: 8),
+              CheckboxListTile(
+                value: addPublicChannel,
+                onChanged: (value) {
+                  setDialogState(() {
+                    addPublicChannel = value ?? true;
+                  });
+                },
+                title: Text(context.l10n.community_addPublicChannel),
+                subtitle: Text(context.l10n.community_addPublicChannelHint),
+                controlAffinity: ListTileControlAffinity.leading,
+                contentPadding: EdgeInsets.zero,
+              ),
+            ],
+          ),
+          actions: [
+            TextButton(
+              onPressed: () => Navigator.pop(dialogContext, false),
+              child: Text(context.l10n.common_cancel),
+            ),
+            FilledButton(
+              onPressed: () => Navigator.pop(dialogContext, true),
+              child: Text(context.l10n.community_join),
+            ),
+          ],
+        ),
+      ),
+    );
+
+    if (result == true && context.mounted) {
+      await _joinCommunity(context, community, addPublicChannel);
+    } else if (context.mounted) {
+      // User cancelled - go back
+      Navigator.pop(context);
+    }
+  }
+
+  Future<void> _joinCommunity(
+    BuildContext context,
+    Community community,
+    bool addPublicChannel,
+  ) async {
+    // Save community to local storage
+    final connector = context.read<MeshCoreConnector>();
+    _communityStore.setPublicKeyHex = connector.selfPublicKeyHex;
+    await _communityStore.addCommunity(community);
+
+    // Optionally add the community public channel to the device
+    if (addPublicChannel && context.mounted) {
+      final connector = context.read<MeshCoreConnector>();
+      final nextIndex = _findNextAvailableChannelIndex(connector);
+
+      if (nextIndex != null) {
+        final psk = community.deriveCommunityPublicPsk();
+        final channelName = '${community.name} Public';
+        connector.setChannel(nextIndex, channelName, psk);
+      }
+    }
+
+    if (context.mounted) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(
+          content: Text(context.l10n.community_joined(community.name)),
+          backgroundColor: Colors.green,
+        ),
+      );
+
+      // Return to previous screen
+      Navigator.pop(context, community);
+    }
+  }
+
+  int? _findNextAvailableChannelIndex(MeshCoreConnector connector) {
+    final usedIndices = connector.channels.map((c) => c.index).toSet();
+    for (int i = 0; i < connector.maxChannels; i++) {
+      if (!usedIndices.contains(i)) return i;
+    }
+    return null;
+  }
+}
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';

 import '../connector/meshcore_connector.dart';
+import '../l10n/l10n.dart';
 import '../utils/dialog_utils.dart';
 import '../utils/disconnect_navigation_mixin.dart';
 import '../utils/route_transitions.dart';
@@ -39,13 +40,20 @@ class _DeviceScreenState extends State<DeviceScreen>
          canPop: false,
          child: Scaffold(
            appBar: AppBar(
+              leading: _buildBatteryIndicator(connector, context),
              titleSpacing: 16,
              centerTitle: false,
              title: _buildAppBarTitle(connector, theme),
+              automaticallyImplyLeading: false,
              actions: [
+                IconButton(
+                  icon: const Icon(Icons.bluetooth_disabled),
+                  tooltip: context.l10n.common_disconnect,
+                  onPressed: () => _disconnect(context, connector),
+                ),
                IconButton(
                  icon: const Icon(Icons.tune),
-                  tooltip: 'Settings',
+                  tooltip: context.l10n.common_settings,
                  onPressed: () => Navigator.push(
                    context,
                    MaterialPageRoute(
@@ -53,11 +61,6 @@ class _DeviceScreenState extends State<DeviceScreen>
                    ),
                  ),
                ),
-                IconButton(
-                  icon: const Icon(Icons.bluetooth_disabled),
-                  tooltip: 'Disconnect',
-                  onPressed: () => _disconnect(context, connector),
-                ),
              ],
            ),
            body: SafeArea(
@@ -66,7 +69,7 @@ class _DeviceScreenState extends State<DeviceScreen>
                children: [
                  _buildConnectionCard(connector, context),
                  const SizedBox(height: 16),
-                  _buildSectionLabel(theme, 'Quick switch'),
+                  _buildSectionLabel(theme, context.l10n.device_quickSwitch),
                  const SizedBox(height: 12),
                  _buildQuickSwitchBar(context),
                ],
@@ -85,7 +88,7 @@ class _DeviceScreenState extends State<DeviceScreen>
      mainAxisSize: MainAxisSize.min,
      children: [
        Text(
-          'MeshCore',
+          context.l10n.device_meshcore,
          style: theme.textTheme.labelSmall?.copyWith(
            fontWeight: FontWeight.w600,
            letterSpacing: 0.8,
@@ -124,9 +127,7 @@ class _DeviceScreenState extends State<DeviceScreen>
    return Card(
      elevation: 0,
      color: colorScheme.surfaceContainerHighest,
-      shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(24),
-      ),
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(24)),
      child: Padding(
        padding: const EdgeInsets.all(16),
        child: Column(
@@ -178,7 +179,7 @@ class _DeviceScreenState extends State<DeviceScreen>
                    size: 18,
                    color: colorScheme.onSecondaryContainer,
                  ),
-                  label: const Text('Connected'),
+                  label: Text(context.l10n.common_connected),
                  backgroundColor: colorScheme.secondaryContainer,
                  labelStyle: theme.textTheme.labelMedium?.copyWith(
                    color: colorScheme.onSecondaryContainer,
@@ -204,7 +205,6 @@ class _DeviceScreenState extends State<DeviceScreen>
    );
  }

-
  Widget _buildBatteryIndicator(
    MeshCoreConnector connector,
    BuildContext context,
@@ -221,11 +221,7 @@ class _DeviceScreenState extends State<DeviceScreen>
    final icon = _batteryIcon(percent);

    return ActionChip(
-      avatar: Icon(
-        icon,
-        size: 16,
-        color: colorScheme.onSecondaryContainer,
-      ),
+      avatar: Icon(icon, size: 16, color: colorScheme.onSecondaryContainer),
      label: Text(displayLabel),
      labelStyle: theme.textTheme.labelMedium?.copyWith(
        color: colorScheme.onSecondaryContainer,
@@ -257,25 +253,19 @@ class _DeviceScreenState extends State<DeviceScreen>
      case 0:
        Navigator.pushReplacement(
          context,
-          buildQuickSwitchRoute(
-            const ContactsScreen(hideBackButton: true),
-          ),
+          buildQuickSwitchRoute(const ContactsScreen(hideBackButton: true)),
        );
        break;
      case 1:
        Navigator.pushReplacement(
          context,
-          buildQuickSwitchRoute(
-            const ChannelsScreen(hideBackButton: true),
-          ),
+          buildQuickSwitchRoute(const ChannelsScreen(hideBackButton: true)),
        );
        break;
      case 2:
        Navigator.pushReplacement(
          context,
-          buildQuickSwitchRoute(
-            const MapScreen(hideBackButton: true),
-          ),
+          buildQuickSwitchRoute(const MapScreen(hideBackButton: true)),
        );
        break;
    }
@@ -0,0 +1,420 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:provider/provider.dart';
+
+import '../connector/meshcore_connector.dart';
+import '../connector/meshcore_protocol.dart';
+import '../l10n/l10n.dart';
+import '../models/contact.dart';
+import '../utils/contact_search.dart';
+import '../widgets/app_bar.dart';
+import '../widgets/list_filter_widget.dart';
+
+enum DiscoverySortOption { lastSeen, name, type }
+
+class DiscoveryScreen extends StatefulWidget {
+  const DiscoveryScreen({super.key});
+
+  @override
+  State<DiscoveryScreen> createState() => _DiscoveryScreenState();
+}
+
+class _DiscoveryScreenState extends State<DiscoveryScreen> {
+  final TextEditingController _searchController = TextEditingController();
+  String searchQuery = '';
+  ContactSortOption sortOption = ContactSortOption.lastSeen;
+  bool showUnreadOnly = false;
+  ContactTypeFilter typeFilter = ContactTypeFilter.all;
+  DiscoverySortOption discoverySortOption = DiscoverySortOption.lastSeen;
+  Timer? _searchDebounce;
+
+  @override
+  void dispose() {
+    _searchController.dispose();
+    _searchDebounce?.cancel();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = context.l10n;
+    final connector = context.watch<MeshCoreConnector>();
+
+    final discoveredContacts = connector.discoveredContacts;
+    final filteredAndSorted = _filterAndSortContacts(
+      discoveredContacts,
+      connector,
+    );
+
+    return Scaffold(
+      appBar: AppBar(
+        title: AppBarTitle(
+          l10n.discoveredContacts_Title,
+          indicators: false,
+          subtitle: false,
+        ),
+        centerTitle: true,
+        actions: [
+          PopupMenuButton(
+            itemBuilder: (context) => [
+              PopupMenuItem(
+                child: Row(
+                  children: [
+                    const Icon(Icons.delete, color: Colors.red),
+                    const SizedBox(width: 8),
+                    Text(context.l10n.discoveredContacts_deleteContactAll),
+                  ],
+                ),
+                onTap: () {
+                  _deleteContacts(context, connector);
+                },
+              ),
+            ],
+            icon: const Icon(Icons.more_vert),
+          ),
+        ],
+      ),
+      body: Column(
+        children: [
+          _buildFilters(filteredAndSorted, connector),
+          Expanded(
+            child: discoveredContacts.isEmpty
+                ? Center(child: Text(l10n.contacts_noContacts))
+                : filteredAndSorted.isEmpty
+                ? Center(child: Text(l10n.discoveredContacts_noMatching))
+                : ListView.builder(
+                    itemCount: filteredAndSorted.length,
+                    itemBuilder: (context, index) {
+                      final contact = filteredAndSorted[index];
+                      return ListTile(
+                        leading: CircleAvatar(
+                          backgroundColor: _getTypeColor(contact.type),
+                          child: Icon(
+                            _getTypeIcon(contact.type),
+                            color: Colors.white,
+                            size: 20,
+                          ),
+                        ),
+                        title: Text(
+                          contact.name,
+                          maxLines: 1,
+                          overflow: TextOverflow.ellipsis,
+                        ),
+                        subtitle: Text(
+                          contact.shortPubKeyHex,
+                          maxLines: 1,
+                          overflow: TextOverflow.ellipsis,
+                        ),
+                        trailing: Text(
+                          _formatLastSeen(context, contact.lastSeen),
+                          style: TextStyle(
+                            fontSize: 12,
+                            color: Colors.grey[600],
+                          ),
+                        ),
+                        onTap: () {
+                          connector.importDiscoveredContact(contact);
+                        },
+                        onLongPress: () =>
+                            _showContactContextMenu(contact, connector),
+                      );
+                    },
+                  ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Future<void> _showContactContextMenu(
+    Contact contact,
+    MeshCoreConnector connector,
+  ) async {
+    final action = await showModalBottomSheet<String>(
+      context: context,
+      showDragHandle: true,
+      builder: (sheetContext) {
+        final l10n = context.l10n;
+        return SafeArea(
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              ListTile(
+                leading: const Icon(Icons.add_reaction_sharp),
+                title: Text(l10n.discoveredContacts_addContact),
+                onTap: () => Navigator.of(sheetContext).pop('import_contact'),
+              ),
+              ListTile(
+                leading: const Icon(Icons.copy),
+                title: Text(l10n.discoveredContacts_copyContact),
+                onTap: () => Navigator.of(sheetContext).pop('copy_contact'),
+              ),
+              ListTile(
+                leading: const Icon(Icons.delete),
+                title: Text(l10n.discoveredContacts_deleteContact),
+                onTap: () => Navigator.of(sheetContext).pop('delete_contact'),
+              ),
+            ],
+          ),
+        );
+      },
+    );
+
+    if (!mounted || action == null) return;
+
+    switch (action) {
+      case 'import_contact':
+        connector.importDiscoveredContact(contact);
+        break;
+      case 'copy_contact':
+        if (contact.rawPacket == null) return;
+        final hexString = pubKeyToHex(contact.rawPacket!);
+        Clipboard.setData(ClipboardData(text: "meshcore://$hexString"));
+        if (!mounted) return;
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(context.l10n.contacts_contactAdvertCopied)),
+        );
+        break;
+      case 'delete_contact':
+        connector.removeDiscoveredContact(contact);
+        break;
+    }
+  }
+
+  void _deleteContacts(BuildContext context, MeshCoreConnector connector) {
+    final l10n = context.l10n;
+    showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: Text(l10n.common_deleteAll),
+        content: Text(l10n.discoveredContacts_deleteContactAllContent),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.pop(context),
+            child: Text(l10n.common_cancel),
+          ),
+          TextButton(
+            onPressed: () async {
+              Navigator.pop(context);
+              connector.removeAllDiscoveredContacts();
+            },
+            child: Text(l10n.common_deleteAll),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildFilters(
+    List<Contact> filteredAndSorted,
+    MeshCoreConnector connector,
+  ) {
+    String hintText = "";
+    switch (typeFilter) {
+      case ContactTypeFilter.all:
+        hintText = context.l10n.contacts_searchContacts(
+          filteredAndSorted.length,
+          showUnreadOnly ? " ${context.l10n.contacts_unread}" : "",
+        );
+        break;
+      case ContactTypeFilter.users:
+        hintText = context.l10n.contacts_searchUsers(
+          filteredAndSorted.length,
+          showUnreadOnly ? " ${context.l10n.contacts_unread}" : "",
+        );
+        break;
+      case ContactTypeFilter.repeaters:
+        hintText = context.l10n.contacts_searchRepeaters(
+          filteredAndSorted.length,
+          showUnreadOnly ? " ${context.l10n.contacts_unread}" : "",
+        );
+        break;
+      case ContactTypeFilter.rooms:
+        hintText = context.l10n.contacts_searchRoomServers(
+          filteredAndSorted.length,
+          showUnreadOnly ? " ${context.l10n.contacts_unread}" : "",
+        );
+        break;
+      case ContactTypeFilter.favorites:
+        hintText = context.l10n.contacts_searchFavorites(
+          filteredAndSorted.length,
+          showUnreadOnly ? " ${context.l10n.contacts_unread}" : "",
+        );
+        break;
+    }
+
+    return Column(
+      children: [
+        Padding(
+          padding: const EdgeInsets.all(8.0),
+          child: TextField(
+            controller: _searchController,
+            decoration: InputDecoration(
+              hintText: hintText,
+              prefixIcon: const Icon(Icons.search),
+              suffixIcon: Row(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  if (searchQuery.isNotEmpty)
+                    IconButton(
+                      icon: const Icon(Icons.clear),
+                      onPressed: () {
+                        _searchController.clear();
+                        setState(() {
+                          searchQuery = '';
+                        });
+                      },
+                    ),
+                  _buildFilterButton(context, connector),
+                ],
+              ),
+              border: OutlineInputBorder(
+                borderRadius: BorderRadius.circular(12),
+              ),
+              contentPadding: const EdgeInsets.symmetric(
+                horizontal: 16,
+                vertical: 12,
+              ),
+            ),
+            onChanged: (value) {
+              _searchDebounce?.cancel();
+              _searchDebounce = Timer(const Duration(milliseconds: 300), () {
+                if (!mounted) return;
+                setState(() {
+                  searchQuery = value.toLowerCase();
+                });
+              });
+            },
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildFilterButton(BuildContext context, MeshCoreConnector connector) {
+    return DiscoveryContactsFilterMenu(
+      sortOption: sortOption,
+      typeFilter: typeFilter,
+      onSortChanged: (value) {
+        setState(() {
+          sortOption = value;
+        });
+      },
+      onTypeFilterChanged: (value) {
+        setState(() {
+          typeFilter = value;
+        });
+      },
+    );
+  }
+
+  List<Contact> _filterAndSortContacts(
+    List<Contact> contacts,
+    MeshCoreConnector connector,
+  ) {
+    var filtered = contacts.where((contact) {
+      if (searchQuery.isEmpty) return true;
+      return matchesDiscoveryContactQuery(contact, searchQuery);
+    }).toList();
+
+    filtered = filtered.where((contact) {
+      return !connector.knownContactKeys.contains(contact.publicKeyHex);
+    }).toList();
+
+    // Filter out own node from the list
+    if (connector.selfPublicKey != null) {
+      final selfPubKeyHex = pubKeyToHex(connector.selfPublicKey!);
+      filtered = filtered.where((contact) {
+        return contact.publicKeyHex != selfPubKeyHex;
+      }).toList();
+    }
+
+    if (typeFilter != ContactTypeFilter.all) {
+      filtered = filtered.where(_matchesTypeFilter).toList();
+    }
+
+    switch (sortOption) {
+      case ContactSortOption.lastSeen:
+        filtered.sort((a, b) => b.lastSeen.compareTo(a.lastSeen));
+        break;
+      case ContactSortOption.name:
+        filtered.sort(
+          (a, b) => a.name.toLowerCase().compareTo(b.name.toLowerCase()),
+        );
+        break;
+      default:
+        break;
+    }
+
+    return filtered;
+  }
+
+  bool _matchesTypeFilter(Contact contact) {
+    switch (typeFilter) {
+      case ContactTypeFilter.all:
+        return true;
+      case ContactTypeFilter.users:
+        return contact.type == advTypeChat;
+      case ContactTypeFilter.repeaters:
+        return contact.type == advTypeRepeater;
+      case ContactTypeFilter.rooms:
+        return contact.type == advTypeRoom;
+      default:
+        return false;
+    }
+  }
+
+  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(BuildContext context, DateTime lastSeen) {
+    final now = DateTime.now();
+    final diff = now.difference(lastSeen);
+
+    if (diff.isNegative || diff.inMinutes < 5) {
+      return context.l10n.contacts_lastSeenNow;
+    }
+    if (diff.inMinutes < 60) {
+      return context.l10n.contacts_lastSeenMinsAgo(diff.inMinutes);
+    }
+    if (diff.inHours < 24) {
+      final hours = diff.inHours;
+      return hours == 1
+          ? context.l10n.contacts_lastSeenHourAgo
+          : context.l10n.contacts_lastSeenHoursAgo(hours);
+    }
+    final days = diff.inDays;
+    return days == 1
+        ? context.l10n.contacts_lastSeenDayAgo
+        : context.l10n.contacts_lastSeenDaysAgo(days);
+  }
+}
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#e3e3e3"><path d="M268-240 42-466l57-56 170 170 56 56-57 56Zm226 0L268-466l56-57 170 170 368-368 56 57-424 424Zm0-226-57-56 198-198 57 56-198 198Z"/></svg>`