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

Release V1.1.6
UI-Lovelace-Minimalist · Oct 28, 2022 · a05522d · a05522d
2 parents 960404c + b1033fd
commit a05522d
Show file tree

Hide file tree

Showing 51 changed files with 1,311 additions and 87 deletions.
diff --git a/custom_cards/custom_card_imswel_person/README.md b/custom_cards/custom_card_imswel_person/README.md
@@ -98,3 +98,9 @@ This card needs the following to function correctly:
     <td>If true, shows the entity picture from your user instead of the icon. Default is false</td>
   </tr>
 </table>
+
+??? note "Template Code"
+
+    ```yaml title="custom_card_imswel_person.yaml"
+    --8<-- "custom_cards/custom_card_imswel_person/custom_card_imswel_person.yaml"
+    ```
diff --git a/...nts/ui_lovelace_minimalist/lovelace/themefiles/minimalist-desktop/minimalist-desktop.yaml b/...nts/ui_lovelace_minimalist/lovelace/themefiles/minimalist-desktop/minimalist-desktop.yaml
@@ -11,6 +11,9 @@ minimalist-desktop:
   divider-color: "rgba(var(--color-theme),.12)"
   accent-color: "var(--google-yellow)"
   ha-dialog-border-radius: "10px"
+  # fix added border-lines in 2022.11
+  ha-card-border-width: "0px"
+
   card-mod-theme: "minimalist-desktop"
   card-mod-view-yaml: |
     "*:first-child$": |

diff --git a/..._lovelace_minimalist/lovelace/themefiles/minimalist-ios-tapbar/minimalist-ios-tapbar.yaml b/..._lovelace_minimalist/lovelace/themefiles/minimalist-ios-tapbar/minimalist-ios-tapbar.yaml
@@ -13,6 +13,9 @@ minimalist-ios-tapbar:
   divider-color: "rgba(var(--color-theme),.12)"
   accent-color: "var(--google-yellow)"
   ha-dialog-border-radius: "10px"
+  # fix added border-lines in 2022.11
+  ha-card-border-width: "0px"
+
   card-mod-theme: "minimalist-ios-tapbar"
   card-mod-root: |
     app-toolbar {

diff --git a/...ace_minimalist/lovelace/themefiles/minimalist-mobile-tapbar/minimalist-mobile-tapbar.yaml b/...ace_minimalist/lovelace/themefiles/minimalist-mobile-tapbar/minimalist-mobile-tapbar.yaml
@@ -15,6 +15,8 @@ minimalist-mobile-tapbar:
   header-base-height: "70px"
   app-header-selection-bar-color: "transparent"
   ha-dialog-border-radius: "10px"
+  # fix added border-lines in 2022.11
+  ha-card-border-width: "0px"
 
   card-mod-view-yaml: |
     "*:first-child$": |

diff --git a/...nents/ui_lovelace_minimalist/lovelace/themefiles/minimalist-mobile/minimalist-mobile.yaml b/...nents/ui_lovelace_minimalist/lovelace/themefiles/minimalist-mobile/minimalist-mobile.yaml
@@ -11,6 +11,9 @@ minimalist-mobile:
   divider-color: "rgba(var(--color-theme),.12)"
   accent-color: "var(--google-yellow)"
   ha-dialog-border-radius: "10px"
+  # fix added border-lines in 2022.11
+  ha-card-border-width: "0px"
+
   card-mod-theme: "minimalist-mobile"
   card-mod-root: |
     app-toolbar {

diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/cn.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/cn.yaml
@@ -11,3 +11,4 @@ ulm_language_variables:
     ulm_volume: "体积"
     ulm_popups_color: "顏色"
     ulm_radar: "雷达"
+    ulm_popup_total: "Total"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/cs.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/cs.yaml
@@ -11,3 +11,4 @@ ulm_language_variables:
     ulm_volume: "Hlasitost"
     ulm_popups_color: "Barva"
     ulm_radar: "Radar"
+    ulm_popup_total: "Total"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/da.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/da.yaml
@@ -14,3 +14,4 @@ ulm_language_variables:
     ulm_volume: "Volumen"
     ulm_popups_color: "Farve"
     ulm_radar: "Radar"
+    ulm_popup_total: "Total"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/de.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/de.yaml
@@ -11,3 +11,4 @@ ulm_language_variables:
     ulm_volume: "Lautstärke"
     ulm_popups_color: "Farbe"
     ulm_radar: "Radar"
+    ulm_popup_total: "Gesamt"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/default.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/default.yaml
@@ -11,6 +11,7 @@ ulm_translation_engine:
     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_more_options: "[[[ return hass.resources[hass['language']]['ui.panel.lovelace.editor.edit_card.options']; ]]]"
     ulm_translation_hour: >
       [[[
         var number = hass.resources[hass['language']]["ui.duration.hour"];

diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/en.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/en.yaml
@@ -14,3 +14,4 @@ ulm_language_variables:
     ulm_volume: "Volume"
     ulm_popups_color: "Color"
     ulm_radar: "Radar"
+    ulm_popup_total: "Total"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/es.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/es.yaml
@@ -14,3 +14,4 @@ ulm_language_variables:
     ulm_volume: "Volumen"
     ulm_popups_color: "Color"
     ulm_radar: "Radar"
+    ulm_popup_total: "Total"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/fi.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/fi.yaml
@@ -11,3 +11,4 @@ ulm_language_variables:
     ulm_volume: "Äänenvoimakkuus"
     ulm_popups_color: "Väri"
     ulm_radar: "Tutka"
+    ulm_popup_total: "Yhteensä"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/fr.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/fr.yaml
@@ -11,3 +11,4 @@ ulm_language_variables:
     ulm_volume: "Volume"
     ulm_popups_color: "Couleur"
     ulm_radar: "Radar"
+    ulm_popup_total: "Total"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/it.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/it.yaml
@@ -11,3 +11,4 @@ ulm_language_variables:
     ulm_volume: "Volume"
     ulm_popups_color: "Colore"
     ulm_radar: "Radar"
+    ulm_popup_total: "Totale"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/nl.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/nl.yaml
@@ -14,3 +14,4 @@ ulm_language_variables:
     ulm_volume: "Volume"
     ulm_popups_color: "Kleur"
     ulm_radar: "Radar"
+    ulm_popup_total: "Totaal"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/no.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/no.yaml
@@ -11,3 +11,4 @@ ulm_language_variables:
     ulm_volume: "Volume"
     ulm_popups_color: "Farge"
     ulm_radar: "Radar"
+    ulm_popup_total: "Totalt"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/pl.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/pl.yaml
@@ -11,3 +11,4 @@ ulm_language_variables:
     ulm_volume: "Objętość"
     ulm_popups_color: "Kolor"
     ulm_radar: "Radar"
+    ulm_popup_total: "Total"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/pt-BR.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/pt-BR.yaml
@@ -11,3 +11,4 @@ ulm_language_variables:
     ulm_volume: "Volume"
     ulm_popups_color: "Cor"
     ulm_radar: "Radar"
+    ulm_popup_total: "Total"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/pt.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/pt.yaml
@@ -11,3 +11,4 @@ ulm_language_variables:
     ulm_volume: "Volume"
     ulm_popups_color: "Cor"
     ulm_radar: "Radar"
+    ulm_popup_total: "Total"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/ru.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/ru.yaml
@@ -11,3 +11,4 @@ ulm_language_variables:
     ulm_volume: "Объем"
     ulm_popups_color: "Цвет"
     ulm_radar: "Pадар"
+    ulm_popup_total: "Total"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/sk.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/sk.yaml
@@ -11,3 +11,4 @@ ulm_language_variables:
     ulm_volume: "Volume"
     ulm_popups_color: "Farba"
     ulm_radar: "Radar"
+    ulm_popup_total: "Total"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/sv.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/sv.yaml
@@ -11,3 +11,4 @@ ulm_language_variables:
     ulm_volume: "Volym"
     ulm_popups_color: "Färg"
     ulm_radar: "Radar"
+    ulm_popup_total: "Total"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/tr.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/tr.yaml
@@ -11,3 +11,4 @@ ulm_language_variables:
     ulm_volume: "Cilt"
     ulm_popups_color: "Renk"
     ulm_radar: "Radar"
+    ulm_popup_total: "Total"
diff --git a/...onents/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_light.yaml b/...onents/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_light.yaml
@@ -17,6 +17,7 @@ card_light:
     ulm_card_light_force_background_color: false
     ulm_card_light_enable_popup: false
     ulm_card_light_enable_popup_tap: false
+    ulm_card_light_color_palette: ""
   show_icon: false
   show_name: false
   show_label: false
@@ -108,7 +109,8 @@ card_light:
                   let vars = variables;
                   if(variables.ulm_card_light_enable_popup) {
                     vars.ulm_custom_popup = {
-                      'template': 'popup_light_brightness'
+                      'template': 'popup_light_brightness',
+                      'popup_variables': {'ulm_card_light_color_palette': variables.ulm_card_light_color_palette }
                     };
                   }
                   return vars;
@@ -151,7 +153,8 @@ card_light:
                   let vars = variables;
                   if(variables.ulm_card_light_enable_popup) {
                     vars.ulm_custom_popup = {
-                      'template': 'popup_light_brightness'
+                      'template': 'popup_light_brightness',
+                      'popup_variables': {'ulm_card_light_color_palette': variables.ulm_card_light_color_palette }
                     };
                   }
                   return vars;

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
@@ -14,6 +14,7 @@ card_media_player:
     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
+    ulm_card_media_player_power_button: false
   triggers_update: "all"
   show_icon: false
   show_name: false
@@ -62,6 +63,11 @@ card_media_player:
             : ''
           ]]]
     custom_fields:
+      power:
+        - display: "[[[ return variables.ulm_card_media_player_power_button ? 'block' : 'none']]]"
+        - position: "absolute"
+        - top: "12px"
+        - right: "12px"
       item2:
         - display: |
             [[[
@@ -85,6 +91,32 @@ card_media_player:
               return "none";
             ]]]
   custom_fields:
+    power:
+      card:
+        type: "custom:button-card"
+        entity: "[[[ return entity.entity_id ]]]"
+        template: "widget_icon"
+        icon: "mdi:power"
+        tap_action:
+          action: "toggle"
+        styles:
+          img_cell:
+            - width: "42px"
+            - heigth: "42px"
+          card:
+            - background-color: |
+                [[[
+                  return variables.ulm_card_media_player_enable_art && states[entity.entity_id].attributes.entity_picture != null
+                  ? 'rgba(0, 0, 0, 0.2)'
+                  : 'rgba(var(--color-theme),0.05)'
+                ]]]
+          icon:
+            - color: |
+                [[[
+                  return variables.ulm_card_media_player_enable_art && states[entity.entity_id].attributes.entity_picture != null
+                  ? 'white'
+                  : 'rgba(var(--color-theme), 0.9)'
+                ]]]
     item1:
       card:
         type: "custom:button-card"
@@ -225,7 +257,7 @@ card_media_player:
     item2:
       card:
         type: "custom:button-card"
-        template: "list_3_items"
+        template: "list_4_items"
         styles:
           card:
             - padding: "0px"
@@ -293,17 +325,19 @@ card_media_player:
                       entity: "[[[ return entity.entity_id; ]]]"
               tap_action:
                 action: "call-service"
-                service: "media_player.media_play_pause"
+                service: "[[[ return (entity.attributes?.media_duration > 0) ? 'media_player.media_play_pause' : entity.state =='playing' ? 'media_player.media_stop' : 'media_player.media_play']]]"
                 service_data:
                   entity_id: "[[[ return variables.ulm_card_media_player_player_controls_entity ]]]"
-              icon: "mdi:pause"
+              icon: "[[[ return (entity.attributes?.media_duration > 0) ? 'mdi:pause' : 'mdi:stop' ]]]"
               state:
                 - value: "paused"
                   icon: "mdi:play"
                 - value: "off"
                   icon: "mdi:play"
                 - value: "standby"
                   icon: "mdi:play"
+                - value: "idle"
+                  icon: "mdi:play"
               styles:
                 card:
                   - background-color: |
@@ -358,6 +392,73 @@ card_media_player:
                         ? 'white'
                         : 'rgba(var(--color-theme), 0.9)'
                       ]]]
+          item4:
+            card:
+              type: "custom:button-card"
+              template: "widget_icon"
+              icon: "mdi:playlist-music"
+              entity: "[[[ return entity.entity_id; ]]]"
+              styles:
+                card:
+                  - background-color: |
+                      [[[
+                        return variables.ulm_card_media_player_enable_art && states[entity.entity_id].attributes.entity_picture != null
+                        ? 'rgba(0, 0, 0, 0.2)'
+                        : 'rgba(var(--color-theme),0.05)'
+                      ]]]
+                icon:
+                  - color: |
+                      [[[
+                        return variables.ulm_card_media_player_enable_art && states[entity.entity_id].attributes.entity_picture != null
+                        ? 'white'
+                        : 'rgba(var(--color-theme), 0.9)'
+                      ]]]
+              hold_action:
+                action: >
+                  [[[
+                      return variables.ulm_card_media_player_enable_popup && entity.attributes?.source_list ? "fire-dom-event" : "more-info";
+                  ]]]
+                browser_mod:
+                  service: "browser_mod.popup"
+                  data:
+                    large: true
+                    hide_header: true
+                    content:
+                      type: "custom:button-card"
+                      template: "popup_media_player_source_card"
+                      entity: "[[[ return entity.entity_id; ]]]"
+              tap_action:
+                action: >
+                  [[[
+                      return variables.ulm_card_media_player_enable_popup && entity.attributes?.source_list ? "fire-dom-event" : "more-info";
+                  ]]]
+                browser_mod:
+                  service: "browser_mod.popup"
+                  data:
+                    large: true
+                    hide_header: true
+                    style: |
+                      --popup-background-color: var(--primary-background-color);
+                      --popup-border-radius: 20px;
+                      --popup-padding-x: 24px;
+                      --popup-padding-y: 20px;
+                      --popup-max-width: auto
+                      --popup-min-width: 800px;
+                    card_mod:
+                      style:
+                        ha-dialog$: |
+                          @media (max-width: 800px){
+                            div.mdc-dialog__container {
+                              --mdc-dialog-min-width: 100vw;
+                              --mdc-dialog-max-width: 100vw;
+                              --mdc-dialog-min-height: 100%;
+                              --ha-dialog-border-radius: 0px;
+                            }
+                          }
+                    content:
+                      type: "custom:button-card"
+                      template: "popup_media_player_source_card"
+                      entity: "[[[ return entity.entity_id; ]]]"
     item3:
       card:
         type: "custom:my-slider"

diff --git a/...nents/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_person.yaml b/...nents/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_person.yaml
@@ -74,7 +74,7 @@ card_person:
         } else {
             for (let st in states) {
                 if (st.startsWith("zone.")) {
-                    if (states[st]?.attributes?.persons.includes(variables.ulm_card_person_entity)) {
+                    if (states[st]?.attributes?.persons?.includes(variables.ulm_card_person_entity) && !states[st]?.attributes?.passive) {
                         var icon = states[st].attributes.icon !== null ? states[st].attributes.icon : 'mdi:help-circle';
                         return '<ha-icon icon="' + icon + '" style="width: 10px; height: 10px; color: var(--primary-background-color);"></ha-icon>';
                     }

diff --git a/...ponents/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_room.yaml b/...ponents/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_room.yaml
@@ -21,7 +21,7 @@ card_room:
   label: |-
     [[[
       if (variables.label_use_temperature) {
-        return (entity?.attributes?.current_temperature || entity?.attributes?.temperature || entity?.state || '-') + (entity?.attributes?.unit_of_measurement || '°C');
+        return (entity?.attributes?.current_temperature || entity?.attributes?.temperature || entity?.attributes?.device_temperature || entity?.state || '-') + (entity?.attributes?.unit_of_measurement || '°C');
       } else if (variables.label_use_brightness && entity?.state == "on" && entity?.attributes?.brightness != null) {
         let bri = Math.round(entity?.attributes?.brightness / 2.55);
         return (bri ? bri : "0") + "%";