meshtastic · jamesarich · Mar 19, 2026 · Mar 19, 2026 · Mar 19, 2026 · Mar 19, 2026
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -24,6 +24,7 @@ jobs:
       - uses: dorny/paths-filter@v4
         id: filter
         with:
+          token: ''
           filters: |
             android:
               # CI/workflow implementation

diff --git a/AGENTS.md b/AGENTS.md
@@ -50,7 +50,7 @@ Meshtastic-Android is a Kotlin Multiplatform (KMP) application for off-grid, dec
 | `core/ble/` | Bluetooth Low Energy stack using Kable. |
 | `core/resources/` | Centralized string and image resources (Compose Multiplatform). |
 | `core/testing/` | **Shared test doubles, fakes, and utilities for `commonTest` across all KMP modules.** |
-| `feature/` | Feature modules (e.g., `settings`, `map`, `messaging`, `node`, `intro`, `connections`). All are KMP with `jvm()` target. Use `meshtastic.kmp.feature` convention plugin. |
+| `feature/` | Feature modules (e.g., `settings`, `map`, `messaging`, `node`, `intro`, `connections`, `firmware`, `widget`). All are KMP with `jvm()` target except `widget`. Use `meshtastic.kmp.feature` convention plugin. |
 | `desktop/` | Compose Desktop application — first non-Android KMP target. Nav 3 shell, full Koin DI graph, TCP, Serial/USB, and BLE transports with `want_config` handshake. |
 | `mesh_service_example/` | Sample app showing `core:api` service integration. |
 
@@ -77,6 +77,7 @@ Meshtastic-Android is a Kotlin Multiplatform (KMP) application for off-grid, dec
 -   **JetBrains fork aliases:** Version catalog aliases for JetBrains-forked AndroidX artifacts use the `jetbrains-*` prefix (e.g., `jetbrains-lifecycle-runtime-compose`, `jetbrains-navigation3-ui`). Plain `androidx-*` aliases are true Google AndroidX artifacts. Never mix them up in `commonMain`.
 -   **Compose Multiplatform:** Version catalog aliases for Compose Multiplatform artifacts use the `compose-multiplatform-*` prefix (e.g., `compose-multiplatform-material3`, `compose-multiplatform-foundation`). Never use plain `androidx.compose` dependencies in common Main.
 -   **Room KMP:** Always use `factory = { MeshtasticDatabaseConstructor.initialize() }` in `Room.databaseBuilder` and `inMemoryDatabaseBuilder`. DAOs and Entities reside in `commonMain`.
+-   **QR Codes:** Use `rememberQrCodePainter` from `core:ui/commonMain` (powered by `qrcode-kotlin`) for generating QR codes. Do not use Android Bitmap or ZXing APIs in common code.
 -   **Testing:** Write ViewModel and business logic tests in `commonTest`. Use `Turbine` for Flow testing, `Kotest` for property-based testing, and `Mokkery` for mocking. Use `core:testing` shared fakes.
 -   **Build-logic conventions:** In `build-logic/convention`, prefer lazy Gradle configuration (`configureEach`, `withPlugin`, provider APIs). Avoid `afterEvaluate` in convention plugins unless there is no viable lazy alternative.
 

diff --git a/GEMINI.md b/GEMINI.md
@@ -50,7 +50,7 @@ Meshtastic-Android is a Kotlin Multiplatform (KMP) application for off-grid, dec
 | `core/ble/` | Bluetooth Low Energy stack using Kable. |
 | `core/resources/` | Centralized string and image resources (Compose Multiplatform). |
 | `core/testing/` | **Shared test doubles, fakes, and utilities for `commonTest` across all KMP modules.** |
-| `feature/` | Feature modules (e.g., `settings`, `map`, `messaging`, `node`, `intro`, `connections`). All are KMP with `jvm()` target. Use `meshtastic.kmp.feature` convention plugin. |
+| `feature/` | Feature modules (e.g., `settings`, `map`, `messaging`, `node`, `intro`, `connections`, `firmware`, `widget`). All are KMP with `jvm()` target except `widget`. Use `meshtastic.kmp.feature` convention plugin. |
 | `desktop/` | Compose Desktop application — first non-Android KMP target. Nav 3 shell, full Koin DI graph, TCP, Serial/USB, and BLE transports with `want_config` handshake. |
 | `mesh_service_example/` | Sample app showing `core:api` service integration. |
 
@@ -77,6 +77,7 @@ Meshtastic-Android is a Kotlin Multiplatform (KMP) application for off-grid, dec
 -   **JetBrains fork aliases:** Version catalog aliases for JetBrains-forked AndroidX artifacts use the `jetbrains-*` prefix (e.g., `jetbrains-lifecycle-runtime-compose`, `jetbrains-navigation3-ui`). Plain `androidx-*` aliases are true Google AndroidX artifacts. Never mix them up in `commonMain`.
 -   **Compose Multiplatform:** Version catalog aliases for Compose Multiplatform artifacts use the `compose-multiplatform-*` prefix (e.g., `compose-multiplatform-material3`, `compose-multiplatform-foundation`). Never use plain `androidx.compose` dependencies in common Main.
 -   **Room KMP:** Always use `factory = { MeshtasticDatabaseConstructor.initialize() }` in `Room.databaseBuilder` and `inMemoryDatabaseBuilder`. DAOs and Entities reside in `commonMain`.
+-   **QR Codes:** Use `rememberQrCodePainter` from `core:ui/commonMain` (powered by `qrcode-kotlin`) for generating QR codes. Do not use Android Bitmap or ZXing APIs in common code.
 -   **Testing:** Write ViewModel and business logic tests in `commonTest`. Use `Turbine` for Flow testing, `Kotest` for property-based testing, and `Mokkery` for mocking. Use `core:testing` shared fakes.
 -   **Build-logic conventions:** In `build-logic/convention`, prefer lazy Gradle configuration (`configureEach`, `withPlugin`, provider APIs). Avoid `afterEvaluate` in convention plugins unless there is no viable lazy alternative.
 

diff --git a/app/src/main/kotlin/org/meshtastic/app/MainActivity.kt b/app/src/main/kotlin/org/meshtastic/app/MainActivity.kt
@@ -64,9 +64,11 @@ import org.meshtastic.core.ui.theme.AppTheme
 import org.meshtastic.core.ui.theme.MODE_DYNAMIC
 import org.meshtastic.core.ui.util.LocalAnalyticsIntroProvider
 import org.meshtastic.core.ui.util.LocalBarcodeScannerProvider
+import org.meshtastic.core.ui.util.LocalBarcodeScannerSupported
 import org.meshtastic.core.ui.util.LocalInlineMapProvider
 import org.meshtastic.core.ui.util.LocalMapViewProvider
 import org.meshtastic.core.ui.util.LocalNfcScannerProvider
+import org.meshtastic.core.ui.util.LocalNfcScannerSupported
 import org.meshtastic.core.ui.util.LocalTracerouteMapOverlayInsetsProvider
 import org.meshtastic.core.ui.util.showToast
 import org.meshtastic.core.ui.viewmodel.UIViewModel
@@ -124,6 +126,8 @@ class MainActivity : ComponentActivity() {
             CompositionLocalProvider(
                 LocalBarcodeScannerProvider provides { onResult -> rememberBarcodeScanner(onResult) },
                 LocalNfcScannerProvider provides { onResult, onDisabled -> NfcScannerEffect(onResult, onDisabled) },
+                LocalBarcodeScannerSupported provides true,
+                LocalNfcScannerSupported provides true,
                 LocalAnalyticsIntroProvider provides { AnalyticsIntro() },
                 LocalMapViewProvider provides getMapViewProvider(),
                 LocalInlineMapProvider provides { node, modifier -> InlineMap(node, modifier) },

diff --git a/app/src/main/kotlin/org/meshtastic/app/ui/Main.kt b/app/src/main/kotlin/org/meshtastic/app/ui/Main.kt
@@ -106,8 +106,8 @@ import org.meshtastic.feature.firmware.navigation.firmwareGraph
 import org.meshtastic.feature.map.navigation.mapGraph
 import org.meshtastic.feature.messaging.navigation.contactsGraph
 import org.meshtastic.feature.node.navigation.nodesGraph
-import org.meshtastic.feature.settings.navigation.channelsGraph
 import org.meshtastic.feature.settings.navigation.settingsGraph
+import org.meshtastic.feature.settings.radio.channel.channelsGraph
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Suppress("LongMethod", "CyclomaticComplexMethod")

diff --git a/app/src/test/kotlin/org/meshtastic/app/ui/NavigationAssemblyTest.kt b/app/src/test/kotlin/org/meshtastic/app/ui/NavigationAssemblyTest.kt
@@ -30,8 +30,8 @@ import org.meshtastic.feature.firmware.navigation.firmwareGraph
 import org.meshtastic.feature.map.navigation.mapGraph
 import org.meshtastic.feature.messaging.navigation.contactsGraph
 import org.meshtastic.feature.node.navigation.nodesGraph
-import org.meshtastic.feature.settings.navigation.channelsGraph
 import org.meshtastic.feature.settings.navigation.settingsGraph
+import org.meshtastic.feature.settings.radio.channel.channelsGraph
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
 

diff --git a/conductor/desktop-uri-import-plan.md b/conductor/desktop-uri-import-plan.md
@@ -0,0 +1,31 @@
+# Desktop URI Import Plan
+
+## Objective
+Wire up `SharedContact` and `ChannelSet` import logic for the Desktop target. This enables the Desktop app to process deep links or URIs passed on startup via arguments or intercepted by the OS using `java.awt.Desktop`'s `OpenURIHandler`. 
+
+## Key Files & Context
+- `desktop/src/main/kotlin/org/meshtastic/desktop/Main.kt`: Desktop app entry point. Must be updated to parse command line arguments and handle OS-level URI opening events.
+- `desktop/src/main/kotlin/org/meshtastic/desktop/ui/DesktopMainScreen.kt`: The main UI composition. Must be updated to inject the shared `UIViewModel` and render the `SharedContactDialog` / `ScannedQrCodeDialog` when `requestChannelSet` or `sharedContactRequested` are present.
+- `core/ui/src/commonMain/kotlin/org/meshtastic/core/ui/viewmodel/UIViewModel.kt`: Already handles URI dispatch and holds the requests, so no changes are needed here.
+
+## Implementation Steps
+
+1. **Update `DesktopMainScreen.kt`**
+    - Import `org.meshtastic.core.ui.viewmodel.UIViewModel`, `org.koin.compose.viewmodel.koinViewModel`, `org.meshtastic.core.ui.share.SharedContactDialog`, `org.meshtastic.core.ui.qr.ScannedQrCodeDialog`, and `org.meshtastic.core.model.ConnectionState`.
+    - Inject `UIViewModel` directly into `DesktopMainScreen` via `val uiViewModel = koinViewModel<UIViewModel>()`.
+    - Add observations for `uiViewModel.sharedContactRequested` and `uiViewModel.requestChannelSet`.
+    - Just like in Android's `MainScreen`, conditionally render `SharedContactDialog` and `ScannedQrCodeDialog` if `connectionState == ConnectionState.Connected` and either state contains a valid request.
+    - Wire `onDismiss` closures to `uiViewModel.clearSharedContactRequested()` and `uiViewModel.clearRequestChannelUrl()`.
+
+2. **Update `Main.kt` (Desktop)**
+    - Alter `fun main()` to `fun main(args: Array<String>)`.
+    - Resolve `UIViewModel` after `koinApp` initialization: `val uiViewModel = koinApp.koin.get<UIViewModel>()`.
+    - Process the initial `args` and invoke `uiViewModel.handleScannedUri` using `MeshtasticUri` for any arguments that look like valid Meshtastic URIs (starting with `http` or `meshtastic://`).
+    - Attempt to attach a `java.awt.desktop.OpenURIHandler` if `java.awt.Desktop.Action.APP_OPEN_URI` is supported. When triggered, process the incoming `event.uri` string using the same `handleScannedUri` logic.
+
+## Verification & Testing
+1. Compile the desktop target with `./gradlew desktop:run --args="meshtastic://meshtastic/v/contact..."`.
+2. Connect to a device via Desktop Connections or wait for connection.
+3. Validate that the corresponding Shared Contact or Channel Set dialog renders on screen.
+4. Verify that dismissing the dialogs properly clears the state in the view model.
+5. (Optional, macOS) If testing via packaged DMG, verify that opening a `.webloc` or invoking `open meshtastic://...` triggers the `APP_OPEN_URI` handler and routes through the UI.
diff --git a/core/model/build.gradle.kts b/core/model/build.gradle.kts
@@ -51,7 +51,6 @@ kotlin {
         androidMain.dependencies {
             api(libs.androidx.annotation)
             api(libs.androidx.core.ktx)
-            implementation(libs.zxing.core)
         }
         val androidHostTest by getting {
             dependencies {

diff --git a/core/model/src/androidMain/kotlin/org/meshtastic/core/model/util/QrCodeUtils.kt b/core/model/src/androidMain/kotlin/org/meshtastic/core/model/util/QrCodeUtils.kt
diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts
@@ -52,12 +52,10 @@ kotlin {
 
             implementation(libs.kermit)
             implementation(libs.koin.compose.viewmodel)
+            implementation(libs.qrcode.kotlin)
         }
 
-        androidMain.dependencies {
-            implementation(libs.androidx.activity.compose)
-            implementation(libs.zxing.core)
-        }
+        androidMain.dependencies { implementation(libs.androidx.activity.compose) }
 
         commonTest.dependencies {
             implementation(libs.junit)

diff --git a/core/ui/src/androidMain/kotlin/org/meshtastic/core/ui/util/QrUtils.kt b/core/ui/src/androidMain/kotlin/org/meshtastic/core/ui/util/QrUtils.kt
diff --git a/core/ui/src/androidMain/kotlin/org/meshtastic/core/ui/util/ScreenUtils.kt b/core/ui/src/androidMain/kotlin/org/meshtastic/core/ui/util/ScreenUtils.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2026 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.meshtastic.core.ui.util
+
+import android.app.Activity
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.ui.platform.LocalContext
+
+@Composable
+actual fun SetScreenBrightness(brightness: Float) {
+    val context = LocalContext.current
+    DisposableEffect(Unit) {
+        val window = (context as? Activity)?.window
+        val layoutParams = window?.attributes
+        val originalBrightness = layoutParams?.screenBrightness
+        layoutParams?.screenBrightness = brightness
+        window?.attributes = layoutParams
+
+        onDispose {
+            layoutParams?.screenBrightness = originalBrightness ?: -1f
+            window?.attributes = layoutParams
+        }
+    }
+}
diff --git a/core/ui/src/androidTest/kotlin/org/meshtastic/core/ui/component/ImportFabUiTest.kt b/core/ui/src/androidTest/kotlin/org/meshtastic/core/ui/component/ImportFabUiTest.kt
@@ -17,13 +17,17 @@
 package org.meshtastic.core.ui.component
 
 import androidx.compose.material3.Text
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.ui.test.assertDoesNotExist
 import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import org.junit.Rule
 import org.junit.Test
+import org.meshtastic.core.ui.util.LocalBarcodeScannerSupported
+import org.meshtastic.core.ui.util.LocalNfcScannerSupported
 import org.meshtastic.proto.SharedContact
 import org.meshtastic.proto.User
 
@@ -32,9 +36,16 @@ class ImportFabUiTest {
     @get:Rule val composeTestRule = createComposeRule()
 
     @Test
-    fun importFab_expands_onButtonClick() {
+    fun importFab_expands_onButtonClick_whenSupported() {
         val testTag = "import_fab"
-        composeTestRule.setContent { MeshtasticImportFAB(onImport = {}, isContactContext = true, testTag = testTag) }
+        composeTestRule.setContent {
+            CompositionLocalProvider(
+                LocalBarcodeScannerSupported provides true,
+                LocalNfcScannerSupported provides true,
+            ) {
+                MeshtasticImportFAB(onImport = {}, isContactContext = true, testTag = testTag)
+            }
+        }
 
         // Expand the FAB
         composeTestRule.onNodeWithTag(testTag).performClick()
@@ -45,6 +56,27 @@ class ImportFabUiTest {
         composeTestRule.onNodeWithTag("url_import").assertIsDisplayed()
     }
 
+    @Test
+    fun importFab_hidesNfcAndQr_whenNotSupported() {
+        val testTag = "import_fab"
+        composeTestRule.setContent {
+            CompositionLocalProvider(
+                LocalBarcodeScannerSupported provides false,
+                LocalNfcScannerSupported provides false,
+            ) {
+                MeshtasticImportFAB(onImport = {}, isContactContext = true, testTag = testTag)
+            }
+        }
+
+        // Expand the FAB
+        composeTestRule.onNodeWithTag(testTag).performClick()
+
+        // Verify menu items are visible using their tags
+        composeTestRule.onNodeWithTag("nfc_import").assertDoesNotExist()
+        composeTestRule.onNodeWithTag("qr_import").assertDoesNotExist()
+        composeTestRule.onNodeWithTag("url_import").assertIsDisplayed()
+    }
+
     @Test
     fun importFab_showsUrlDialog_whenUrlItemClicked() {
         val testTag = "import_fab"