From 7bac41fe416d3a1fcc9e9e45031cbd544715a7aa Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Fri, 18 Feb 2022 16:57:54 -0800 Subject: [PATCH] Update media player more info (#11734) --- .../controls/more-info-media_player.ts | 74 ++++++------------- 1 file changed, 22 insertions(+), 52 deletions(-) diff --git a/src/dialogs/more-info/controls/more-info-media_player.ts b/src/dialogs/more-info/controls/more-info-media_player.ts index 526445cf5d..a721ae0a40 100644 --- a/src/dialogs/more-info/controls/more-info-media_player.ts +++ b/src/dialogs/more-info/controls/more-info-media_player.ts @@ -5,7 +5,6 @@ import { mdiLoginVariant, mdiMusicNote, mdiPlayBoxMultiple, - mdiSend, mdiVolumeHigh, mdiVolumeMinus, mdiVolumeOff, @@ -13,7 +12,7 @@ import { } from "@mdi/js"; import "@polymer/paper-input/paper-input"; import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit"; -import { customElement, property, query } from "lit/decorators"; +import { customElement, property } from "lit/decorators"; import { isComponentLoaded } from "../../../common/config/is_component_loaded"; import { stopPropagation } from "../../../common/dom/stop_propagation"; import { supportsFeature } from "../../../common/entity/supports-feature"; @@ -22,7 +21,7 @@ import "../../../components/ha-icon-button"; import "../../../components/ha-slider"; import "../../../components/ha-svg-icon"; import { showMediaBrowserDialog } from "../../../components/media-player/show-media-browser-dialog"; -import { UNAVAILABLE, UNAVAILABLE_STATES, UNKNOWN } from "../../../data/entity"; +import { UNAVAILABLE, UNKNOWN } from "../../../data/entity"; import { computeMediaControls, MediaPickedEvent, @@ -43,8 +42,6 @@ class MoreInfoMediaPlayer extends LitElement { @property({ attribute: false }) public stateObj?: MediaPlayerEntity; - @query("#ttsInput") private _ttsInput?: HTMLInputElement; - protected render(): TemplateResult { if (!this.stateObj) { return html``; @@ -75,13 +72,17 @@ class MoreInfoMediaPlayer extends LitElement { ${supportsFeature(stateObj, SUPPORT_BROWSE_MEDIA) ? html` - + > + + ` : ""} @@ -183,21 +184,8 @@ class MoreInfoMediaPlayer extends LitElement { supportsFeature(stateObj, SUPPORT_PLAY_MEDIA) ? html`
- - + Text to speech has moved to the media browser.
- ` : ""} `; @@ -207,14 +195,14 @@ class MoreInfoMediaPlayer extends LitElement { return css` ha-icon-button[action="turn_off"], ha-icon-button[action="turn_on"], - ha-slider, - #ttsInput { + ha-slider { flex-grow: 1; } .controls { display: flex; align-items: center; + --mdc-theme-primary: currentColor; } .basic-controls { @@ -223,8 +211,7 @@ class MoreInfoMediaPlayer extends LitElement { .volume, .source-input, - .sound-input, - .tts { + .sound-input { display: flex; align-items: center; justify-content: space-between; @@ -241,6 +228,15 @@ class MoreInfoMediaPlayer extends LitElement { margin-left: 10px; flex-grow: 1; } + + .tts { + margin-top: 16px; + font-style: italic; + } + + mwc-button > ha-svg-icon { + vertical-align: text-bottom; + } `; } @@ -295,32 +291,6 @@ class MoreInfoMediaPlayer extends LitElement { }); } - private _ttsCheckForEnter(e: KeyboardEvent) { - if (e.keyCode === 13) this._sendTTS(); - } - - private _sendTTS() { - const ttsInput = this._ttsInput; - if (!ttsInput) { - return; - } - - const services = this.hass.services.tts; - const serviceKeys = Object.keys(services).sort(); - - const service = serviceKeys.find((key) => key.indexOf("_say") !== -1); - - if (!service) { - return; - } - - this.hass.callService("tts", service, { - entity_id: this.stateObj!.entity_id, - message: ttsInput.value, - }); - ttsInput.value = ""; - } - private _showBrowseMedia(): void { showMediaBrowserDialog(this, { action: "play",