add navigation to specific device from device controls

Author: pacjo

app/src/main/java/ca/cgagnier/wlednativeandroid/ui/MainActivity.kt

@@ -1,6 +1,7 @@
 package ca.cgagnier.wlednativeandroid.ui
 
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.webkit.ValueCallback
@@ -14,10 +15,14 @@ import ca.cgagnier.wlednativeandroid.FileUploadContract
 import ca.cgagnier.wlednativeandroid.FileUploadContractResult
 import ca.cgagnier.wlednativeandroid.repository.UserPreferencesRepository
 import ca.cgagnier.wlednativeandroid.repository.VersionWithAssetsRepository
+import ca.cgagnier.wlednativeandroid.service.DeviceControlsProviderService
 import ca.cgagnier.wlednativeandroid.service.update.ReleaseService
 import ca.cgagnier.wlednativeandroid.ui.theme.WLEDNativeTheme
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
@@ -31,6 +36,9 @@ class MainActivity : ComponentActivity() {
     @Inject
     lateinit var versionWithAssetsRepository: VersionWithAssetsRepository
 
+    private val _deviceMacAddress = MutableStateFlow<String?>(null)
+    val deviceMacAddress: StateFlow<String?> = _deviceMacAddress.asStateFlow()
+
     // For WebView file upload support
     var uploadMessage: ValueCallback<Array<Uri>>? = null
     val fileUpload =
@@ -48,9 +56,16 @@ class MainActivity : ComponentActivity() {
         installSplashScreen()
         enableEdgeToEdge()
         super.onCreate(savedInstanceState)
+
+        // Handle navigation from Device Controls on Android 11+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            val deviceMacAddress = intent.getStringExtra(DeviceControlsProviderService.EXTRA_DEVICE_MAC)
+            _deviceMacAddress.value = deviceMacAddress
+        }
+
         setContent {
             WLEDNativeTheme {
-                MainNavHost()
+                MainNavHost(deviceMacAddress = deviceMacAddress)
             }
         }
         updateDeviceVersionList()

app/src/main/java/ca/cgagnier/wlednativeandroid/ui/MainNavHost.kt

@@ -1,18 +1,23 @@
 package ca.cgagnier.wlednativeandroid.ui
 
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import ca.cgagnier.wlednativeandroid.ui.homeScreen.DeviceListDetail
 import ca.cgagnier.wlednativeandroid.ui.settingsScreen.Settings
+import kotlinx.coroutines.flow.StateFlow
 import kotlinx.serialization.Serializable
 
 @Composable
 fun MainNavHost(
-    navController: NavHostController = rememberNavController()
+    navController: NavHostController = rememberNavController(),
+    deviceMacAddress: StateFlow<String?>
 ) {
+    val currentDeviceMacAddress by deviceMacAddress.collectAsStateWithLifecycle()
     NavHost(
         navController = navController,
         startDestination = DeviceListDetailScreen,
@@ -21,7 +26,8 @@ fun MainNavHost(
             DeviceListDetail(
                 openSettings = {
                     navController.navigate(SettingsScreen)
-                }
+                },
+                deviceMacAddress = currentDeviceMacAddress
             )
         }
         composable<SettingsScreen> {

app/src/main/java/ca/cgagnier/wlednativeandroid/ui/homeScreen/DeviceListDetail.kt

@@ -69,6 +69,7 @@ private const val TAG = "screen_DeviceListDetail"
 fun DeviceListDetail(
     modifier: Modifier = Modifier,
     openSettings: () -> Unit,
+    deviceMacAddress: String? = null,
     viewModel: DeviceListDetailViewModel = hiltViewModel(),
 ) {
     val lifecycleOwner = LocalLifecycleOwner.current
@@ -81,6 +82,22 @@ fun DeviceListDetail(
         rememberListDetailPaneScaffoldNavigator<Any>(scaffoldDirective = customScaffoldDirective)
     val drawerState = rememberDrawerState(initialValue = DrawerValue.Closed)
 
+    // Handle navigation to specific device if provided
+    DisposableEffect(deviceMacAddress) {
+        if (deviceMacAddress != null) {
+            coroutineScope.launch {
+                val device = viewModel.findDeviceByMacAddress(deviceMacAddress)
+                if (device != null) {
+                    navigator.navigateTo(
+                        pane = ListDetailPaneScaffoldRole.Detail,
+                        contentKey = device.address
+                    )
+                }
+            }
+        }
+        onDispose { }
+    }
+
     val selectedDeviceAddress = navigator.currentDestination?.contentKey as? String ?: ""
     val selectedDevice =
         viewModel.getDeviceByAddress(selectedDeviceAddress).collectAsStateWithLifecycle(null)
@@ -390,4 +407,4 @@ private fun AddDeviceBottomSheet(
             },
         )
     }
-}
+}

app/src/main/java/ca/cgagnier/wlednativeandroid/ui/homeScreen/DeviceListDetailViewModel.kt

@@ -209,4 +209,7 @@ class DeviceListDetailViewModel @Inject constructor(
             false
         }
     }
+    suspend fun findDeviceByMacAddress(macAddress: String): Device? {
+        return repository.findDeviceByMacAddress(macAddress)
+    }
 }