Local
-- Are you sure you want to use the local voice assistant? It requires a - powerful device to run. If you device is not powerful enough, Home - Assistant cloud might be a better option. -
-
+ 
Select area
When you voice assistant knows where it is, it can better control the diff --git a/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-change-wake-word.ts b/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-change-wake-word.ts index 1f6e8740e2..1c798b53b1 100644 --- a/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-change-wake-word.ts +++ b/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-change-wake-word.ts @@ -10,6 +10,7 @@ import { STEP } from "./voice-assistant-setup-dialog"; import { AssistantSetupStyles } from "./styles"; import "../../components/ha-md-list"; import "../../components/ha-md-list-item"; +import { formatLanguageCode } from "../../common/language/format_language"; @customElement("ha-voice-assistant-setup-step-change-wake-word") export class HaVoiceAssistantSetupStepChangeWakeWord extends LitElement { @@ -22,11 +23,12 @@ export class HaVoiceAssistantSetupStepChangeWakeWord extends LitElement { protected override render() { return html`
- 
+ 
+
Change wake word
- Some wake words are better for [your language] and voice than others. - Please try them out. + Some wake words are better for + ${formatLanguageCode(this.hass.locale.language, this.hass.locale)} and + voice than others. Please try them out.
- ${this._status === "success"
- ? html`
+ ${this._status === "timeout"
+ ? html`
+ 
- 
-
`;
}
private async _testConnection() {
this._status = undefined;
+ this._showLoader = false;
+ const timeout = setTimeout(() => {
+ this._showLoader = true;
+ }, 3000);
const result = await testAssistSatelliteConnection(
this.hass,
this.assistEntityId!
);
+ clearTimeout(timeout);
+ this._showLoader = false;
this._status = result.status;
}
diff --git a/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-cloud.ts b/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-cloud.ts
index 72aec24ca2..18962da257 100644
--- a/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-cloud.ts
+++ b/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-cloud.ts
@@ -1,7 +1,9 @@
-import { html, LitElement } from "lit";
+import { mdiEarth, mdiMicrophoneMessage, mdiOpenInNew } from "@mdi/js";
+import { css, html, LitElement } from "lit";
import { customElement, property } from "lit/decorators";
import { fireEvent } from "../../common/dom/fire_event";
import { HomeAssistant } from "../../types";
+import { brandsUrl } from "../../util/brands-url";
import { AssistantSetupStyles } from "./styles";
@customElement("ha-voice-assistant-setup-step-cloud")
@@ -10,22 +12,92 @@ export class HaVoiceAssistantSetupStepCloud extends LitElement {
protected override render() {
return html`
+ ${this._status === "timeout"
+ ? html`
+ The voice assistant is unable to connect to Home Assistant
++ To play audio, the voice assistant device has to connect to Home + Assistant to fetch the files. Our test shows that the device is + unable to reach the Home Assistant server. +
+ ` + : html`
Hi
- With a couple of steps we are going to setup your voice assistant. -
` - : this._status === "timeout" - ? html`
- Voice assistant can not connect to Home Assistant
-- A good explanation what is happening and what action you should - take. -
- ` - : html`
- Checking...
-- We are checking if the device can reach your Home Assistant - instance. -
-
- 
- 
+
- Supercharge your assistant with Home Assistant Cloud
-- Speed up and take the load off your system by running your - text-to-speech and speech-to-text in our private and secure cloud. - Cloud also includes secure remote access to your system while - supporting the development of Home Assistant. -
+
+ The power of Home Assistant Cloud
+
+
+
+
+
+
+ + ${this.hass.localize( + "ui.panel.config.voice_assistants.assistants.cloud.features.speech.title" + )} + +
++ ${this.hass.localize( + "ui.panel.config.voice_assistants.assistants.cloud.features.speech.text" + )} +
+
+
+
+
+
+ + Remote access + +
++ Secure remote access to your system while supporting the + development of Home Assistant. +
+
+
+
+ 
+
+
+ + ${this.hass.localize( + "ui.panel.config.voice_assistants.assistants.cloud.features.assistants.title" + )} +
++ ${this.hass.localize( + "ui.panel.config.voice_assistants.assistants.cloud.features.assistants.text" + )} +
+
- `;
}
private async _checkCloud() {
@@ -217,10 +241,6 @@ export class HaVoiceAssistantSetupStepPipeline extends LitElement {
this._nextStep(STEP.CLOUD);
}
- private async _thisSystem() {
- this._nextStep(STEP.ADDONS);
- }
-
private _skip() {
this._nextStep(STEP.SUCCESS);
}
@@ -232,21 +252,22 @@ export class HaVoiceAssistantSetupStepPipeline extends LitElement {
static styles = [
AssistantSetupStyles,
css`
- :host {
- padding: 0;
+ .container {
+ border-radius: 16px;
+ border: 1px solid var(--divider-color);
+ overflow: hidden;
+ padding-bottom: 16px;
}
- .padding {
- padding: 24px;
+ .container:last-child {
+ margin-top: 16px;
}
- ha-md-list {
- width: 100%;
- text-align: initial;
- }
-
.messages-container {
padding: 24px;
box-sizing: border-box;
- height: 152px;
+ height: 195px;
+ background: var(--input-fill-color);
+ display: flex;
+ flex-direction: column;
}
.message {
white-space: nowrap;
@@ -259,21 +280,29 @@ export class HaVoiceAssistantSetupStepPipeline extends LitElement {
box-sizing: border-box;
overflow: hidden;
text-overflow: ellipsis;
- transition: width 1s;
width: 30px;
}
+ .rpi .message {
+ transition: width 1s;
+ }
+ .cloud .message {
+ transition: width 0.5s;
+ }
.message.user {
margin-left: 24px;
margin-inline-start: 24px;
margin-inline-end: initial;
- float: var(--float-end);
+ align-self: self-end;
text-align: right;
border-bottom-right-radius: 0px;
background-color: var(--primary-color);
color: var(--text-primary-color);
direction: var(--direction);
}
+ .timing.user {
+ align-self: self-end;
+ }
.message.user.show {
width: 295px;
@@ -283,12 +312,15 @@ export class HaVoiceAssistantSetupStepPipeline extends LitElement {
margin-right: 24px;
margin-inline-end: 24px;
margin-inline-start: initial;
- float: var(--float-start);
+ align-self: self-start;
border-bottom-left-radius: 0px;
background-color: var(--secondary-background-color);
color: var(--primary-text-color);
direction: var(--direction);
}
+ .timing.hass {
+ align-self: self-start;
+ }
.message.hass.show {
width: 184px;
diff --git a/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-success.ts b/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-success.ts
index 991a86aef9..c5ed1d7083 100644
--- a/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-success.ts
+++ b/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-success.ts
@@ -66,11 +66,11 @@ export class HaVoiceAssistantSetupStepSuccess extends LitElement {
: undefined;
return html`
-
- 
+
- Ready to assist!
+
+ Ready to Assist!
- Your device is all ready to go! If you want to tweak some more - settings, you can change that below. + Make any final customizations here. You can always change these in the + Voice Assistants section of the settings page.
${this.assistConfiguration &&
diff --git a/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-update.ts b/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-update.ts
index cdae8917ed..e6547e1230 100644
--- a/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-update.ts
+++ b/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-update.ts
@@ -2,7 +2,13 @@ import { css, html, LitElement, nothing, PropertyValues } from "lit";
import { customElement, property } from "lit/decorators";
import { fireEvent } from "../../common/dom/fire_event";
import "../../components/ha-circular-progress";
-import { OFF, ON, UNAVAILABLE, UNKNOWN } from "../../data/entity";
+import { ON, UNAVAILABLE } from "../../data/entity";
+import {
+ updateCanInstall,
+ UpdateEntity,
+ updateIsInstalling,
+ updateUsesProgress,
+} from "../../data/update";
import { HomeAssistant } from "../../types";
import { AssistantSetupStyles } from "./styles";
@@ -51,17 +57,19 @@ export class HaVoiceAssistantSetupStepUpdate extends LitElement {
return nothing;
}
- const stateObj = this.hass.states[this.updateEntityId];
+ const stateObj = this.hass.states[this.updateEntityId] as
+ | UpdateEntity
+ | undefined;
- const progressIsNumeric =
- typeof stateObj?.attributes.update_percentage !== null;
+ const progressIsNumeric = stateObj && updateUsesProgress(stateObj);
return html`
-
+ 
+ : html`
-
+
- ${stateObj.state === OFF || stateObj.state === UNKNOWN - ? "Checking for updates" - : "Updating your voice assistant"} + ${stateObj && + (stateObj.state === "unavailable" || updateIsInstalling(stateObj)) + ? "Updating your voice assistant" + : "Checking for updates"}
We are making sure you have the latest and greatest version of your @@ -69,12 +77,12 @@ export class HaVoiceAssistantSetupStepUpdate extends LitElement {
- ${stateObj.state === "unavailable" + ${stateObj?.state === UNAVAILABLE ? "Restarting voice assistant" : progressIsNumeric ? `Installing ${stateObj.attributes.update_percentage}%` @@ -88,8 +96,14 @@ export class HaVoiceAssistantSetupStepUpdate extends LitElement { if (!this.updateEntityId) { return; } - const updateEntity = this.hass.states[this.updateEntityId]; - if (updateEntity && this.hass.states[updateEntity.entity_id].state === ON) { + const updateEntity = this.hass.states[this.updateEntityId] as + | UpdateEntity + | undefined; + if ( + updateEntity && + this.hass.states[updateEntity.entity_id].state === ON && + updateCanInstall(updateEntity) + ) { this._updated = true; await this.hass.callService( "update", diff --git a/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-wake-word.ts b/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-wake-word.ts index 4cd90f4ca2..bcae8d9f32 100644 --- a/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-wake-word.ts +++ b/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-wake-word.ts @@ -65,14 +65,14 @@ export class HaVoiceAssistantSetupStepWakeWord extends LitElement { return html`
${!this._detected
? html`
- 
+ 
`
- : html`
+
Say “${this._activeWakeWord(this.assistConfiguration)}” to wake the device up
Setup will continue once the device is awake.
+ : html`