Refactor command handling, enhance tests, and improve discovery logic (#4878)

Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com>

desktop/build.gradle.kts

@@ -72,6 +72,7 @@ compose.desktop {
             // App Icon & OS Specific Configurations
             macOS {
                 iconFile.set(project.file("src/main/resources/icon.icns"))
+                minimumSystemVersion = "12.0"
                 // TODO: To prepare for real distribution on macOS, you'll need to sign and notarize.
                 // You can inject these from CI environment variables.
                 // bundleID = "org.meshtastic.desktop"

desktop/proguard-rules.pro

@@ -3,6 +3,9 @@
 -dontwarn com.squareup.wire.AndroidMessage**
 -dontwarn io.ktor.**
 
+# Room KMP: preserve generated database constructor (required for R8/ProGuard)
+-keep class * extends androidx.room.RoomDatabase { <init>(); }
+
 # Suppress ProGuard notes about duplicate resource files (common in Compose Desktop)
 -dontnote **
 

desktop/src/main/kotlin/org/meshtastic/desktop/navigation/DesktopNavigation.kt

@@ -16,13 +16,6 @@
  */
 package org.meshtastic.desktop.navigation
 
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
 import androidx.navigation3.runtime.EntryProviderScope
 import androidx.navigation3.runtime.NavBackStack
 import androidx.navigation3.runtime.NavKey
@@ -68,14 +61,3 @@ fun EntryProviderScope<NavKey>.desktopNavGraph(backStack: NavBackStack<NavKey>)
     // Connections — shared screen
     connectionsGraph(backStack)
 }
-
-@Composable
-internal fun PlaceholderScreen(name: String) {
-    Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
-        Text(
-            text = name,
-            style = MaterialTheme.typography.headlineMedium,
-            color = MaterialTheme.colorScheme.onSurfaceVariant,
-        )
-    }
-}

desktop/src/main/kotlin/org/meshtastic/desktop/ui/DesktopMainScreen.kt

@@ -35,13 +35,12 @@ import androidx.navigation3.ui.NavDisplay
 import org.jetbrains.compose.resources.stringResource
 import org.koin.compose.koinInject
 import org.koin.compose.viewmodel.koinViewModel
-import org.meshtastic.core.model.ConnectionState
 import org.meshtastic.core.model.DeviceType
 import org.meshtastic.core.navigation.TopLevelDestination
 import org.meshtastic.core.repository.RadioInterfaceService
+import org.meshtastic.core.ui.component.AlertHost
+import org.meshtastic.core.ui.component.SharedDialogs
 import org.meshtastic.core.ui.navigation.icon
-import org.meshtastic.core.ui.qr.ScannedQrCodeDialog
-import org.meshtastic.core.ui.share.SharedContactDialog
 import org.meshtastic.core.ui.viewmodel.UIViewModel
 import org.meshtastic.desktop.navigation.desktopNavGraph
 
@@ -67,15 +66,15 @@ fun DesktopMainScreen(
     val requestChannelSet by uiViewModel.requestChannelSet.collectAsStateWithLifecycle()
     val sharedContactRequested by uiViewModel.sharedContactRequested.collectAsStateWithLifecycle()
 
-    if (connectionState == ConnectionState.Connected) {
-        sharedContactRequested?.let {
-            SharedContactDialog(sharedContact = it, onDismiss = { uiViewModel.clearSharedContactRequested() })
-        }
+    SharedDialogs(
+        connectionState = connectionState,
+        sharedContactRequested = sharedContactRequested,
+        requestChannelSet = requestChannelSet,
+        onDismissSharedContact = { uiViewModel.clearSharedContactRequested() },
+        onDismissChannelSet = { uiViewModel.clearRequestChannelUrl() },
+    )
 
-        requestChannelSet?.let { newChannelSet ->
-            ScannedQrCodeDialog(newChannelSet, onDismiss = { uiViewModel.clearRequestChannelUrl() })
-        }
-    }
+    AlertHost(uiViewModel.alertManager)
 
     Surface(modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background) {
         Row(modifier = Modifier.fillMaxSize()) {