Merge pull request #989 from UI-Lovelace-Minimalist/release

Release V1.1.4
UI-Lovelace-Minimalist · Sep 16, 2022 · 327582f · 327582f
2 parents be65ddc + 3042ca7
commit 327582f
Show file tree

Hide file tree

Showing 31 changed files with 505 additions and 94 deletions.
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/default.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/default.yaml
@@ -8,6 +8,9 @@ ulm_translation_engine:
     ulm_translation_scenes: "[[[ return hass.resources[hass['language']]['ui.dialogs.quick-bar.commands.reload.scene']; ]]]"
     ulm_translation_source: "[[[ return hass.resources[hass['language']]['ui.card.media_player.source']; ]]]"
     ulm_translation_history: "[[[ return hass.resources[hass['language']]['ui.dialogs.more_info_control.history']; ]]]"
+    ulm_translation_close_cover: "[[[ return hass.resources[hass['language']]['ui.dialogs.more_info_control.cover.close_cover']; ]]]"
+    ulm_translation_stop_cover: "[[[ return hass.resources[hass['language']]['ui.dialogs.more_info_control.cover.stop_cover']; ]]]"
+    ulm_translation_open_cover: "[[[ return hass.resources[hass['language']]['ui.dialogs.more_info_control.cover.open_cover']; ]]]"
     ulm_translation_hour: >
       [[[
         var number = hass.resources[hass['language']]["ui.duration.hour"];

diff --git a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/actions/actions_card.yaml b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/actions/actions_card.yaml
@@ -43,7 +43,7 @@ ulm_actions_card:
         if (action == 'adaptive'){
           return 'input_select.select_option';
         }
-        if(entity.entity_id.startsWith("media_player.")){
+        if((entity != null) && entity.entity_id.startsWith("media_player.")){
           return 'media_player.media_play_pause';
         }
         return variables.ulm_card_tap_service;
@@ -58,7 +58,7 @@ ulm_actions_card:
             'entity_id': variables.ulm_input_select
           };
         }
-        if(entity.entity_id.startsWith("media_player.")){
+        if((entity != null) && entity.entity_id.startsWith("media_player.")){
           return {
             'entity_id': entity.entity_id
           };
@@ -74,8 +74,7 @@ ulm_actions_card:
           --popup-border-radius: 20px;
           --popup-padding-x: 24px;
           --popup-padding-y: 20px;
-          --popup-max-width: auto
-          --popup-min-width: 800px;
+          --popup-min-width: 1000px;
         card_mod:
           style:
             ha-dialog$: |
@@ -161,7 +160,7 @@ ulm_actions_card:
         if (action == 'adaptive'){
           return 'input_select.select_option';
         }
-        if(entity.entity_id.startsWith("media_player.")){
+        if((entity != null) && entity.entity_id.startsWith("media_player.")){
           return 'media_player.media_play_pause';
         }
         return variables.ulm_card_hold_service;
@@ -176,7 +175,7 @@ ulm_actions_card:
             'entity_id': variables.ulm_input_select
           };
         }
-        if(entity.entity_id.startsWith("media_player.")){
+        if((entity != null) && entity.entity_id.startsWith("media_player.")){
           return {
             'entity_id': entity.entity_id
           };
@@ -192,8 +191,7 @@ ulm_actions_card:
           --popup-border-radius: 20px;
           --popup-padding-x: 24px;
           --popup-padding-y: 20px;
-          --popup-max-width: auto
-          --popup-min-width: 800px;
+          --popup-min-width: 1000px;
         card_mod:
           style:
             ha-dialog$: |
@@ -279,7 +277,7 @@ ulm_actions_card:
         if (action == 'adaptive'){
           return 'input_select.select_option';
         }
-        if(entity.entity_id.startsWith("media_player.")){
+        if((entity != null) && entity.entity_id.startsWith("media_player.")){
           return 'media_player.media_play_pause';
         }
         return variables.ulm_card_double_tap_service;
@@ -294,7 +292,7 @@ ulm_actions_card:
             'entity_id': variables.ulm_input_select
           };
         }
-        if(entity.entity_id.startsWith("media_player.")){
+        if((entity != null) && entity.entity_id.startsWith("media_player.")){
           return {
             'entity_id': entity.entity_id
           };
@@ -310,8 +308,7 @@ ulm_actions_card:
           --popup-border-radius: 20px;
           --popup-padding-x: 24px;
           --popup-padding-y: 20px;
-          --popup-max-width: auto
-          --popup-min-width: 800px;
+          --popup-min-width: 1000px;
         card_mod:
           style:
             ha-dialog$: |

diff --git a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/actions/actions_icon.yaml b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/actions/actions_icon.yaml
@@ -74,8 +74,7 @@ ulm_actions_icon:
           --popup-border-radius: 20px;
           --popup-padding-x: 24px;
           --popup-padding-y: 20px;
-          --popup-max-width: auto
-          --popup-min-width: 800px;
+          --popup-min-width: 1000px;
         card_mod:
           style:
             ha-dialog$: |
@@ -191,8 +190,7 @@ ulm_actions_icon:
           --popup-border-radius: 20px;
           --popup-padding-x: 24px;
           --popup-padding-y: 20px;
-          --popup-max-width: auto
-          --popup-min-width: 800px;
+          --popup-min-width: 1000px;
         card_mod:
           style:
             ha-dialog$: |
@@ -256,7 +254,7 @@ ulm_actions_icon:
         if (domain == "media_player" && action == 'toggle'){
           action = 'call-service';
         }
-        if (action == 'popup' && (variables.ulm_card_light_enable_popup || variables.ulm_card_media_player_enable_popup || variables.ulm_card_thermostat_enable_popup) ){
+        if (action == 'popup' && (variables.ulm_card_light_enable_popup || variables.ulm_card_media_player_enable_popup || variables.ulm_card_thermostat_enable_popup || variables.ulm_card_cover_enable_popup)){
           action = 'fire-dom-event'
         }
 
@@ -313,8 +311,7 @@ ulm_actions_icon:
           --popup-border-radius: 20px;
           --popup-padding-x: 24px;
           --popup-padding-y: 20px;
-          --popup-max-width: auto
-          --popup-min-width: 800px;
+          --popup-min-width: 1000px;
         card_mod:
           style:
             ha-dialog$: |

diff --git a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/actions/actions_name.yaml b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/actions/actions_name.yaml
@@ -63,7 +63,6 @@ ulm_actions_name:
             'entity_id': entity.entity_id
           };
         }
-        }
         return variables.ulm_name_tap_service_data;
       ]]]
     browser_mod:
@@ -75,8 +74,7 @@ ulm_actions_name:
           --popup-border-radius: 20px;
           --popup-padding-x: 24px;
           --popup-padding-y: 20px;
-          --popup-max-width: auto
-          --popup-min-width: 800px;
+          --popup-min-width: 1000px;
         card_mod:
           style:
             ha-dialog$: |
@@ -193,8 +191,7 @@ ulm_actions_name:
           --popup-border-radius: 20px;
           --popup-padding-x: 24px;
           --popup-padding-y: 20px;
-          --popup-max-width: auto
-          --popup-min-width: 800px;
+          --popup-min-width: 1000px;
         card_mod:
           style:
             ha-dialog$: |
@@ -311,8 +308,7 @@ ulm_actions_name:
           --popup-border-radius: 20px;
           --popup-padding-x: 24px;
           --popup-padding-y: 20px;
-          --popup-max-width: auto
-          --popup-min-width: 800px;
+          --popup-min-width: 1000px;
         card_mod:
           style:
             ha-dialog$: |

diff --git a/...ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/2-line_cards/card_graph.yaml b/...ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/2-line_cards/card_graph.yaml
@@ -12,6 +12,7 @@ card_graph:
     ulm_card_graph_hours: 24
     ulm_card_graph_type: "fill"
     ulm_card_graph_points: "0.5"
+    ulm_card_graph_group_by: "interval"
   triggers_update: "all"
   custom_fields:
     item1:
@@ -51,6 +52,7 @@ card_graph:
           fill: "[[[ return variables.ulm_card_graph_type=='fill'?true:false; ]]]"
         hours_to_show: "[[[ return variables.ulm_card_graph_hours; ]]]"
         points_per_hour: "[[[ return variables.ulm_card_graph_points; ]]]"
+        group_by: "[[[ return variables.ulm_card_graph_group_by; ]]]"
         style: |
           ha-card {
             box-shadow: none;

diff --git a/...onents/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_cover.yaml b/...onents/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_cover.yaml
@@ -89,6 +89,16 @@ card_cover:
             card:
               type: "custom:button-card"
               entity: "[[[ return entity.entity_id ]]]"
+              variables: >
+                [[[
+                  let vars = variables;
+                  if(variables.ulm_card_cover_enable_popup) {
+                    vars.ulm_custom_popup = {
+                      'template': 'popup_cover'
+                    };
+                  }
+                  return vars;
+                ]]]
               icon: |
                 [[[
                     var icon = "mdi:help-circle";
@@ -101,7 +111,7 @@ card_cover:
                         } else if (variables.ulm_card_cover_gate){
                           var icon = "mdi:gate";
                         } else
-                          var icon = "mdi:window-shutter";
+                          var icon = "mdi:roller-shade-closed";
                       } else
                         if (variables.ulm_card_curtain_display_collapse_expand){
                           var icon = "mdi:curtains";
@@ -110,7 +120,7 @@ card_cover:
                         } else if (variables.ulm_card_cover_gate){
                           var icon = "mdi:gate-open";
                         }else
-                          var icon = "mdi:window-shutter-open";
+                          var icon = "mdi:roller-shade";
                     } else {
                       if (states[entity.entity_id].attributes.current_position == 0){
                         if (variables.ulm_card_curtain_display_collapse_expand){
@@ -120,7 +130,7 @@ card_cover:
                         } else if(variables.ulm_card_cover_gate){
                           var icon = "mdi:gate";
                         } else
-                          var icon = "mdi:window-shutter";
+                          var icon = "mdi:roller-shade-closed";
                       } else
                         if (variables.ulm_card_curtain_display_collapse_expand){
                           var icon = "mdi:curtains";
@@ -130,7 +140,7 @@ card_cover:
                           var icon = "mdi:gate-open";
                         }
                         else
-                          var icon = "mdi:window-shutter-open";
+                          var icon = "mdi:roller-shade";
                     }
                     return icon ;
                 ]]]
@@ -171,6 +181,16 @@ card_cover:
             card:
               type: "custom:button-card"
               entity: "[[[ return entity.entity_id ]]]"
+              variables: >
+                [[[
+                  let vars = variables;
+                  if(variables.ulm_card_cover_enable_popup) {
+                    vars.ulm_custom_popup = {
+                      'template': 'popup_cover'
+                    };
+                  }
+                  return vars;
+                ]]]
               name: "[[[ return variables.ulm_card_cover_name ]]]"
               label: >-
                 [[[
@@ -201,7 +221,27 @@ card_cover:
               type: "custom:button-card"
               template: "widget_icon"
               state:
-                - value: "closed"
+                - operator: "template"
+                  value: >
+                    [[[
+                      return entity.attributes.current_position == "0";
+                    ]]]
+                  styles:
+                    icon:
+                      - color: "rgba(var(--color-theme),0.4)"
+                - operator: "template"
+                  value: >
+                    [[[
+                      return entity.state == "closing";
+                    ]]]
+                  styles:
+                    icon:
+                      - color: "rgba(var(--color-theme),0.4)"
+                - operator: "template"
+                  value: >
+                    [[[
+                      return entity.state == "opening";
+                    ]]]
                   styles:
                     icon:
                       - color: "rgba(var(--color-theme),0.4)"
@@ -229,13 +269,33 @@ card_cover:
                 service: "cover.stop_cover"
                 service_data:
                   entity_id: "[[[ return entity.entity_id ]]]"
-              icon: "mdi:pause"
+              icon: "mdi:stop"
           item3:
             card:
               type: "custom:button-card"
               template: "widget_icon"
               state:
-                - value: "open"
+                - operator: "template"
+                  value: >
+                    [[[
+                      return entity.attributes.current_position == "100";
+                    ]]]
+                  styles:
+                    icon:
+                      - color: "rgba(var(--color-theme),0.4)"
+                - operator: "template"
+                  value: >
+                    [[[
+                      return entity.state == "closing";
+                    ]]]
+                  styles:
+                    icon:
+                      - color: "rgba(var(--color-theme),0.4)"
+                - operator: "template"
+                  value: >
+                    [[[
+                      return entity.state == "opening";
+                    ]]]
                   styles:
                     icon:
                       - color: "rgba(var(--color-theme),0.4)"

diff --git a/...ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_media_player.yaml b/...ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_media_player.yaml
@@ -55,7 +55,6 @@ card_media_player:
       - border-radius: "var(--border-radius)"
       - box-shadow: "var(--box-shadow)"
       - padding: "12px"
-      - background-blend-mode: "multiply"
       - background: |
           [[[
             return variables.ulm_card_media_player_enable_art && states[entity.entity_id].attributes.entity_picture != null