Skip to content

Commit a05522d

Browse files
basbrussbasbruss
authored
Merge pull request #1060 from UI-Lovelace-Minimalist/release
Release V1.1.6
2 parents 960404c + b1033fd commit a05522d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1311
-87
lines changed

‎custom_cards/custom_card_imswel_person/README.md

+6
Original file line numberDiff line numberDiff line change
@@ -98,3 +98,9 @@ This card needs the following to function correctly:
9898
<td>If true, shows the entity picture from your user instead of the icon. Default is false</td>
9999
</tr>
100100
</table>
101+
102+
??? note "Template Code"
103+
104+
```yaml title="custom_card_imswel_person.yaml"
105+
--8<-- "custom_cards/custom_card_imswel_person/custom_card_imswel_person.yaml"
106+
```

‎custom_components/ui_lovelace_minimalist/lovelace/themefiles/minimalist-desktop/minimalist-desktop.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ minimalist-desktop:
1111
divider-color: "rgba(var(--color-theme),.12)"
1212
accent-color: "var(--google-yellow)"
1313
ha-dialog-border-radius: "10px"
14+
# fix added border-lines in 2022.11
15+
ha-card-border-width: "0px"
16+
1417
card-mod-theme: "minimalist-desktop"
1518
card-mod-view-yaml: |
1619
"*:first-child$": |

‎custom_components/ui_lovelace_minimalist/lovelace/themefiles/minimalist-ios-tapbar/minimalist-ios-tapbar.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ minimalist-ios-tapbar:
1313
divider-color: "rgba(var(--color-theme),.12)"
1414
accent-color: "var(--google-yellow)"
1515
ha-dialog-border-radius: "10px"
16+
# fix added border-lines in 2022.11
17+
ha-card-border-width: "0px"
18+
1619
card-mod-theme: "minimalist-ios-tapbar"
1720
card-mod-root: |
1821
app-toolbar {

‎custom_components/ui_lovelace_minimalist/lovelace/themefiles/minimalist-mobile-tapbar/minimalist-mobile-tapbar.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ minimalist-mobile-tapbar:
1515
header-base-height: "70px"
1616
app-header-selection-bar-color: "transparent"
1717
ha-dialog-border-radius: "10px"
18+
# fix added border-lines in 2022.11
19+
ha-card-border-width: "0px"
1820

1921
card-mod-view-yaml: |
2022
"*:first-child$": |

‎custom_components/ui_lovelace_minimalist/lovelace/themefiles/minimalist-mobile/minimalist-mobile.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ minimalist-mobile:
1111
divider-color: "rgba(var(--color-theme),.12)"
1212
accent-color: "var(--google-yellow)"
1313
ha-dialog-border-radius: "10px"
14+
# fix added border-lines in 2022.11
15+
ha-card-border-width: "0px"
16+
1417
card-mod-theme: "minimalist-mobile"
1518
card-mod-root: |
1619
app-toolbar {

‎custom_components/ui_lovelace_minimalist/lovelace/translations/cn.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ ulm_language_variables:
1111
ulm_volume: "体积"
1212
ulm_popups_color: "顏色"
1313
ulm_radar: "雷达"
14+
ulm_popup_total: "Total"

‎custom_components/ui_lovelace_minimalist/lovelace/translations/cs.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ ulm_language_variables:
1111
ulm_volume: "Hlasitost"
1212
ulm_popups_color: "Barva"
1313
ulm_radar: "Radar"
14+
ulm_popup_total: "Total"

‎custom_components/ui_lovelace_minimalist/lovelace/translations/da.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ ulm_language_variables:
1414
ulm_volume: "Volumen"
1515
ulm_popups_color: "Farve"
1616
ulm_radar: "Radar"
17+
ulm_popup_total: "Total"

‎custom_components/ui_lovelace_minimalist/lovelace/translations/de.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ ulm_language_variables:
1111
ulm_volume: "Lautstärke"
1212
ulm_popups_color: "Farbe"
1313
ulm_radar: "Radar"
14+
ulm_popup_total: "Gesamt"

‎custom_components/ui_lovelace_minimalist/lovelace/translations/default.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ ulm_translation_engine:
1111
ulm_translation_close_cover: "[[[ return hass.resources[hass['language']]['ui.dialogs.more_info_control.cover.close_cover']; ]]]"
1212
ulm_translation_stop_cover: "[[[ return hass.resources[hass['language']]['ui.dialogs.more_info_control.cover.stop_cover']; ]]]"
1313
ulm_translation_open_cover: "[[[ return hass.resources[hass['language']]['ui.dialogs.more_info_control.cover.open_cover']; ]]]"
14+
ulm_translation_more_options: "[[[ return hass.resources[hass['language']]['ui.panel.lovelace.editor.edit_card.options']; ]]]"
1415
ulm_translation_hour: >
1516
[[[
1617
var number = hass.resources[hass['language']]["ui.duration.hour"];

‎custom_components/ui_lovelace_minimalist/lovelace/translations/en.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ ulm_language_variables:
1414
ulm_volume: "Volume"
1515
ulm_popups_color: "Color"
1616
ulm_radar: "Radar"
17+
ulm_popup_total: "Total"

‎custom_components/ui_lovelace_minimalist/lovelace/translations/es.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ ulm_language_variables:
1414
ulm_volume: "Volumen"
1515
ulm_popups_color: "Color"
1616
ulm_radar: "Radar"
17+
ulm_popup_total: "Total"

‎custom_components/ui_lovelace_minimalist/lovelace/translations/fi.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ ulm_language_variables:
1111
ulm_volume: "Äänenvoimakkuus"
1212
ulm_popups_color: "Väri"
1313
ulm_radar: "Tutka"
14+
ulm_popup_total: "Yhteensä"

‎custom_components/ui_lovelace_minimalist/lovelace/translations/fr.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ ulm_language_variables:
1111
ulm_volume: "Volume"
1212
ulm_popups_color: "Couleur"
1313
ulm_radar: "Radar"
14+
ulm_popup_total: "Total"

‎custom_components/ui_lovelace_minimalist/lovelace/translations/it.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ ulm_language_variables:
1111
ulm_volume: "Volume"
1212
ulm_popups_color: "Colore"
1313
ulm_radar: "Radar"
14+
ulm_popup_total: "Totale"

‎custom_components/ui_lovelace_minimalist/lovelace/translations/nl.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ ulm_language_variables:
1414
ulm_volume: "Volume"
1515
ulm_popups_color: "Kleur"
1616
ulm_radar: "Radar"
17+
ulm_popup_total: "Totaal"

‎custom_components/ui_lovelace_minimalist/lovelace/translations/no.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ ulm_language_variables:
1111
ulm_volume: "Volume"
1212
ulm_popups_color: "Farge"
1313
ulm_radar: "Radar"
14+
ulm_popup_total: "Totalt"

‎custom_components/ui_lovelace_minimalist/lovelace/translations/pl.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ ulm_language_variables:
1111
ulm_volume: "Objętość"
1212
ulm_popups_color: "Kolor"
1313
ulm_radar: "Radar"
14+
ulm_popup_total: "Total"

‎custom_components/ui_lovelace_minimalist/lovelace/translations/pt-BR.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ ulm_language_variables:
1111
ulm_volume: "Volume"
1212
ulm_popups_color: "Cor"
1313
ulm_radar: "Radar"
14+
ulm_popup_total: "Total"

‎custom_components/ui_lovelace_minimalist/lovelace/translations/pt.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ ulm_language_variables:
1111
ulm_volume: "Volume"
1212
ulm_popups_color: "Cor"
1313
ulm_radar: "Radar"
14+
ulm_popup_total: "Total"

‎custom_components/ui_lovelace_minimalist/lovelace/translations/ru.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ ulm_language_variables:
1111
ulm_volume: "Объем"
1212
ulm_popups_color: "Цвет"
1313
ulm_radar: "Pадар"
14+
ulm_popup_total: "Total"

‎custom_components/ui_lovelace_minimalist/lovelace/translations/sk.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ ulm_language_variables:
1111
ulm_volume: "Volume"
1212
ulm_popups_color: "Farba"
1313
ulm_radar: "Radar"
14+
ulm_popup_total: "Total"

‎custom_components/ui_lovelace_minimalist/lovelace/translations/sv.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ ulm_language_variables:
1111
ulm_volume: "Volym"
1212
ulm_popups_color: "Färg"
1313
ulm_radar: "Radar"
14+
ulm_popup_total: "Total"

‎custom_components/ui_lovelace_minimalist/lovelace/translations/tr.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ ulm_language_variables:
1111
ulm_volume: "Cilt"
1212
ulm_popups_color: "Renk"
1313
ulm_radar: "Radar"
14+
ulm_popup_total: "Total"

‎custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_light.yaml

+5-2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ card_light:
1717
ulm_card_light_force_background_color: false
1818
ulm_card_light_enable_popup: false
1919
ulm_card_light_enable_popup_tap: false
20+
ulm_card_light_color_palette: ""
2021
show_icon: false
2122
show_name: false
2223
show_label: false
@@ -108,7 +109,8 @@ card_light:
108109
let vars = variables;
109110
if(variables.ulm_card_light_enable_popup) {
110111
vars.ulm_custom_popup = {
111-
'template': 'popup_light_brightness'
112+
'template': 'popup_light_brightness',
113+
'popup_variables': {'ulm_card_light_color_palette': variables.ulm_card_light_color_palette }
112114
};
113115
}
114116
return vars;
@@ -151,7 +153,8 @@ card_light:
151153
let vars = variables;
152154
if(variables.ulm_card_light_enable_popup) {
153155
vars.ulm_custom_popup = {
154-
'template': 'popup_light_brightness'
156+
'template': 'popup_light_brightness',
157+
'popup_variables': {'ulm_card_light_color_palette': variables.ulm_card_light_color_palette }
155158
};
156159
}
157160
return vars;

‎custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_media_player.yaml

+104-3
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ card_media_player:
1414
ulm_card_media_player_player_controls_entity: "[[[ return entity.entity_id ]]]"
1515
ulm_card_media_player_enable_popup: false
1616
ulm_card_media_player_more_info: false
17+
ulm_card_media_player_power_button: false
1718
triggers_update: "all"
1819
show_icon: false
1920
show_name: false
@@ -62,6 +63,11 @@ card_media_player:
6263
: ''
6364
]]]
6465
custom_fields:
66+
power:
67+
- display: "[[[ return variables.ulm_card_media_player_power_button ? 'block' : 'none']]]"
68+
- position: "absolute"
69+
- top: "12px"
70+
- right: "12px"
6571
item2:
6672
- display: |
6773
[[[
@@ -85,6 +91,32 @@ card_media_player:
8591
return "none";
8692
]]]
8793
custom_fields:
94+
power:
95+
card:
96+
type: "custom:button-card"
97+
entity: "[[[ return entity.entity_id ]]]"
98+
template: "widget_icon"
99+
icon: "mdi:power"
100+
tap_action:
101+
action: "toggle"
102+
styles:
103+
img_cell:
104+
- width: "42px"
105+
- heigth: "42px"
106+
card:
107+
- background-color: |
108+
[[[
109+
return variables.ulm_card_media_player_enable_art && states[entity.entity_id].attributes.entity_picture != null
110+
? 'rgba(0, 0, 0, 0.2)'
111+
: 'rgba(var(--color-theme),0.05)'
112+
]]]
113+
icon:
114+
- color: |
115+
[[[
116+
return variables.ulm_card_media_player_enable_art && states[entity.entity_id].attributes.entity_picture != null
117+
? 'white'
118+
: 'rgba(var(--color-theme), 0.9)'
119+
]]]
88120
item1:
89121
card:
90122
type: "custom:button-card"
@@ -225,7 +257,7 @@ card_media_player:
225257
item2:
226258
card:
227259
type: "custom:button-card"
228-
template: "list_3_items"
260+
template: "list_4_items"
229261
styles:
230262
card:
231263
- padding: "0px"
@@ -293,17 +325,19 @@ card_media_player:
293325
entity: "[[[ return entity.entity_id; ]]]"
294326
tap_action:
295327
action: "call-service"
296-
service: "media_player.media_play_pause"
328+
service: "[[[ return (entity.attributes?.media_duration > 0) ? 'media_player.media_play_pause' : entity.state =='playing' ? 'media_player.media_stop' : 'media_player.media_play']]]"
297329
service_data:
298330
entity_id: "[[[ return variables.ulm_card_media_player_player_controls_entity ]]]"
299-
icon: "mdi:pause"
331+
icon: "[[[ return (entity.attributes?.media_duration > 0) ? 'mdi:pause' : 'mdi:stop' ]]]"
300332
state:
301333
- value: "paused"
302334
icon: "mdi:play"
303335
- value: "off"
304336
icon: "mdi:play"
305337
- value: "standby"
306338
icon: "mdi:play"
339+
- value: "idle"
340+
icon: "mdi:play"
307341
styles:
308342
card:
309343
- background-color: |
@@ -358,6 +392,73 @@ card_media_player:
358392
? 'white'
359393
: 'rgba(var(--color-theme), 0.9)'
360394
]]]
395+
item4:
396+
card:
397+
type: "custom:button-card"
398+
template: "widget_icon"
399+
icon: "mdi:playlist-music"
400+
entity: "[[[ return entity.entity_id; ]]]"
401+
styles:
402+
card:
403+
- background-color: |
404+
[[[
405+
return variables.ulm_card_media_player_enable_art && states[entity.entity_id].attributes.entity_picture != null
406+
? 'rgba(0, 0, 0, 0.2)'
407+
: 'rgba(var(--color-theme),0.05)'
408+
]]]
409+
icon:
410+
- color: |
411+
[[[
412+
return variables.ulm_card_media_player_enable_art && states[entity.entity_id].attributes.entity_picture != null
413+
? 'white'
414+
: 'rgba(var(--color-theme), 0.9)'
415+
]]]
416+
hold_action:
417+
action: >
418+
[[[
419+
return variables.ulm_card_media_player_enable_popup && entity.attributes?.source_list ? "fire-dom-event" : "more-info";
420+
]]]
421+
browser_mod:
422+
service: "browser_mod.popup"
423+
data:
424+
large: true
425+
hide_header: true
426+
content:
427+
type: "custom:button-card"
428+
template: "popup_media_player_source_card"
429+
entity: "[[[ return entity.entity_id; ]]]"
430+
tap_action:
431+
action: >
432+
[[[
433+
return variables.ulm_card_media_player_enable_popup && entity.attributes?.source_list ? "fire-dom-event" : "more-info";
434+
]]]
435+
browser_mod:
436+
service: "browser_mod.popup"
437+
data:
438+
large: true
439+
hide_header: true
440+
style: |
441+
--popup-background-color: var(--primary-background-color);
442+
--popup-border-radius: 20px;
443+
--popup-padding-x: 24px;
444+
--popup-padding-y: 20px;
445+
--popup-max-width: auto
446+
--popup-min-width: 800px;
447+
card_mod:
448+
style:
449+
ha-dialog$: |
450+
@media (max-width: 800px){
451+
div.mdc-dialog__container {
452+
--mdc-dialog-min-width: 100vw;
453+
--mdc-dialog-max-width: 100vw;
454+
--mdc-dialog-min-height: 100%;
455+
--ha-dialog-border-radius: 0px;
456+
}
457+
}
458+
content:
459+
type: "custom:button-card"
460+
template: "popup_media_player_source_card"
461+
entity: "[[[ return entity.entity_id; ]]]"
361462
item3:
362463
card:
363464
type: "custom:my-slider"

‎custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_person.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ card_person:
7474
} else {
7575
for (let st in states) {
7676
if (st.startsWith("zone.")) {
77-
if (states[st]?.attributes?.persons.includes(variables.ulm_card_person_entity)) {
77+
if (states[st]?.attributes?.persons?.includes(variables.ulm_card_person_entity) && !states[st]?.attributes?.passive) {
7878
var icon = states[st].attributes.icon !== null ? states[st].attributes.icon : 'mdi:help-circle';
7979
return '<ha-icon icon="' + icon + '" style="width: 10px; height: 10px; color: var(--primary-background-color);"></ha-icon>';
8080
}

‎custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_room.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ card_room:
2121
label: |-
2222
[[[
2323
if (variables.label_use_temperature) {
24-
return (entity?.attributes?.current_temperature || entity?.attributes?.temperature || entity?.state || '-') + (entity?.attributes?.unit_of_measurement || '°C');
24+
return (entity?.attributes?.current_temperature || entity?.attributes?.temperature || entity?.attributes?.device_temperature || entity?.state || '-') + (entity?.attributes?.unit_of_measurement || '°C');
2525
} else if (variables.label_use_brightness && entity?.state == "on" && entity?.attributes?.brightness != null) {
2626
let bri = Math.round(entity?.attributes?.brightness / 2.55);
2727
return (bri ? bri : "0") + "%";

0 commit comments

Comments
 (0)