Skip to content

use ha-svg-icon in more-info-weather #7196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bramkragten merged 1 commit into from
Oct 2, 2020
Merged

use ha-svg-icon in more-info-weather #7196

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 47 additions & 25 deletions src/dialogs/more-info/controls/more-info-weather.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import "../../../components/ha-svg-icon";
import { HassEntity } from "home-assistant-js-websocket";
import {
css,
Expand All @@ -9,7 +10,28 @@ import {
} from "lit-element";
import { html, TemplateResult } from "lit-html";
import { HomeAssistant } from "../../../types";
import "../../../components/ha-icon";

import {
mdiAlertCircleOutline,
mdiEye,
mdiGauge,
mdiThermometer,
mdiWaterPercent,
mdiWeatherCloudy,
mdiWeatherFog,
mdiWeatherHail,
mdiWeatherLightning,
mdiWeatherLightningRainy,
mdiWeatherNight,
mdiWeatherPartlyCloudy,
mdiWeatherPouring,
mdiWeatherRainy,
mdiWeatherSnowy,
mdiWeatherSnowyRainy,
mdiWeatherSunny,
mdiWeatherWindy,
mdiWeatherWindyVariant,
} from "@mdi/js";

const cardinalDirections = [
"N",
Expand All @@ -32,21 +54,21 @@ const cardinalDirections = [
];

const weatherIcons = {
"clear-night": "hass:weather-night",
cloudy: "hass:weather-cloudy",
exceptional: "hass:alert-circle-outline",
fog: "hass:weather-fog",
hail: "hass:weather-hail",
lightning: "hass:weather-lightning",
"lightning-rainy": "hass:weather-lightning-rainy",
partlycloudy: "hass:weather-partly-cloudy",
pouring: "hass:weather-pouring",
rainy: "hass:weather-rainy",
snowy: "hass:weather-snowy",
"snowy-rainy": "hass:weather-snowy-rainy",
sunny: "hass:weather-sunny",
windy: "hass:weather-windy",
"windy-variant": "hass:weather-windy-variant",
"clear-night": mdiWeatherNight,
cloudy: mdiWeatherCloudy,
exceptional: mdiAlertCircleOutline,
fog: mdiWeatherFog,
hail: mdiWeatherHail,
lightning: mdiWeatherLightning,
"lightning-rainy": mdiWeatherLightningRainy,
partlycloudy: mdiWeatherPartlyCloudy,
pouring: mdiWeatherPouring,
rainy: mdiWeatherRainy,
snowy: mdiWeatherSnowy,
"snowy-rainy": mdiWeatherSnowyRainy,
sunny: mdiWeatherSunny,
windy: mdiWeatherWindy,
"windy-variant": mdiWeatherWindyVariant,
};

@customElement("more-info-weather")
Expand Down Expand Up @@ -79,7 +101,7 @@ class MoreInfoWeather extends LitElement {

return html`
<div class="flex">
<ha-icon icon="hass:thermometer"></ha-icon>
<ha-svg-icon .path=${mdiThermometer}></ha-svg-icon>
<div class="main">
${this.hass.localize("ui.card.weather.attributes.temperature")}
</div>
Expand All @@ -90,7 +112,7 @@ class MoreInfoWeather extends LitElement {
${this._showValue(this.stateObj.attributes.pressure)
? html`
<div class="flex">
<ha-icon icon="hass:gauge"></ha-icon>
<ha-svg-icon .path=${mdiGauge}></ha-svg-icon>
<div class="main">
${this.hass.localize("ui.card.weather.attributes.air_pressure")}
</div>
Expand All @@ -104,7 +126,7 @@ class MoreInfoWeather extends LitElement {
${this._showValue(this.stateObj.attributes.humidity)
? html`
<div class="flex">
<ha-icon icon="hass:water-percent"></ha-icon>
<ha-svg-icon .path=${mdiWaterPercent}></ha-svg-icon>
<div class="main">
${this.hass.localize("ui.card.weather.attributes.humidity")}
</div>
Expand All @@ -115,7 +137,7 @@ class MoreInfoWeather extends LitElement {
${this._showValue(this.stateObj.attributes.wind_speed)
? html`
<div class="flex">
<ha-icon icon="hass:weather-windy"></ha-icon>
<ha-svg-icon .path=${mdiWeatherWindy}></ha-svg-icon>
<div class="main">
${this.hass.localize("ui.card.weather.attributes.wind_speed")}
</div>
Expand All @@ -131,7 +153,7 @@ class MoreInfoWeather extends LitElement {
${this._showValue(this.stateObj.attributes.visibility)
? html`
<div class="flex">
<ha-icon icon="hass:eye"></ha-icon>
<ha-svg-icon .path=${mdiEye}></ha-svg-icon>
<div class="main">
${this.hass.localize("ui.card.weather.attributes.visibility")}
</div>
Expand All @@ -151,9 +173,9 @@ class MoreInfoWeather extends LitElement {
<div class="flex">
${item.condition
? html`
<ha-icon
.icon="${weatherIcons[item.condition]}"
></ha-icon>
<ha-svg-icon
.path="${weatherIcons[item.condition]}"
></ha-svg-icon>
`
: ""}
${!this._showValue(item.templow)
Expand Down Expand Up @@ -193,7 +215,7 @@ class MoreInfoWeather extends LitElement {

static get styles(): CSSResult {
return css`
ha-icon {
ha-svg-icon {
color: var(--paper-item-icon-color);
}
.section {
Expand Down