Merge branch 'wilbie-fix-cards' of https://github.com/UI-Lovelace-Min…

…imalist/UI into wilbie-fix-cards

custom_cards/custom_card_iAbadia_battery_chip/README.md

@@ -0,0 +1,58 @@
+---
+title: iAbadia's Battery Chip Custom Card
+hide:
+  - toc
+---
+
+<!-- markdownlint-disable MD046 -->
+
+# Custom-card "Battery Chip"
+
+This is a `custom-card` or `custom-chip` to see your device's battery level at a glance.
+
+![Screenshot](../../docs/assets/img/custom_card_iAbadia_battery_chip.png)
+
+## Credits
+
+Author: Iñaki Abadia - 2024
+Version: 1.0.0
+
+## Changelog
+
+<details>
+<summary>1.0.0</summary>
+Initial release
+</details>
+
+## Requirements
+
+None
+
+## Usage
+
+```yaml
+type: "custom:button-card"
+template: custom_card_iAbadia_battery_chip
+variables:
+  ulm_custom_card_iAbadia_battery_chip_entity: sensor.living_room_sensor_battery
+  ulm_custom_card_iAbadia_battery_chip_icon: mdi:thermostat
+  ulm_custom_card_iAbadia_battery_chip_warning: 30
+  ulm_custom_card_iAbadia_battery_chip_danger: 10
+```
+
+## Variables
+
+| Variable                                       | Example              | Required | Explanation                                           |
+| ---------------------------------------------- | -------------------- | -------- | ----------------------------------------------------- |
+|  ulm_custom_card_iAbadia_battery_chip_entity   | `sensor.temperature` | ✓        | Battery entity                                        |
+|  ulm_custom_card_iAbadia_battery_chip_icon     | `mdi:thermometer`    | ✘        | Icon to be displayed. Will default to mdi:battery     |
+|  ulm_custom_card_iAbadia_battery_chip_warning  | `20`                 | ✘        | Battery level below which to color as warning (yellow) |
+|  ulm_custom_card_iAbadia_battery_chip_danger   | `10`                 | ✘        | Battery level below which to color as danger (red)     |
+
+## Template Code
+
+??? note "Template Code"
+
+    ```yaml title="custom_card_irmajavi_speedtest.yaml"
+    --8<-- "custom_cards/custom_card_iAbadia_battery_chip/custom_card_iAbadia_battery_chip.yaml"
+    ```

custom_cards/custom_card_iAbadia_battery_chip/custom_card_iAbadia_battery_chip.yaml

@@ -0,0 +1,38 @@
+---
+custom_card_iAbadia_battery_chip:
+  template:
+    - "chips"
+  variables:
+    ulm_custom_card_iAbadia_battery_chip_entity: ""
+    ulm_custom_card_iAbadia_battery_chip_icon: ""
+    ulm_custom_card_iAbadia_battery_chip_danger: "10"
+    ulm_custom_card_iAbadia_battery_chip_warning: "20"
+  show_icon: true
+  triggers_update: "all"
+  icon: >
+    [[[
+      if (variables.ulm_custom_card_iAbadia_battery_chip_icon){
+        return variables.ulm_custom_card_iAbadia_battery_chip_icon;
+      } else {
+        return "mdi:battery"
+      }
+    ]]]
+  entity: "[[[ return variables.ulm_custom_card_iAbadia_battery_chip_entity; ]]]"
+  tap_action:
+    action: "more-info"
+    entity: "[[[ return variables.ulm_custom_card_iAbadia_battery_chip_entity; ]]]"
+  styles:
+    icon:
+      - color: >
+          [[[
+            let battery_level = Math.round((states[variables.ulm_custom_card_iAbadia_battery_chip_entity].state)/1);
+            if (battery_level > variables.ulm_custom_card_iAbadia_battery_chip_warning) {
+              return "var(--google-green)"
+            } else if (battery_level <= variables.ulm_custom_card_iAbadia_battery_chip_warning && battery_level > variables.ulm_custom_card_iAbadia_battery_chip_danger) {
+              return "var(--google-yellow)"
+            } else {
+              return "var(--google-red)"
+            }
+          ]]]
+    grid:
+      - grid-template-areas: "'i'"

custom_cards/custom_card_person_info_small/README.md

@@ -0,0 +1,57 @@
+---
+title: Person Info Card
+---
+
+<!-- markdownlint-disable MD046 -->
+
+## Description
+
+![Person Info](../../docs/assets/img/custom_card_person_info_small_dark.png)
+![Person Info](../../docs/assets/img/custom_card_person_info_small_light.png)
+
+The `custom_card_person_info_small` is based on `card_person_info`.
+
+## Credits
+
+- Author: Imaginelenses <@imaginelenses>
+- Based on [person info card](https://ui-lovelace-minimalist.github.io/UI/usage/custom_cards/custom_card_person_info/#variables) by Jordan Janzen <@jordandrako>
+- Version: 1.0.0
+
+## Variables
+
+| Variable                                     | Default              | Required         | Notes                                                                                                                                           |
+| -------------------------------------------- | -------------------- | ---------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- |
+| ulm_card_person_entity                       |                      | :material-check: | The person entity                                                                                                                               |
+| ulm_card_person_use_entity_picture           | true                 | :material-close: | If you set this to true, the card shows the entity picture from your user, otherwise (set to false) shows the icon. Default is false.           |
+| ulm_card_person_zone1                        |                      | :material-close: | Set another zone (beside "home") to use for the card. You can set up two zones besides "home".                                                  |
+| ulm_card_person_zone2                        |                      | :material-close: | Set another zone (beside "home") to use for the card. You can set up two zones besides "home".                                                  |
+| ulm_address                                  |                      | :material-close: | Show an address as label, add an entity with a geo location                                                                                     |
+| ulm_card_person_driving_entity               |                      | :material-close: | Set a binary sensor that depicts when this person is driving                                                                                    |
+| ulm_card_person_battery_entity               |                      | :material-close: | Set a battery level sensor                                                                                                                      |
+| ulm_card_person_battery_state_entity         |                      | :material-close: | Set a battery state sensor (eg the battery state sensor from the home assistant companion app will have the states "charging" or "discharging") |
+| ulm_card_battery_battery_level_danger        | 15                | :material-close: | Changes the color of the Icon, if the battery level falls below the provided value. Must be higher than ulm_card_battery_battery_level_waring
+| ulm_card_battery_battery_level_waring        | 30                   | :material-close: | Changes the color of the Icon, if the battery level falls below the provided value.
+| ulm_card_battery_color_battery_level_danger  | var(--google-red)  | :material-close: | Color of icon if battery level is within the 'danger' zone.
+| ulm_card_battery_color_battery_level_warning | var(--google-yellow) | :material-close: | Color of icon if battery level is within the 'warning' zone.
+| ulm_card_battery_color_battery_level_ok      | var(--google-green)  | :material-close: | Color of icon if battery level is not within the 'danger' or 'warning' zone.
+
+## Usage
+
+```yaml
+- type: "custom:button-card"
+  template: card_person_info_small
+  variables:
+    ulm_card_person_entity: person.imaginelenses
+    ulm_card_person_zone1: zone.work
+    ulm_card_person_driving_entity: binary_sensor.driving
+    ulm_card_person_battery_entity: sensor.phone_battery_level
+    ulm_card_person_battery_state_entity: sensor.phone_battery_state
+```
+
+## Template Code
+
+??? note "Template Code"
+
+    ```yaml title="custom_card_person_info_small.yaml"
+    --8<-- "custom_cards/custom_card_person_info_small/custom_card_person_info_small.yaml"
+    ```

custom_cards/custom_card_person_info_small/custom_card_person_info_small.yaml

@@ -0,0 +1,148 @@
+---
+card_person_info_small:
+  template:
+    - "icon_info_bg"
+    - "ulm_translation_engine"
+  variables:
+    ulm_card_person_use_entity_picture: true
+    ulm_card_person_zone1: ""
+    ulm_card_person_zone2: ""
+    ulm_card_person_icon: "mdi:face-man"
+    ulm_address: ""
+    ulm_address_locality: ""
+    ulm_card_person_driving_entity: ""
+    ulm_card_person_battery_entity: ""
+    ulm_card_person_battery_state_entity: ""
+    ulm_card_battery_battery_level_danger: 15
+    ulm_card_battery_battery_level_warning: 30
+    ulm_card_battery_color_battery_level_danger: "var(--google-red)"
+    ulm_card_battery_color_battery_level_warning: "var(--google-yellow)"
+    ulm_card_battery_color_battery_level_ok: "var(--google-green)"
+  triggers_update: "all"
+  tap_action:
+    action: "more-info"
+    entity: "[[[ return variables.ulm_card_person_entity; ]]]"
+  hold_action:
+    action: "more-info"
+    entity: "[[[ return variables.ulm_card_person_battery_entity; ]]]"
+  show_label: true
+  show_name: true
+  label: >
+    [[[
+      if (variables.ulm_address){
+        return states[variables.ulm_address].state;
+      } else if (variables.ulm_address_locality){
+        return states[variables.ulm_address_locality].attributes.Locality;
+      }
+      else if (states[variables.ulm_card_person_driving_entity]?.state === "on") {
+        let state = states[variables.ulm_card_person_entity].state;
+        return `Driving - ${variables.ulm_translation_state}`;
+      } else {
+        let state = states[variables.ulm_card_person_entity].state;
+        return hass.resources[hass["language"]]["component.person.entity_component._.state." + state] ? hass.resources[hass["language"]]["component.person.entity_component._.state." + state] : state;
+      }
+    ]]]
+  name: "[[[ return states[variables.ulm_card_person_entity].attributes.friendly_name ]]]"
+  entity: "[[[ return variables.ulm_card_person_entity; ]]]"
+  icon: "[[[ return variables.ulm_card_person_icon; ]]]"
+  show_entity_picture: "[[[ return variables.ulm_card_person_use_entity_picture ]]]"
+  entity_picture:
+    "[[[ return variables.ulm_card_person_use_entity_picture != false ? states[variables.ulm_card_person_entity].attributes.entity_picture\
+    \ : null ]]]"
+  styles:
+    grid:
+      - grid-template-areas: "'i battery' 'n n' 'l l'"
+    icon:
+      - color: "rgba(var(--color-theme),0.9)"
+      - width: "42px"
+      - place-self: "start"
+    name:
+      - place-self: "center"
+      - margin-left: 0
+      - margin-top: "6%"
+    label:
+      - place-self: "center"
+      - margin-left: 0
+      - text-transform: "capitalize"
+    custom_fields:
+      notification:
+        - position: "absolute"
+        - top: "7%"
+        - left: "38px"
+        - height: "16px"
+        - width: "16px"
+        - border: "2px solid var(--card-background-color)"
+        - border-radius: "50%"
+        - font-size: "12px"
+        - line-height: "14px"
+        - background-color: >
+            [[[
+              if (states[variables.ulm_card_person_entity].state == 'home') {
+                return "rgba(var(--color-blue),1)";
+              } else {
+                return "rgba(var(--color-yellow),1)";
+              }
+            ]]]
+      battery:
+        - width: "30px"
+        - height: "30px"
+        - place-self: "end"
+        - align-self: "center"
+        - background-color: "rgba(var(--primary-background-color), 0.5)"
+        - border: "2px solid var(--card-background-color)"
+        - border-radius: "50%"
+
+  custom_fields:
+    notification: >
+      [[[
+        let height = "11px";
+        let width = "11px";
+        if (states[variables.ulm_card_person_entity].state !== 'home') {
+          if (states[variables.ulm_card_person_entity].state === states[variables.ulm_card_person_zone1]?.attributes?.friendly_name) {
+            var icon = states[variables.ulm_card_person_zone1].attributes.icon !== null ? states[variables.ulm_card_person_zone1].attributes.icon : 'mdi:help-circle'
+            return `<ha-icon icon="' + icon + '" style="height: ${height}; width: ${width}; color: var(--primary-background-color);"></ha-icon>`;
+          } else if (states[variables.ulm_card_person_entity].state === states[variables.ulm_card_person_zone2]?.attributes?.friendly_name) {
+            var icon = states[variables.ulm_card_person_zone2].attributes.icon !== null ? states[variables.ulm_card_person_zone2].attributes.icon : 'mdi:help-circle'
+            return `<ha-icon icon="' + icon + '" style="height: ${height}; width: ${width}; color: var(--primary-background-color);"></ha-icon>`;
+          } else {
+            return `<ha-icon icon="mdi:home-minus" style="height: ${height}; width: ${width}; color: var(--primary-background-color);"></ha-icon>`;
+          }
+        } else {
+          return `<ha-icon icon="mdi:home-variant" style="height: ${height}; width: ${width}; color: var(--primary-background-color);"></ha-icon>`;
+        }
+      ]]]
+    battery: >
+      [[[
+        if (states[variables.ulm_card_person_battery_entity]?.state) {
+          let battery_level = states[variables.ulm_card_person_battery_entity]?.state;
+          battery_level = Number(battery_level);
+          let charging = states[variables.ulm_card_person_battery_state_entity]?.state.toLowerCase() === "charging";
+
+          var infix = charging ? "-charging" : ""
+          let icon = "mdi:help-circle-outline";
+          if (battery_level == 100) {
+            icon = "mdi:battery";
+          } else if (battery_level < 10) {
+            icon = "mdi:battery" + infix + "-outline";
+          } else if (battery_level == "unknown" || battery_level == "unavailable") {
+            icon = "mdi:battery-off";
+          } else {
+            icon = "mdi:battery" + infix + "-" + Math.floor(battery_level / 10) * 10;
+          }
+
+          let color = variables.ulm_card_battery_color_battery_level_ok;
+          if (battery_level !== "unavailable") {
+            if (battery_level <= variables.ulm_card_battery_battery_level_danger) {
+              color = variables.ulm_card_battery_color_battery_level_danger;
+            } else if (battery_level <= variables.ulm_card_battery_battery_level_warning) {
+              color = variables.ulm_card_battery_color_battery_level_warning;
+            } else {
+              color = variables.ulm_card_battery_color_battery_level_ok;
+            }
+          }
+
+          return `
+            <ha-icon icon="${icon}" style="height: 27px; width: 27px; color: ${color};"></ha-icon>
+          `;
+        }
+      ]]]

custom_cards/custom_card_schumijo_flower/README.md

@@ -14,8 +14,9 @@ This is a `custom-card` to display a plant entity. Shows state of the plant and
 
 ## Credits
 
-Author: schumijo - 2021
-Version: 1.1.0
+- Author: schumijo - 2021
+- Update 2.0.0 : Ashino - 2024
+- Version: 2.0.0
 
 ## Changelog
 
@@ -28,6 +29,11 @@ Initial release
 Fix language files for beta5
 Updated README
 </details>
+<details>
+<summary>2.0.0</summary>
+Add support to lovelace-flower-card from Olen (advanced forked version)
+Updated README
+</details>
 
 ## Usage
 
@@ -38,6 +44,10 @@ Updated README
     ulm_card_flower_entity: plant.bonsai_ficus
     ulm_card_flower_name: Bonsai Ficus
     ulm_card_flower_species: "ficus retusa"
+    ulm_card_flower_show_bars:
+        - temperature
+        - humidity
+        - moisture
 ```
 
 #### Variables
@@ -67,11 +77,30 @@ Updated README
 <td>yes</td>
 <td>The species of your plant</td>
 </tr>
+<tr>
+<td>ulm_card_flower_show_bars</td>
+<td>
+- temperature
+<br>
+- moisture
+<br>
+- humidity
+</td>
+<td>no</td>
+<td>The bar you want to display. Any of :
+<li>illuminance</li>
+<li>humidity</li>
+<li>moisture</li>
+<li>conductivity</li>
+<li>temperature</li>
+<li>dli</li>
+</td>
+</tr>
 </table>
 
 ## Requirements
 
-Need [lovelace-flower-card](https://github.com/thomasloven/lovelace-flower-card)
+Need [lovelace-flower-card](https://github.com/Olen/lovelace-flower-card)
 
 ## Template code
 

custom_cards/custom_card_schumijo_flower/custom_card_schumijo_flower.yaml

@@ -77,6 +77,7 @@ card_flower:
               type: "custom:flower-card"
               entity: "[[[ return variables.ulm_card_flower_entity ]]]"
               species: "[[[ return variables.ulm_card_flower_species ]]]"
+              show_bars: "[[[ return variables.ulm_card_flower_show_bars ]]]"
               card_mod:
                 style: |
                   ha-card{