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

Release V1.1.1

custom_components/ui_lovelace_minimalist/const.py

@@ -31,6 +31,7 @@
     "Polish": "pl",
     "Portuguese": "pt",
     "Portuguese (Brazil)": "pt-BR",
+    "Slovenian": "sl",
     "Slovak": "sk",
     "Swedish": "sv",
     "Turkish": "tr",
@@ -51,6 +52,7 @@
     "Polish",
     "Portuguese",
     "Portuguese (Brazil)",
+    "Slovenian",
     "Slovak",
     "Swedish",
     "Turkish",

custom_components/ui_lovelace_minimalist/lovelace/adaptive-dash/popup/popup.yaml

@@ -17,125 +17,125 @@ states:
   # light 1:
   #   type: "custom:button-card"
   #   template: "popup_light_brightness"
-  #   entity:
+  #   entity: <your_entity>
   # light 2:
   #   type: "custom:button-card"
   #   template: "popup_light_brightness"
-  #   entity:
+  #   entity: <your_entity>
   # light 3:
   #   type: "custom:button-card"
   #   template: "popup_light_brightness"
-  #   entity:
+  #   entity: <your_entity>
   # light 4:
   #   type: "custom:button-card"
   #   template: "popup_light_brightness"
-  #   entity:
+  #   entity: <your_entity>
   # light 5:
   #   type: "custom:button-card"
   #   template: "popup_light_brightness"
-  #   entity:
+  #   entity: <your_entity>
   # light 6:
   #   type: "custom:button-card"
   #   template: "popup_light_brightness"
-  #   entity:
+  #   entity: <your_entity>
   # light 7:
   #   type: "custom:button-card"
   #   template: "popup_light_brightness"
-  #   entity:
+  #   entity: <your_entity>
   # light 8:
   #   type: "custom:button-card"
   #   template: "popup_light_brightness"
-  #   entity:
+  #   entity: <your_entity>
   # light 9:
   #   type: "custom:button-card"
   #   template: "popup_light_brightness"
-  #   entity:
+  #   entity: <your_entity>
   # light 10:
   #   type: "custom:button-card"
   #   template: "popup_light_brightness"
-  #   entity:
+  #   entity: <your_entity>
   #
   ###  Mediaplayers
   # mediaplayer 1:
   #   type: "custom:button-card"
   #   template: "popup_media_player_infos"
-  #   entity:
+  #   entity: <your_entity>
   # mediaplayer 2:
   #   type: "custom:button-card"
   #   template: "popup_media_player_infos"
-  #   entity:
+  #   entity: <your_entity>
   # mediaplayer 3:
   #   type: "custom:button-card"
   #   template: "popup_media_player_infos"
-  #   entity:
+  #   entity: <your_entity>
   # mediaplayer 4:
   #   type: "custom:button-card"
   #   template: "popup_media_player_infos"
-  #   entity:
+  #   entity: <your_entity>
   # mediaplayer 5:
   #   type: "custom:button-card"
   #   template: "popup_media_player_infos"
-  #   entity:
+  #   entity: <your_entity>
   #
   ### Thermostats
   # climate 1:
   #   type: "custom:button-card"
   #   template: "popup_thermostat_temperature"
-  #   entity:
+  #   entity: <your_entity>
   # climate 2:
   #   type: "custom:button-card"
   #   template: "popup_thermostat_temperature"
-  #   entity:
+  #   entity: <your_entity>
   # climate 3:
   #   type: "custom:button-card"
   #   template: "popup_thermostat_temperature"
-  #   entity:
+  #   entity: <your_entity>
   # climate 4:
   #   type: "custom:button-card"
   #   template: "popup_thermostat_temperature"
-  #   entity:
+  #   entity: <your_entity>
   # climate 5:
   #   type: "custom:button-card"
   #   template: "popup_thermostat_temperature"
-  #   entity:
+  #   entity: <your_entity>
   #
   ### Power
   # power 1:
   #   type: "custom:button-card"
   #   template: "popup_power_outlet_stats"
-  #   entity:
+  #   entity: <your_entity>
   #   variables:
   #     ulm_popup_power_outlet_sensor1:
   #     ulm_popup_power_outlet_sensor2:
   #     ulm_popup_power_outlet_graph_sensor:
   # power 2:
   #   type: "custom:button-card"
   #   template: "popup_power_outlet_stats"
-  #   entity:
+  #   entity: <your_entity>
   #   variables:
   #     ulm_popup_power_outlet_sensor1:
   #     ulm_popup_power_outlet_sensor2:
   #     ulm_popup_power_outlet_graph_sensor:
   # power 3:
   #   type: "custom:button-card"
   #   template: "popup_power_outlet_stats"
-  #   entity:
+  #   entity: <your_entity>
   #   variables:
   #     ulm_popup_power_outlet_sensor1:
   #     ulm_popup_power_outlet_sensor2:
   #     ulm_popup_power_outlet_graph_sensor:
   # power 4:
   #   type: "custom:button-card"
   #   template: "popup_power_outlet_stats"
-  #   entity:
+  #   entity: <your_entity>
   #   variables:
   #     ulm_popup_power_outlet_sensor1:
   #     ulm_popup_power_outlet_sensor2:
   #     ulm_popup_power_outlet_graph_sensor:
   # power 5:
   #   type: "custom:button-card"
   #   template: "popup_power_outlet_stats"
-  #   entity:
+  #   entity: <your_entity>
   #   variables:
   #     ulm_popup_power_outlet_sensor1:
   #     ulm_popup_power_outlet_sensor2:

custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/actions/actions_card.yaml

@@ -34,10 +34,29 @@ ulm_actions_card:
       ]]]
     navigation_path: "[[[ return variables.ulm_card_tap_action == 'navigate' ? variables.ulm_card_tap_navigate_path : '/0' ]]]"
     haptic: "[[[ return variables.ulm_card_tap_haptic != null ? variables.ulm_card_tap_haptic : 'none' ]]]"
-    service: "input_select.select_option"
-    service_data:
-      option: "[[[ return variables.ulm_input_select_option ]]]"
-      entity_id: "[[[ return variables.ulm_input_select ]]]"
+    service: >
+        [[[
+          var action = variables.ulm_card_tap_action;
+
+          if (action == 'adaptive'){
+            return 'input_select.select_option';
+          }
+
+          return variables.ulm_card_tap_service;
+        ]]]
+    service_data: >
+        [[[
+          var action = variables.ulm_card_tap_action;
+
+          if (action == 'adaptive'){
+            return {
+              'option': variables.ulm_input_select_option,
+              'entity_id': variables.ulm_input_select
+            };
+          }
+
+          return variables.ulm_card_tap_service_data;
+        ]]]
     browser_mod:
       command: "popup"
       large: true
@@ -85,6 +104,7 @@ ulm_actions_card:
                 return popup_config.popup_variables;
               }
             }
+            return {};
           ]]]
   hold_action:
     action: >
@@ -115,14 +135,33 @@ ulm_actions_card:
           action = 'more-info'
         }
 
-        return action
+        return action;
       ]]]
     navigation_path: "[[[ return variables.ulm_card_hold_action == 'navigate' ? variables.ulm_card_hold_navigate_path : '/0' ]]]"
     haptic: "[[[ return variables.ulm_card_hold_haptic != null ? variables.ulm_card_hold_haptic : 'none' ]]]"
-    service: "input_select.select_option"
-    service_data:
-      option: "[[[ return variables.ulm_input_select_option ]]]"
-      entity_id: "[[[ return variables.ulm_input_select ]]]"
+    service: >
+        [[[
+          var action = variables.ulm_card_hold_action;
+
+          if (action == 'adaptive'){
+            return 'input_select.select_option';
+          }
+
+          return variables.ulm_card_hold_service;
+        ]]]
+    service_data: >
+        [[[
+          var action = variables.ulm_card_hold_action;
+
+          if (action == 'adaptive'){
+            return {
+              'option': variables.ulm_input_select_option,
+              'entity_id': variables.ulm_input_select
+            };
+          }
+
+          return variables.ulm_card_hold_service_data;
+        ]]]
     browser_mod:
       command: "popup"
       large: true
@@ -170,6 +209,7 @@ ulm_actions_card:
                 return popup_config.popup_variables;
               }
             }
+            return {};
           ]]]
   double_tap_action:
     action: >
@@ -200,14 +240,33 @@ ulm_actions_card:
           action = 'more-info'
         }
 
-        return action
+        return action;
       ]]]
     navigation_path: "[[[ return variables.ulm_card_double_tap_action == 'navigate' ? variables.ulm_card_double_tap_navigate_path : '/0' ]]]"
     haptic: "[[[ return variables.ulm_card_double_tap_haptic != null ? variables.ulm_card_double_tap_haptic : 'none' ]]]"
-    service: "input_select.select_option"
-    service_data:
-      option: "[[[ return variables.ulm_input_select_option ]]]"
-      entity_id: "[[[ return variables.ulm_input_select ]]]"
+    service: >
+        [[[
+          var action = variables.ulm_card_double_tap_action;
+
+          if (action == 'adaptive'){
+            return 'input_select.select_option';
+          }
+
+          return variables.ulm_card_double_tap_service;
+        ]]]
+    service_data: >
+        [[[
+          var action = variables.ulm_card_double_tap_action;
+
+          if (action == 'adaptive'){
+            return {
+              'option': variables.ulm_input_select_option,
+              'entity_id': variables.ulm_input_select
+            };
+          }
+
+          return variables.ulm_card_double_tap_service_data;
+        ]]]
     browser_mod:
       command: "popup"
       large: true
@@ -255,4 +314,5 @@ ulm_actions_card:
                 return popup_config.popup_variables;
               }
             }
+            return {};
           ]]]

custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/actions/actions_card_overlay.yaml

@@ -0,0 +1,46 @@
+---
+### Overlay to enable custom actions card over other cards ###
+ulm_actions_card_overlay:
+  template:
+    - "ulm_custom_actions"
+    - "ulm_actions_card"
+  styles:
+    grid:
+      - position: "relative"
+      - z-index: 0
+    custom_fields:
+      actions_card_overlay:
+        - position: "absolute"
+        - left: "0px"
+        - top: "0px"
+        - height: "100%"
+        - width: "100%"
+        - display: "grid"
+        - z-index: 10
+  custom_fields:
+    actions_card_overlay:
+      card:
+        type: "custom:button-card"
+        template:
+          - "ulm_actions_card"
+        entity: "[[[ return (entity != null) ? entity.entity_id : null; ]]]"
+        show_icon: false
+        show_name: false
+        show_label: false
+        styles:
+          card:
+            - height: "100%"
+            - background: "none"
+        variables:
+          ulm_input_select_option: "[[[ return variables.ulm_input_select_option; ]]]"
+          ulm_input_select: "[[[ return variables.ulm_input_select; ]]]"
+          ulm_card_tap_action: "[[[ return variables.ulm_card_tap_action; ]]]"
+          ulm_card_tap_haptic: "[[[ return variables.ulm_card_tap_haptic; ]]]"
+          ulm_card_tap_navigate_path: "[[[ return variables.ulm_card_tap_navigate_path; ]]]"
+          ulm_card_hold_action: "[[[ return variables.ulm_card_hold_action; ]]]"
+          ulm_card_hold_haptic: "[[[ return variables.ulm_card_hold_haptic; ]]]"
+          ulm_card_hold_navigate_path: "[[[ return variables.ulm_card_hold_navigate_path; ]]]"
+          ulm_card_double_tap_action: "[[[ return variables.ulm_card_double_tap_action; ]]]"
+          ulm_card_double_tap_haptic: "[[[ return variables.ulm_card_double_tap_haptic; ]]]"
+          ulm_card_double_tap_navigate_path: "[[[ return variables.ulm_card_double_tap_navigate_path; ]]]"
+          ulm_custom_popup: "[[[ return variables.ulm_custom_popup; ]]]"