Skip to content

Commit

Permalink
Merge pull request #1496 from gravityrebel/1495-Collapse-Media-Player…
Browse files Browse the repository at this point in the history 
…s-in-an-idle-state

1495 collapse media players in an idle state
  • Loading branch information
@wilbiev
wilbiev authored Dec 23, 2024
2 parents 6a427b1 + 2caebd9 commit e1cc69a
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 12 deletions.
30 changes: 18 additions & 12 deletions ...ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_media_player.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ card_media_player:
ulm_card_media_player_enable_volume_buttons: false
ulm_card_media_player_enable_volume_adjust: 0
ulm_card_media_player_collapsible: false
ulm_card_media_player_idle_off: false
ulm_card_media_player_player_controls_entity: "[[[ return entity.entity_id ]]]"
ulm_card_media_player_enable_popup: false
ulm_card_media_player_more_info: false
Expand Down Expand Up @@ -72,7 +73,7 @@ card_media_player:
if (!variables.ulm_card_media_player_collapsible) {
return "12px";
} else {
return (entity.state === "off" || entity.state === "standby") ? "0px" : "12px";
return (entity.state === "off" || entity.state === "standby" || (variables.ulm_card_media_player_idle_off && entity.state=== "idle")) ? "0px" : "12px";
}
]]]
card:
Expand All @@ -96,7 +97,7 @@ card_media_player:
[[[
if(variables.ulm_card_media_player_enable_controls) {
if(variables.ulm_card_media_player_collapsible){
return (entity.state === "off" || entity.state === "standby") ? "none" : "block";
return (entity.state === "off" || entity.state === "standby" || (variables.ulm_card_media_player_idle_off && entity.state=== "idle")) ? "none" : "block";
}
return "block";
}
Expand All @@ -117,7 +118,7 @@ card_media_player:
[[[
if(variables.ulm_card_media_player_enable_volume_slider) {
if(variables.ulm_card_media_player_collapsible){
return (entity.state === "off" || entity.state === "standby") ? "none" : "block";
return (entity.state === "off" || entity.state === "standby" || (variables.ulm_card_media_player_idle_off && entity.state=== "idle")) ? "none" : "block";
}
return "block";
}
Expand All @@ -128,7 +129,7 @@ card_media_player:
[[[
if(variables.ulm_card_media_player_enable_volume_buttons) {
if(variables.ulm_card_media_player_collapsible){
return (entity.state === "off" || entity.state === "standby") ? "none" : "block";
return (entity.state === "off" || entity.state === "standby" || (variables.ulm_card_media_player_idle_off && entity.state=== "idle")) ? "none" : "block";
}
return "block";
}
Expand Down Expand Up @@ -286,22 +287,27 @@ card_media_player:
name: |
[[[
let name = variables.ulm_card_media_player_name || states[entity.entity_id].attributes.friendly_name;
if(states[entity.entity_id].attributes.media_title){
let isIdle = variables.ulm_card_media_player_idle_off && (entity.state === "idle");
if(states[entity.entity_id].attributes.media_title && !isIdle){
name = states[entity.entity_id].attributes.media_title;
}
return name;
]]]
label: |
[[[
let label = variables.ulm_translation_on;
if (variables.ulm_card_media_player_more_info && states[entity.entity_id].attributes.media_artist
&& states[entity.entity_id].attributes.media_album_name) {
label = states[entity.entity_id].attributes.media_artist + " • " + states[entity.entity_id].attributes.media_album_name;
} else if(states[entity.entity_id].attributes.media_album_name) {
label = states[entity.entity_id].attributes.media_album_name;
} else if (states[entity.entity_id].attributes.media_artist) {
label = states[entity.entity_id].attributes.media_artist
let isIdle = variables.ulm_card_media_player_idle_off && (entity.state === "idle");
if (!isIdle) {
if (variables.ulm_card_media_player_more_info && states[entity.entity_id].attributes.media_artist
&& states[entity.entity_id].attributes.media_album_name ) {
label = states[entity.entity_id].attributes.media_artist + " • " + states[entity.entity_id].attributes.media_album_name;
} else if(states[entity.entity_id].attributes.media_album_name) {
label = states[entity.entity_id].attributes.media_album_name;
} else if (states[entity.entity_id].attributes.media_artist) {
label = states[entity.entity_id].attributes.media_artist
}
}
return label;
]]]
styles:
Expand Down
1 change: 1 addition & 0 deletions docs/usage/cards/card_media_player.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ hide:
| ulm_card_media_player_enable_volume_buttons | false | | Enable volume buttons below controls |
| ulm_card_media_player_enable_volume_adjust | 5 | | Volume Adjust Amount - if not set then 1 for TV and 5 for Speaker |
| ulm_card_media_player_collapsible | false | | Controls are collapsible when state is off |
| ulm_card_media_player_idle_off | false | | If true "idle" states will count as "off" for collapse |
| ulm_card_media_player_player_controls_entity | entity | | Change the controlled entity |
| ulm_card_media_player_enable_popup | false | | Enable pop-up |
| ulm_card_media_player_more_info | false | | Displays artist and album info in the sub-label |
Expand Down

0 comments on commit e1cc69a

Please sign in to comment.