Add missing supported domains in the wear for tiles (#6587)

TimoPtr · web-flow · commit 1628b4b6c822 · 2026-03-19T21:57:10.000+01:00
* Add missing supported domains in the wear for tiles

* Use CLIMATE_DOMAIN const

* Make dedicated list for camera and climate
diff --git a/app/src/main/kotlin/io/homeassistant/companion/android/controls/HaControl.kt b/app/src/main/kotlin/io/homeassistant/companion/android/controls/HaControl.kt
@@ -15,6 +15,7 @@ import com.mikepenz.iconics.utils.toAndroidIconCompat
 import io.homeassistant.companion.android.common.R
 import io.homeassistant.companion.android.common.data.integration.Entity
 import io.homeassistant.companion.android.common.data.integration.IntegrationDomains.CAMERA_DOMAIN
+import io.homeassistant.companion.android.common.data.integration.IntegrationDomains.CLIMATE_DOMAIN
 import io.homeassistant.companion.android.common.data.integration.IntegrationDomains.MEDIA_PLAYER_DOMAIN
 import io.homeassistant.companion.android.common.data.integration.IntegrationRepository
 import io.homeassistant.companion.android.common.data.integration.friendlyState
@@ -71,12 +72,15 @@ interface HaControl {
                 val colorTint = when {
                     entity.domain == "light" && entity.state == "on" -> R.color.colorDeviceControlsLightOn
                     entity.domain == CAMERA_DOMAIN -> R.color.colorDeviceControlsCamera
-                    entity.domain == "climate" && entity.state == "heat" -> R.color.colorDeviceControlsThermostatHeat
+                    entity.domain == CLIMATE_DOMAIN && entity.state == "heat"
+                    -> R.color.colorDeviceControlsThermostatHeat
+
                     entity.state in listOf(
                         "off",
                         "unavailable",
                         "unknown",
                     ) -> R.color.colorDeviceControlsOff
+
                     else -> R.color.colorDeviceControlsDefaultOn
                 }
 
diff --git a/app/src/main/kotlin/io/homeassistant/companion/android/controls/HaControlsProviderService.kt b/app/src/main/kotlin/io/homeassistant/companion/android/controls/HaControlsProviderService.kt
@@ -9,6 +9,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import io.homeassistant.companion.android.common.data.integration.ControlsAuthRequiredSetting
 import io.homeassistant.companion.android.common.data.integration.Entity
 import io.homeassistant.companion.android.common.data.integration.IntegrationDomains.CAMERA_DOMAIN
+import io.homeassistant.companion.android.common.data.integration.IntegrationDomains.CLIMATE_DOMAIN
 import io.homeassistant.companion.android.common.data.integration.IntegrationDomains.MEDIA_PLAYER_DOMAIN
 import io.homeassistant.companion.android.common.data.integration.applyCompressedStateDiff
 import io.homeassistant.companion.android.common.data.prefs.PrefsRepository
@@ -44,7 +45,7 @@ class HaControlsProviderService : ControlsProviderService() {
             "automation" to DefaultSwitchControl,
             "button" to DefaultButtonControl,
             CAMERA_DOMAIN to CameraControl,
-            "climate" to ClimateControl,
+            CLIMATE_DOMAIN to ClimateControl,
             "cover" to CoverControl,
             "fan" to FanControl,
             "ha_failed" to HaFailedControl,
diff --git a/app/src/main/kotlin/io/homeassistant/companion/android/util/compose/EntityInfo.kt b/app/src/main/kotlin/io/homeassistant/companion/android/util/compose/EntityInfo.kt
@@ -4,14 +4,15 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import io.homeassistant.companion.android.common.R as commonR
 import io.homeassistant.companion.android.common.data.integration.IntegrationDomains.CAMERA_DOMAIN
+import io.homeassistant.companion.android.common.data.integration.IntegrationDomains.CLIMATE_DOMAIN
 
 @Composable
 fun getEntityDomainString(domain: String): String {
     return when (domain) {
         "automation" -> stringResource(commonR.string.domain_automation)
         "button" -> stringResource(commonR.string.domain_button)
         CAMERA_DOMAIN -> stringResource(commonR.string.domain_camera)
-        "climate" -> stringResource(commonR.string.domain_climate)
+        CLIMATE_DOMAIN -> stringResource(commonR.string.domain_climate)
         "cover" -> stringResource(commonR.string.domain_cover)
         "fan" -> stringResource(commonR.string.domain_fan)
         "input_boolean" -> stringResource(commonR.string.domain_input_boolean)
diff --git a/app/src/screenshotTest/kotlin/io/homeassistant/companion/android/util/compose/entity/EntityPickerScreenshotTest.kt b/app/src/screenshotTest/kotlin/io/homeassistant/companion/android/util/compose/entity/EntityPickerScreenshotTest.kt
@@ -12,6 +12,7 @@ import com.android.tools.screenshot.PreviewTest
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
 import io.homeassistant.companion.android.common.compose.theme.HADimens
 import io.homeassistant.companion.android.common.compose.theme.HAThemeForPreview
+import io.homeassistant.companion.android.common.data.integration.IntegrationDomains.CLIMATE_DOMAIN
 
 @Preview(name = "phoneLTR", device = "spec:width=411.4dp,height=923.4dp", group = "phone") // Pixel 9 LTR
 @Preview(name = "phoneRLT", device = "spec:width=411.4dp,height=923.4dp", group = "phone", locale = "ar") // Pixel 9 RTL
@@ -198,7 +199,7 @@ class EntityPickerScreenshotTest {
         ),
         EntityPickerItem(
             entityId = "climate.thermostat",
-            domain = "climate",
+            domain = CLIMATE_DOMAIN,
             friendlyName = "Thermostat",
             icon = CommunityMaterial.Icon3.cmd_thermostat,
             areaName = "Hallway",
diff --git a/common/src/main/kotlin/io/homeassistant/companion/android/common/data/integration/Entity.kt b/common/src/main/kotlin/io/homeassistant/companion/android/common/data/integration/Entity.kt
@@ -11,6 +11,7 @@ import com.mikepenz.iconics.typeface.library.community.material.CommunityMateria
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial.Icon3
 import io.homeassistant.companion.android.common.R as commonR
 import io.homeassistant.companion.android.common.data.integration.IntegrationDomains.CAMERA_DOMAIN
+import io.homeassistant.companion.android.common.data.integration.IntegrationDomains.CLIMATE_DOMAIN
 import io.homeassistant.companion.android.common.data.integration.IntegrationDomains.MEDIA_PLAYER_DOMAIN
 import io.homeassistant.companion.android.common.data.websocket.impl.entities.CompressedStateDiff
 import io.homeassistant.companion.android.common.data.websocket.impl.entities.EntityRegistryOptions
@@ -159,7 +160,7 @@ object EntityExt {
         "binary_sensor",
         "calendar",
         CAMERA_DOMAIN,
-        "climate",
+        CLIMATE_DOMAIN,
         "cover",
         "device_tracker",
         "fan",
@@ -519,7 +520,7 @@ fun Entity.getIcon(context: Context): IIcon {
                 Icon3.cmd_video
             }
 
-            "climate" -> Icon3.cmd_thermostat
+            CLIMATE_DOMAIN -> Icon3.cmd_thermostat
             "configurator" -> Icon.cmd_cog
             "conversation" -> Icon3.cmd_microphone_message
             "cover" -> coverIcon(compareState, this)
diff --git a/common/src/main/kotlin/io/homeassistant/companion/android/common/data/integration/IntegrationDomains.kt b/common/src/main/kotlin/io/homeassistant/companion/android/common/data/integration/IntegrationDomains.kt
@@ -2,6 +2,7 @@ package io.homeassistant.companion.android.common.data.integration
 
 object IntegrationDomains {
     const val CAMERA_DOMAIN = "camera"
+    const val CLIMATE_DOMAIN = "climate"
     const val MEDIA_PLAYER_DOMAIN = "media_player"
     const val IMAGE_DOMAIN = "image"
     const val TODO_DOMAIN = "todo"
diff --git a/wear/src/main/kotlin/io/homeassistant/companion/android/home/MainViewModel.kt b/wear/src/main/kotlin/io/homeassistant/companion/android/home/MainViewModel.kt
@@ -13,6 +13,8 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import io.homeassistant.companion.android.BuildConfig
 import io.homeassistant.companion.android.HomeAssistantApplication
 import io.homeassistant.companion.android.common.data.integration.Entity
+import io.homeassistant.companion.android.common.data.integration.IntegrationDomains.CAMERA_DOMAIN
+import io.homeassistant.companion.android.common.data.integration.IntegrationDomains.CLIMATE_DOMAIN
 import io.homeassistant.companion.android.common.data.prefs.impl.entities.TemplateTileConfig
 import io.homeassistant.companion.android.common.data.websocket.WebSocketState
 import io.homeassistant.companion.android.common.data.websocket.impl.entities.AreaRegistryResponse
@@ -89,6 +91,8 @@ class MainViewModel @Inject constructor(
     @Immutable
     data class MainViewUiState(
         val entities: Map<String, Entity> = emptyMap(),
+        val cameraEntities: List<Entity> = emptyList(),
+        val climateEntities: List<Entity> = emptyList(),
         val favoriteCaches: List<FavoriteCaches> = emptyList(),
         val isFavoritesOnly: Boolean = false,
         val isHapticEnabled: Boolean = false,
@@ -308,21 +312,50 @@ class MainViewModel @Inject constructor(
      */
     private fun updateEntityStates(entities: List<Entity>, replaceAll: Boolean = false) {
         val supportedDomains = supportedDomains()
-        val supported = entities
-            .filter { it.domain in supportedDomains }
-            .associateBy { it.entityId }
+        val supportedIds = mutableSetOf<String>()
         updateUiState { uiState ->
+            val supported = mutableMapOf<String, Entity>()
+            val cameraEntities = if (replaceAll) {
+                mutableMapOf()
+            } else {
+                uiState.cameraEntities.associateByTo(
+                    mutableMapOf(),
+                ) {
+                    it.entityId
+                }
+            }
+            val climateEntities = if (replaceAll) {
+                mutableMapOf()
+            } else {
+                uiState.climateEntities.associateByTo(
+                    mutableMapOf(),
+                ) {
+                    it.entityId
+                }
+            }
+            for (entity in entities) {
+                when (entity.domain) {
+                    CAMERA_DOMAIN -> cameraEntities[entity.entityId] = entity
+                    CLIMATE_DOMAIN -> climateEntities[entity.entityId] = entity
+                }
+                if (entity.domain in supportedDomains) {
+                    supported[entity.entityId] = entity
+                }
+            }
+            supportedIds.addAll(supported.keys)
             val updatedEntities = if (replaceAll) supported else uiState.entities + supported
             uiState.copy(
                 entities = updatedEntities,
+                cameraEntities = cameraEntities.values.toList(),
+                climateEntities = climateEntities.values.toList(),
                 allEntitiesByDomain = updatedEntities.values.groupBy { it.domain },
                 entityListNavigation = uiState.entityListNavigation.copy(
                     entityLists = uiState.entityListNavigation.entityListIds.resolveEntities(updatedEntities),
                 ),
             )
         }
         val favoriteIds = mainViewUiState.value.favoriteEntityIds
-        supported.keys
+        supportedIds
             .filter { it in favoriteIds }
             .forEach { addCachedFavorite(it) }
     }
diff --git a/wear/src/main/kotlin/io/homeassistant/companion/android/home/views/HomeView.kt b/wear/src/main/kotlin/io/homeassistant/companion/android/home/views/HomeView.kt
@@ -16,6 +16,7 @@ import androidx.wear.compose.navigation.composable
 import androidx.wear.compose.navigation.rememberSwipeDismissableNavController
 import androidx.wear.tiles.TileService
 import io.homeassistant.companion.android.common.data.integration.IntegrationDomains.CAMERA_DOMAIN
+import io.homeassistant.companion.android.common.data.integration.IntegrationDomains.CLIMATE_DOMAIN
 import io.homeassistant.companion.android.common.sensors.id
 import io.homeassistant.companion.android.home.MainViewModel
 import io.homeassistant.companion.android.theme.WearAppTheme
@@ -231,7 +232,7 @@ fun LoadHomePage(mainViewModel: MainViewModel) {
                 val tileId = backStackEntry.arguments?.getInt(ARG_SCREEN_CAMERA_TILE_ID)
                 SetCameraTileView(
                     tile = mainViewModel.cameraTiles.value.firstOrNull { it.id == tileId },
-                    entities = uiState.allEntitiesByDomain[CAMERA_DOMAIN].orEmpty(),
+                    entities = uiState.cameraEntities,
                     onSelectEntity = {
                         swipeDismissableNavController.navigate(
                             "$ROUTE_CAMERA_TILE/$tileId/$SCREEN_SET_CAMERA_TILE_ENTITY",
@@ -255,7 +256,7 @@ fun LoadHomePage(mainViewModel: MainViewModel) {
                 val tileId = backStackEntry.arguments?.getInt(ARG_SCREEN_CAMERA_TILE_ID)
                 ChooseEntityView(
                     entitiesByDomainOrder = listOf(CAMERA_DOMAIN),
-                    entitiesByDomain = mapOf(CAMERA_DOMAIN to uiState.allEntitiesByDomain[CAMERA_DOMAIN].orEmpty()),
+                    entitiesByDomain = mapOf(CAMERA_DOMAIN to uiState.cameraEntities),
                     favoriteEntityIds = emptyList(),
                     onNoneClicked = {},
                     onEntitySelected = { entity ->
@@ -316,7 +317,7 @@ fun LoadHomePage(mainViewModel: MainViewModel) {
                 val tileId = backStackEntry.arguments?.getInt(ARG_SCREEN_THERMOSTAT_TILE_ID)
                 SetThermostatTileView(
                     tile = mainViewModel.thermostatTiles.value.firstOrNull { it.id == tileId },
-                    entities = uiState.allEntitiesByDomain["climate"].orEmpty(),
+                    entities = uiState.climateEntities,
                     onSelectEntity = {
                         swipeDismissableNavController.navigate(
                             "$ROUTE_THERMOSTAT_TILE/$tileId/$SCREEN_SET_THERMOSTAT_TILE_ENTITY",
@@ -342,8 +343,8 @@ fun LoadHomePage(mainViewModel: MainViewModel) {
             ) { backStackEntry ->
                 val tileId = backStackEntry.arguments?.getInt(ARG_SCREEN_THERMOSTAT_TILE_ID)
                 ChooseEntityView(
-                    entitiesByDomainOrder = listOf("climate"),
-                    entitiesByDomain = mapOf("climate" to uiState.allEntitiesByDomain["climate"].orEmpty()),
+                    entitiesByDomainOrder = listOf(CLIMATE_DOMAIN),
+                    entitiesByDomain = mapOf(CLIMATE_DOMAIN to uiState.climateEntities),
                     favoriteEntityIds = emptyList(),
                     onNoneClicked = {},
                     onEntitySelected = { entity ->
