Fix CarPlay garage icon (home-assistant#3560)

<!-- Thank you for submitting a Pull Request and helping to improve Home
Assistant. Please complete the following sections to help the processing
and review of your changes. Please do not delete anything from this
template. -->

## Summary
<!-- Provide a brief summary of the changes you have made and most
importantly what they aim to achieve -->

## Screenshots
<!-- If this is a user-facing change not in the frontend, please include
screenshots in light and dark mode. -->

## Link to pull request in Documentation repository
<!-- Pull requests that add, change or remove functionality must have a
corresponding pull request in the Companion App Documentation repository
(https://github.com/home-assistant/companion.home-assistant). Please add
the number of this pull request after the "#" -->
Documentation: home-assistant/companion.home-assistant#

## Any other notes
<!-- If there is any other information of note, like if this Pull
Request is part of a bigger change, please include it here. -->

Author: bgoncal

Sources/CarPlay/Templates/Entities/CarPlayEntityListItem.swift

@@ -11,6 +11,12 @@ final class CarPlayEntityListItem: CarPlayListItemProvider {
     var template: CPListItem
     weak var interfaceController: CPInterfaceController?
 
+    /// Whether the entity has a dynamic icon that changes based on state
+    private var entityHasDynamicIcon: Bool {
+        guard let entityDomain = Domain(entityId: entity.entityId) else { return false }
+        return [.cover, .inputBoolean, .light, .switch].contains(entityDomain)
+    }
+
     init(
         serverId: String,
         entity: HAEntity,
@@ -34,14 +40,16 @@ final class CarPlayEntityListItem: CarPlayListItemProvider {
         if let magicItem, let magicItemInfo {
             displayText = magicItem.name(info: magicItemInfo)
 
-            var iconColor: UIColor?
-            if let iconColorString = magicItem.customization?.iconColor {
-                iconColor = UIColor(hex: iconColorString)
+            if !entityHasDynamicIcon {
+                var iconColor: UIColor?
+                if let iconColorString = magicItem.customization?.iconColor {
+                    iconColor = UIColor(hex: iconColorString)
+                }
+                image = magicItem.icon(info: magicItemInfo).carPlayIcon(color: iconColor)
             }
-            image = magicItem.icon(info: magicItemInfo).carPlayIcon(color: iconColor)
         }
         template.setText(displayText)
-        template.setDetailText(entity.localizedState)
+        template.setDetailText(entity.localizedState.leadingCapitalized)
         template.setImage(image)
     }
 }

Sources/Shared/Common/Extensions/String+HA.swift

@@ -18,6 +18,13 @@ public extension String {
         }
         return first.uppercased() + dropFirst()
     }
+
+    var leadingCapitalized: String {
+        guard let first else {
+            return self
+        }
+        return first.uppercased() + dropFirst()
+    }
 }
 
 public extension String? {

Sources/Shared/HAEntity+CarPlay.swift

@@ -122,17 +122,19 @@ public extension HAEntity {
     }
 
     private func getCoverIcon() -> MaterialDesignIcons {
-        let state = state
-
         guard let state = Domain.State(rawValue: state) else { return MaterialDesignIcons.bookmarkIcon }
 
         switch deviceClass {
         case .garage:
             switch state {
-            case .opening: return MaterialDesignIcons.arrowUpBoxIcon
-            case .closing: return MaterialDesignIcons.arrowDownBoxIcon
-            case .closed: return MaterialDesignIcons.garageIcon
-            default: return MaterialDesignIcons.garageOpenIcon
+            case .opening:
+                return MaterialDesignIcons.arrowUpBoxIcon
+            case .closing:
+                return MaterialDesignIcons.arrowDownBoxIcon
+            case .closed:
+                return MaterialDesignIcons.garageIcon
+            default:
+                return MaterialDesignIcons.garageOpenIcon
             }
         case .gate:
             switch state {