Replace SingleEntityPicker with new EntityPicker (#6293)

* Use new EntityPicker in ManageTiles

* Use new EntityPicker in SettingsWearFavority without registries

* Use new EntityPicker in AndroidAutoFavorites

* Use new EntityPicker in TodoWidgetConfigure

* Remove SingleEntityPicker

Author: TimoPtr

app/lint-baseline.xml

@@ -492,7 +492,7 @@
         errorLine2="                                                             ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/settings/qs/views/ManageTilesView.kt"
-            line="59"
+            line="60"
             column="62"/>
     </issue>
 
@@ -1209,7 +1209,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/settings/shortcuts/ManageShortcutsViewModel.kt"
-            line="207"
+            line="216"
             column="13"/>
     </issue>
 
@@ -1231,7 +1231,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/settings/vehicle/views/AndroidAutoFavoritesView.kt"
-            line="41"
+            line="42"
             column="5"/>
     </issue>
 
@@ -1605,7 +1605,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/settings/qs/views/ManageTilesView.kt"
-            line="50"
+            line="51"
             column="5"/>
     </issue>
 
@@ -1935,7 +1935,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/full/kotlin/io/homeassistant/companion/android/settings/wear/views/SettingsWearFavoritesView.kt"
-            line="41"
+            line="42"
             column="5"/>
     </issue>
 
@@ -2342,7 +2342,7 @@
         errorLine2="                 ~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/settings/vehicle/views/AndroidAutoFavoritesView.kt"
-            line="43"
+            line="44"
             column="18"/>
     </issue>
 
@@ -2397,7 +2397,7 @@
         errorLine2="              ~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/util/compose/entity/EntityPicker.kt"
-            line="188"
+            line="189"
             column="15"/>
     </issue>
 
@@ -2408,7 +2408,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/util/compose/entity/EntityPicker.kt"
-            line="193"
+            line="195"
             column="21"/>
     </issue>
 
@@ -2419,7 +2419,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/util/compose/entity/EntityPicker.kt"
-            line="194"
+            line="196"
             column="21"/>
     </issue>
 
@@ -2430,7 +2430,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/util/compose/entity/EntityPicker.kt"
-            line="195"
+            line="197"
             column="19"/>
     </issue>
 
@@ -2441,7 +2441,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/util/compose/entity/EntityPicker.kt"
-            line="232"
+            line="235"
             column="15"/>
     </issue>
 
@@ -2452,7 +2452,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/util/compose/entity/EntityPicker.kt"
-            line="399"
+            line="405"
             column="15"/>
     </issue>
 
@@ -2463,7 +2463,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/util/compose/entity/EntityPicker.kt"
-            line="442"
+            line="448"
             column="15"/>
     </issue>
 
@@ -2474,7 +2474,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/util/compose/entity/EntityPicker.kt"
-            line="469"
+            line="475"
             column="15"/>
     </issue>
 
@@ -2654,17 +2654,6 @@
             column="20"/>
     </issue>
 
-    <issue
-        id="ComposeUnstableCollections"
-        message="The Compose Compiler cannot infer the stability of a parameter if a List&lt;Entity> is used in it, even if the item type is stable.&#xA;You should use Kotlinx Immutable Collections instead: `entities: ImmutableList&lt;Entity>` or create an `@Immutable` wrapper for this class: `@Immutable data class EntitiesList(val items: List&lt;Entity>)`&#xA;See https://slackhq.github.io/compose-lints/rules/#avoid-using-unstable-collections for more information."
-        errorLine1="    entities: List&lt;Entity>,"
-        errorLine2="              ~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/io/homeassistant/companion/android/util/compose/SingleEntityPicker.kt"
-            line="44"
-            column="15"/>
-    </issue>
-
     <issue
         id="ComposeUnstableCollections"
         message="The Compose Compiler cannot infer the stability of a parameter if a List&lt;String> is used in it, even if the item type is stable.&#xA;You should use Kotlinx Immutable Collections instead: `wifiSsids: ImmutableList&lt;String>` or create an `@Immutable` wrapper for this class: `@Immutable data class WifiSsidsList(val items: List&lt;String>)`&#xA;See https://slackhq.github.io/compose-lints/rules/#avoid-using-unstable-collections for more information."
@@ -2694,7 +2683,7 @@
         errorLine2="             ~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/widgets/todo/TodoWidgetConfigureActivity.kt"
-            line="186"
+            line="196"
             column="14"/>
     </issue>
 
@@ -2705,10 +2694,43 @@
         errorLine2="              ~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/widgets/todo/TodoWidgetConfigureActivity.kt"
-            line="189"
+            line="199"
             column="15"/>
     </issue>
 
+    <issue
+        id="ComposeUnstableCollections"
+        message="The Compose Compiler cannot infer the stability of a parameter if a List&lt;EntityRegistryResponse>? is used in it, even if the item type is stable.&#xA;You should use Kotlinx Immutable Collections instead: `entityRegistry: ImmutableList&lt;EntityRegistryResponse>?` or create an `@Immutable` wrapper for this class: `@Immutable data class EntityRegistryList(val items: List&lt;EntityRegistryResponse>?)`&#xA;See https://slackhq.github.io/compose-lints/rules/#avoid-using-unstable-collections for more information."
+        errorLine1="    entityRegistry: List&lt;EntityRegistryResponse>? = null,"
+        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/io/homeassistant/companion/android/widgets/todo/TodoWidgetConfigureActivity.kt"
+            line="210"
+            column="21"/>
+    </issue>
+
+    <issue
+        id="ComposeUnstableCollections"
+        message="The Compose Compiler cannot infer the stability of a parameter if a List&lt;DeviceRegistryResponse>? is used in it, even if the item type is stable.&#xA;You should use Kotlinx Immutable Collections instead: `deviceRegistry: ImmutableList&lt;DeviceRegistryResponse>?` or create an `@Immutable` wrapper for this class: `@Immutable data class DeviceRegistryList(val items: List&lt;DeviceRegistryResponse>?)`&#xA;See https://slackhq.github.io/compose-lints/rules/#avoid-using-unstable-collections for more information."
+        errorLine1="    deviceRegistry: List&lt;DeviceRegistryResponse>? = null,"
+        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/io/homeassistant/companion/android/widgets/todo/TodoWidgetConfigureActivity.kt"
+            line="211"
+            column="21"/>
+    </issue>
+
+    <issue
+        id="ComposeUnstableCollections"
+        message="The Compose Compiler cannot infer the stability of a parameter if a List&lt;AreaRegistryResponse>? is used in it, even if the item type is stable.&#xA;You should use Kotlinx Immutable Collections instead: `areaRegistry: ImmutableList&lt;AreaRegistryResponse>?` or create an `@Immutable` wrapper for this class: `@Immutable data class AreaRegistryList(val items: List&lt;AreaRegistryResponse>?)`&#xA;See https://slackhq.github.io/compose-lints/rules/#avoid-using-unstable-collections for more information."
+        errorLine1="    areaRegistry: List&lt;AreaRegistryResponse>? = null,"
+        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/io/homeassistant/companion/android/widgets/todo/TodoWidgetConfigureActivity.kt"
+            line="212"
+            column="19"/>
+    </issue>
+
     <issue
         id="ComposeUnstableReceiver"
         message="Instance composable functions on non-stable classes will always be recomposed. If possible, make the receiver type stable or refactor this function if that isn&apos;t possible. See https://slackhq.github.io/compose-lints/rules/#unstable-receivers for more information."

app/src/full/kotlin/io/homeassistant/companion/android/settings/wear/views/SettingsWearFavoritesView.kt

@@ -21,11 +21,12 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import io.homeassistant.companion.android.common.R as commonR
+import io.homeassistant.companion.android.common.compose.theme.HATheme
 import io.homeassistant.companion.android.common.data.integration.Entity
 import io.homeassistant.companion.android.common.data.integration.friendlyName
 import io.homeassistant.companion.android.settings.wear.SettingsWearViewModel
 import io.homeassistant.companion.android.util.compose.FavoriteEntityRow
-import io.homeassistant.companion.android.util.compose.SingleEntityPicker
+import io.homeassistant.companion.android.util.compose.entity.EntityPicker
 import io.homeassistant.companion.android.util.plus
 import io.homeassistant.companion.android.util.safeBottomPaddingValues
 import io.homeassistant.companion.android.util.safeBottomWindowInsets
@@ -101,17 +102,22 @@ fun LoadWearFavoritesSettings(
                 )
             }
             item {
-                SingleEntityPicker(
-                    entities = validEntities,
-                    currentEntity = null,
-                    onEntityCleared = { /* Nothing */ },
-                    onEntitySelected = {
-                        settingsWearViewModel.onEntitySelected(true, it)
-                        return@SingleEntityPicker false // Clear input
-                    },
-                    modifier = Modifier.padding(all = 16.dp),
-                    label = { Text(stringResource(commonR.string.add_favorite)) },
-                )
+                // TODO use new theme for Material3 components https://github.com/home-assistant/android/issues/6300
+                HATheme {
+                    EntityPicker(
+                        entities = validEntities,
+                        selectedEntityId = null,
+                        onEntityCleared = { /* Nothing */ },
+                        onEntitySelectedId = {
+                            settingsWearViewModel.onEntitySelected(true, it)
+                        },
+                        addButtonText = stringResource(commonR.string.add_favorite),
+                        modifier = Modifier.padding(all = 16.dp),
+                        // In order to have the info about the area/device/zone we need the websocket, it would
+                        // requires SettingsWearRepository to be able to use the WebSocket which is a significant
+                        // work.
+                    )
+                }
             }
             items(favoriteEntities.size, { favoriteEntities[it] }) { index ->
                 val favoriteEntityID = favoriteEntities[index].replace("[", "").replace("]", "")

app/src/main/kotlin/io/homeassistant/companion/android/settings/qs/ManageTilesViewModel.kt

@@ -23,6 +23,9 @@ import io.homeassistant.companion.android.common.data.integration.Entity
 import io.homeassistant.companion.android.common.data.integration.getIcon
 import io.homeassistant.companion.android.common.data.integration.isUsableInTile
 import io.homeassistant.companion.android.common.data.servers.ServerManager
+import io.homeassistant.companion.android.common.data.websocket.impl.entities.AreaRegistryResponse
+import io.homeassistant.companion.android.common.data.websocket.impl.entities.DeviceRegistryResponse
+import io.homeassistant.companion.android.common.data.websocket.impl.entities.EntityRegistryResponse
 import io.homeassistant.companion.android.database.qs.TileDao
 import io.homeassistant.companion.android.database.qs.TileEntity
 import io.homeassistant.companion.android.database.qs.getHighestInUse
@@ -73,6 +76,7 @@ import io.homeassistant.companion.android.util.icondialog.getIconByMdiName
 import io.homeassistant.companion.android.util.icondialog.mdiName
 import java.util.concurrent.Executors
 import javax.inject.Inject
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
@@ -147,6 +151,12 @@ class ManageTilesViewModel @Inject constructor(
         private set
     var sortedEntities by mutableStateOf<List<Entity>>(emptyList())
         private set
+    var entityRegistry by mutableStateOf<List<EntityRegistryResponse>>(emptyList())
+        private set
+    var deviceRegistry by mutableStateOf<List<DeviceRegistryResponse>>(emptyList())
+        private set
+    var areaRegistry by mutableStateOf<List<AreaRegistryResponse>>(emptyList())
+        private set
     var selectedServerId by mutableIntStateOf(ServerManager.SERVER_ID_ACTIVE)
         private set
     var selectedIconId by mutableStateOf<String?>(null)
@@ -164,6 +174,9 @@ class ManageTilesViewModel @Inject constructor(
     private var selectedTileAdded = false
 
     private val entities = mutableMapOf<Int, List<Entity>>()
+    private val entityRegistries = mutableMapOf<Int, List<EntityRegistryResponse>>()
+    private val deviceRegistries = mutableMapOf<Int, List<DeviceRegistryResponse>>()
+    private val areaRegistries = mutableMapOf<Int, List<AreaRegistryResponse>>()
 
     private val _tileInfoSnackbar = MutableSharedFlow<Int>(replay = 1)
     var tileInfoSnackbar = _tileInfoSnackbar.asSharedFlow()
@@ -183,15 +196,13 @@ class ManageTilesViewModel @Inject constructor(
         viewModelScope.launch(Dispatchers.IO) {
             val servers = serverManager.servers()
             this@ManageTilesViewModel.servers = servers
-            servers.map {
+            servers.map { server ->
+                val serverId = server.id
                 async {
-                    entities[it.id] = try {
-                        serverManager.integrationRepository(it.id).getEntities().orEmpty()
-                            .filter(Entity::isUsableInTile)
-                    } catch (e: Exception) {
-                        Timber.e(e, "Couldn't load entities for server")
-                        emptyList()
-                    }
+                    launch { entities[serverId] = loadEntitiesForServer(serverId) }
+                    launch { entityRegistries[serverId] = loadEntityRegistry(serverId) }
+                    launch { deviceRegistries[serverId] = loadDeviceRegistry(serverId) }
+                    launch { areaRegistries[serverId] = loadAreaRegistry(serverId) }
                 }
             }.awaitAll()
             withContext(Dispatchers.Main) {
@@ -240,6 +251,9 @@ class ManageTilesViewModel @Inject constructor(
 
     private fun loadEntities(serverId: Int) {
         sortedEntities = entities[serverId] ?: emptyList()
+        entityRegistry = entityRegistries[serverId] ?: emptyList()
+        deviceRegistry = deviceRegistries[serverId] ?: emptyList()
+        areaRegistry = areaRegistries[serverId] ?: emptyList()
     }
 
     fun selectEntityId(entityId: String) {
@@ -314,4 +328,41 @@ class ManageTilesViewModel @Inject constructor(
             }
         }
     }
+
+    private suspend fun loadEntitiesForServer(serverId: Int): List<Entity> = try {
+        serverManager.integrationRepository(serverId).getEntities().orEmpty()
+            .filter(Entity::isUsableInTile)
+    } catch (e: CancellationException) {
+        throw e
+    } catch (e: Exception) {
+        Timber.e(e, "Couldn't load entities for server")
+        emptyList()
+    }
+
+    private suspend fun loadEntityRegistry(serverId: Int): List<EntityRegistryResponse> = try {
+        serverManager.webSocketRepository(serverId).getEntityRegistry().orEmpty()
+    } catch (e: CancellationException) {
+        throw e
+    } catch (e: Exception) {
+        Timber.e(e, "Couldn't load entity registry for server")
+        emptyList()
+    }
+
+    private suspend fun loadDeviceRegistry(serverId: Int): List<DeviceRegistryResponse> = try {
+        serverManager.webSocketRepository(serverId).getDeviceRegistry().orEmpty()
+    } catch (e: CancellationException) {
+        throw e
+    } catch (e: Exception) {
+        Timber.e(e, "Couldn't load device registry for server")
+        emptyList()
+    }
+
+    private suspend fun loadAreaRegistry(serverId: Int): List<AreaRegistryResponse> = try {
+        serverManager.webSocketRepository(serverId).getAreaRegistry().orEmpty()
+    } catch (e: CancellationException) {
+        throw e
+    } catch (e: Exception) {
+        Timber.e(e, "Couldn't load area registry for server")
+        emptyList()
+    }
 }