fix: Use HA style and coloring for all icons (#1790)

src/camera-manager/frigate/engine-frigate.ts

@@ -58,7 +58,6 @@ import {
   RecordingSegmentsQueryResultsMap,
 } from '../types';
 import { getDefaultGo2RTCEndpoint } from '../utils/go2rtc-endpoint';
-import frigateLogo from './assets/frigate.svg';
 import { FrigateCamera, isBirdseye } from './camera';
 import { FrigateEventWatcher } from './event-watcher';
 import { FrigateViewMediaFactory } from './media';
@@ -912,8 +911,8 @@ export class FrigateCameraManagerEngine
     hass: HomeAssistant,
     cameraConfig: CameraConfig,
   ): CameraManagerCameraMetadata {
-    const metadata = super.getCameraMetadata(hass, cameraConfig);
     return {
+      ...super.getCameraMetadata(hass, cameraConfig),
       title:
         cameraConfig.title ??
         getEntityTitle(hass, cameraConfig.camera_entity) ??
@@ -921,8 +920,7 @@ export class FrigateCameraManagerEngine
         prettifyTitle(cameraConfig.frigate?.camera_name) ??
         cameraConfig.id ??
         '',
-      icon: metadata.icon,
-      engineLogo: frigateLogo,
+      engineIcon: 'frigate',
     };
   }
 

src/camera-manager/generic/engine-generic.ts

@@ -5,7 +5,7 @@ import { StateWatcherSubscriptionInterface } from '../../card-controller/hass/st
 import { PTZAction } from '../../config/ptz';
 import { ActionPhase, CameraConfig } from '../../config/types';
 import { ExtendedHomeAssistant } from '../../types';
-import { getEntityIcon, getEntityTitle } from '../../utils/ha';
+import { getEntityTitle } from '../../utils/ha';
 import { ViewMedia } from '../../view/media';
 import { Camera } from '../camera';
 import { Capabilities } from '../capabilities';
@@ -202,9 +202,11 @@ export class GenericCameraManagerEngine implements CameraManagerEngine {
         getEntityTitle(hass, cameraConfig.webrtc_card?.entity) ??
         cameraConfig.id ??
         '',
-      icon:
-        cameraConfig?.icon ??
-        (cameraEntity ? getEntityIcon(hass, cameraEntity, 'mdi:video') : 'mdi:video'),
+      icon: {
+        entity: cameraEntity ?? undefined,
+        icon: cameraConfig.icon,
+        fallback: 'mdi:video',
+      },
     };
   }
 

src/camera-manager/motioneye/engine-motioneye.ts

@@ -43,7 +43,6 @@ import {
   QueryReturnType,
 } from '../types';
 import { getPTZCapabilitiesFromCameraConfig } from '../utils/ptz';
-import motioneyeLogo from './assets/motioneye.svg';
 import { MotionEyeCamera } from './camera';
 import { MotionEyeEventQueryResults } from './types';
 
@@ -420,10 +419,9 @@ export class MotionEyeCameraManagerEngine extends BrowseMediaCameraManagerEngine
     hass: HomeAssistant,
     cameraConfig: CameraConfig,
   ): CameraManagerCameraMetadata {
-    const metadata = super.getCameraMetadata(hass, cameraConfig);
     return {
-      ...metadata,
-      engineLogo: motioneyeLogo,
+      ...super.getCameraMetadata(hass, cameraConfig),
+      engineIcon: 'motioneye',
     };
   }
 

src/camera-manager/reolink/engine-reolink.ts

@@ -38,7 +38,6 @@ import {
   QueryReturnType,
 } from '../types';
 import { getPTZCapabilitiesFromCameraConfig } from '../utils/ptz';
-import reolinkLogo from './assets/reolink.svg';
 import { ReolinkCamera } from './camera';
 import { BrowseMediaReolinkCameraMetadata, ReolinkEventQueryResults } from './types';
 
@@ -395,10 +394,9 @@ export class ReolinkCameraManagerEngine extends BrowseMediaCameraManagerEngine {
     hass: HomeAssistant,
     cameraConfig: CameraConfig,
   ): CameraManagerCameraMetadata {
-    const metadata = super.getCameraMetadata(hass, cameraConfig);
     return {
-      ...metadata,
-      engineLogo: reolinkLogo,
+      ...super.getCameraMetadata(hass, cameraConfig),
+      engineIcon: 'reolink',
     };
   }
 

src/camera-manager/types.ts

@@ -1,4 +1,4 @@
-import { CapabilityKey } from '../types';
+import { CapabilityKey, Icon } from '../types';
 import { FrigateCardView, SSLCiphers } from '../config/types';
 import { ViewMedia } from '../view/media';
 
@@ -106,8 +106,10 @@ export interface CameraManagerMediaCapabilities {
 
 export interface CameraManagerCameraMetadata {
   title: string;
-  icon: string;
-  engineLogo?: string;
+  icon: Icon;
+
+  // Engine icon is just a string since it will never be entity-derived.
+  engineIcon?: string;
 }
 
 export interface CameraEndpointsContext {