Add deviceClass support to ControlEntityProvider for proper widget icons

Co-authored-by: bgoncal <5808343+bgoncal@users.noreply.github.com>

Author: Copilot

Sources/Extensions/AppIntents/Widget/Sensor/WidgetSensorsAppIntentTimelineProvider.swift

@@ -60,7 +60,15 @@ struct WidgetSensorsAppIntentTimelineProvider: AppIntentTimelineProvider {
     func placeholder(in context: Context) -> WidgetSensorsEntry {
         let count = WidgetFamilySizes.size(for: context.family)
         let sensors = stride(from: 0, to: count, by: 1).map { index in
-            WidgetSensorsEntry.SensorData(id: String(index), key: "?", value: "?")
+            WidgetSensorsEntry.SensorData(
+                id: String(index),
+                key: "?",
+                value: "?",
+                unitOfMeasurement: nil,
+                icon: nil,
+                deviceClass: nil,
+                domainState: nil
+            )
         }
 
         return WidgetSensorsEntry(
@@ -90,13 +98,15 @@ struct WidgetSensorsAppIntentTimelineProvider: AppIntentTimelineProvider {
         let state: ControlEntityProvider.State = await ControlEntityProvider(domains: Domain.allCases).state(
             server: server,
             entityId: sensor.entityId
-        ) ?? ControlEntityProvider.State(value: "", unitOfMeasurement: nil, domainState: nil)
+        ) ?? ControlEntityProvider.State(value: "", unitOfMeasurement: nil, domainState: nil, deviceClass: nil)
         return WidgetSensorsEntry.SensorData(
             id: sensor.id,
             key: sensor.displayString,
             value: state.value,
             unitOfMeasurement: state.unitOfMeasurement,
-            icon: sensor.icon ?? Domain(entityId: sensor.entityId)?.icon().name
+            icon: sensor.icon ?? Domain(entityId: sensor.entityId)?.icon(deviceClass: state.deviceClass).name,
+            deviceClass: state.deviceClass,
+            domainState: state.domainState
         )
     }
 
@@ -127,6 +137,8 @@ struct WidgetSensorsEntry: TimelineEntry {
         var value: String
         var unitOfMeasurement: String?
         var icon: String?
+        var deviceClass: String?
+        var domainState: Domain.State?
     }
 }
 

Sources/Extensions/Widgets/Custom/WidgetCustom.swift

@@ -70,7 +70,10 @@ struct WidgetCustom: Widget {
             }
 
             let icon: MaterialDesignIcons = {
-                if let info {
+                // When showing states and we have device class info, use dynamic icon based on domain, device class, and state
+                if showStates, let domain = magicItem.domain, let state = state {
+                    return domain.icon(deviceClass: state.deviceClass, state: state.domainState)
+                } else if let info {
                     return magicItem.icon(info: info)
                 } else {
                     return .gridIcon

Sources/Extensions/Widgets/Custom/WidgetCustomTimelineProvider.swift

@@ -14,6 +14,7 @@ struct WidgetCustomEntry: TimelineEntry {
     struct ItemState: Codable {
         let value: String
         let domainState: Domain.State?
+        let deviceClass: String?
     }
 }
 
@@ -157,7 +158,8 @@ struct WidgetCustomTimelineProvider: AppIntentTimelineProvider {
                 states[item] =
                     .init(
                         value: "\(StatePrecision.adjustPrecision(serverId: serverId, entityId: entityId, stateValue: state.value)) \(state.unitOfMeasurement ?? "")",
-                        domainState: state.domainState
+                        domainState: state.domainState,
+                        deviceClass: state.deviceClass
                     )
             } else {
                 Current.Log

Sources/Shared/ControlEntityProvider.swift

@@ -16,11 +16,13 @@ public final class ControlEntityProvider {
         public let value: String
         public let unitOfMeasurement: String?
         public let domainState: Domain.State?
+        public let deviceClass: String?
 
-        public init(value: String, unitOfMeasurement: String?, domainState: Domain.State?) {
+        public init(value: String, unitOfMeasurement: String?, domainState: Domain.State?, deviceClass: String? = nil) {
             self.value = value
             self.unitOfMeasurement = unitOfMeasurement
             self.domainState = domainState
+            self.deviceClass = deviceClass
         }
     }
 
@@ -157,11 +159,13 @@ public final class ControlEntityProvider {
             stateValue: stateValue
         )
         let unitOfMeasurement = (state?["attributes"] as? [String: Any])?["unit_of_measurement"] as? String
+        let deviceClass = (state?["attributes"] as? [String: Any])?["device_class"] as? String
         stateValue = stateValue.capitalizedFirst
         return .init(
             value: stateValue,
             unitOfMeasurement: unitOfMeasurement,
-            domainState: .init(rawValue: stateValue.trimmingCharacters(in: .whitespacesAndNewlines).lowercased())
+            domainState: .init(rawValue: stateValue.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()),
+            deviceClass: deviceClass
         )
     }
 }