Views: allow showing both icon & text title

src/data/lovelace/config/view.ts

@@ -49,6 +49,7 @@ export interface LovelaceBaseViewConfig {
   title?: string;
   path?: string;
   icon?: string;
+  show_icon_and_title?: boolean;
   theme?: string;
   panel?: boolean;
   background?: string | LovelaceViewBackgroundConfig;

src/panels/lovelace/common/generate-lovelace-config.ts

@@ -368,6 +368,7 @@ export const generateViewConfig = (
   path: string,
   title: string | undefined,
   icon: string | undefined,
+  show_icon_and_title: boolean | undefined,
   entities: HassEntities
 ): LovelaceViewConfig => {
   const ungroupedEntitites: Record<string, string[]> = {};
@@ -497,6 +498,9 @@ export const generateViewConfig = (
   if (icon) {
     view.icon = icon;
   }
+  if (show_icon_and_title !== undefined) {
+    view.show_icon_and_title = show_icon_and_title;
+  }
 
   return view;
 };
@@ -517,6 +521,7 @@ export const generateDefaultViewConfig = (
   const path = "default_view";
   const title = "Home";
   const icon = undefined;
+  const show_icon_and_title = false;
 
   // In the case of a default view, we want to use the group order attribute
   const groupOrders = {};
@@ -566,6 +571,7 @@ export const generateDefaultViewConfig = (
     path,
     title,
     icon,
+    show_icon_and_title,
     splittedByGroups.ungrouped
   );
 

src/panels/lovelace/editor/view-editor/hui-view-editor.ts

@@ -73,6 +73,12 @@ export class HuiViewEditor extends LitElement {
             icon: {},
           },
         },
+        {
+          name: "show_icon_and_title",
+          selector: {
+            boolean: {},
+          },
+        },
         { name: "path", selector: { text: {} } },
         { name: "theme", selector: { theme: {} } },
         {
@@ -207,6 +213,7 @@ export class HuiViewEditor extends LitElement {
       case "path":
         return this.hass!.localize("ui.panel.lovelace.editor.card.generic.url");
       case "type":
+      case "show_icon_and_title":
       case "subview":
       case "max_columns":
       case "dense_section_placement":
@@ -227,6 +234,7 @@ export class HuiViewEditor extends LitElement {
   ) => {
     switch (schema.name) {
       case "path":
+      case "show_icon_and_title":
       case "subview":
       case "dense_section_placement":
       case "top_margin":

src/panels/lovelace/hui-root.ts

@@ -522,17 +522,20 @@ class HUIRoot extends LitElement {
                 `
               : nothing}
             ${view.icon
-              ? html`
-                  <ha-icon
-                    class=${classMap({
-                      "child-view-icon": Boolean(view.subview),
-                    })}
-                    title=${ifDefined(view.title)}
-                    .icon=${view.icon}
-                  ></ha-icon>
-                `
-              : view.title ||
-                this.hass.localize("ui.panel.lovelace.views.unnamed_view")}
+              ? html`<ha-icon
+                  class=${classMap({
+                    "child-view-icon": Boolean(view.subview),
+                  })}
+                  title=${ifDefined(view.title)}
+                  .icon=${view.icon}
+                ></ha-icon>`
+              : nothing}
+            ${!view.icon
+              ? view.title ||
+                this.hass.localize("ui.panel.lovelace.views.unnamed_view")
+              : view.show_icon_and_title
+                ? view.title
+                : nothing}
             ${this._editMode
               ? html`
                   <ha-icon-button
@@ -1498,6 +1501,7 @@ class HUIRoot extends LitElement {
           padding-top: calc((var(--ha-tab-group-tab-height) - 20px) / 2);
         }
         ha-tab-group-tab.icon::part(base) {
+          gap: var(--ha-space-2);
           padding-top: calc((var(--ha-tab-group-tab-height) - 20px) / 2 - 2px);
           padding-bottom: calc(
             (var(--ha-tab-group-tab-height) - 20px) / 2 - 4px

src/translations/en.json

@@ -7532,13 +7532,15 @@
               "sidebar": "Sidebar",
               "panel": "Panel (single card)"
             },
+            "show_icon_and_title": "Show icon and title",
             "subview": "Subview",
             "max_columns": "Max number of sections wide",
             "section_specifics": "Sections view specific settings",
             "dense_section_placement": "Dense section placement",
             "dense_section_placement_helper": "Will try to fill gaps with sections that fit the gap. This may make section placement less predictable.",
             "top_margin": "Add additional space above",
             "top_margin_helper": "Helps reveal more of the background",
+            "show_icon_and_title_helper": "Show both icon and text title.",
             "subview_helper": "Subviews don't appear in tabs and have a back button.",
             "path_helper": "This value will become part of the URL path to open this view.",
             "edit_ui": "Edit in visual editor",