Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
wilbiev authored Dec 24, 2024
2 parents dd4383a + e15d870 commit ecdeeb7
Show file tree
Hide file tree
Showing 146 changed files with 3,093 additions and 9,192 deletions.
10 changes: 10 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,13 @@ If applicable, add screenshots to help explain your problem.

**Additional context**
Add any other context about the problem here.

**Related Logs** (can be found in the browser-console (F12))
Add related logs for the problem

**Related Card Config**
Add the card config from `ui-lovelace.yaml` with the related problem

```yaml
paste the yaml code here
```
6 changes: 3 additions & 3 deletions .github/workflows/automatic-custom-card-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
docit:
runs-on: "ubuntu-latest"
steps:
- uses: "actions/checkout@v2"
- uses: "actions/checkout@v3"
with:
fetch-depth: 0
- name: "Copy and rename README.md files"
Expand All @@ -24,14 +24,14 @@ jobs:
cp "${dirname}/$filename" "./docs/usage/custom_cards/${foldername}.md"
done
- name: "Find and replace asset paths"
uses: "jacobtomlinson/gha-find-replace@v2"
uses: "jacobtomlinson/gha-find-replace@v3"
with:
find: "../../docs/assets/img"
replace: "../../assets/img"
include: "docs/usage/custom_cards/**"
regex: true
- name: "Create Pull Request"
uses: "peter-evans/create-pull-request@v3"
uses: "peter-evans/create-pull-request@v5"
with:
token: "${{ secrets.GITHUB_TOKEN }}"
branch: "automated_custom_card_docs"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/check-code-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:
runs-on: "ubuntu-latest"
steps:
- name: "⤵️ Check out code from GitHub"
uses: "actions/checkout@v2"
uses: "actions/checkout@v3"
- name: "⚙️ Set up Python"
uses: "actions/setup-python@v2"
uses: "actions/setup-python@v4"
with:
python-version: 3.8
- name: "⚙️ Set up Ruby"
Expand All @@ -22,4 +22,4 @@ jobs:
ruby-version: 2.7
bundler-cache: true
- name: "\U0001F680 Run pre-commit"
uses: "pre-commit/action@v2.0.3"
uses: "pre-commit/action@v3.0.0"
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:

steps:
- name: "Checkout repository"
uses: "actions/checkout@v2"
uses: "actions/checkout@v3"

# Initializes the CodeQL tools for scanning.
- name: "Initialize CodeQL"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/hacs-validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: "ubuntu-latest"
steps:
- name: "checkout"
uses: "actions/checkout@v2"
uses: "actions/checkout@v3"
- name: "validation"
uses: "home-assistant/actions/hassfest@master"

Expand All @@ -22,7 +22,7 @@ jobs:
runs-on: "ubuntu-latest"
steps:
- name: "checkout"
uses: "actions/checkout@v2"
uses: "actions/checkout@v3"
- name: "validation"
uses: "hacs/action@main"
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ jobs:
runs-on: "ubuntu-latest"
steps:
- name: "⤵️ Check out code from GitHub"
uses: "actions/checkout@v2"
uses: "actions/checkout@v3"
- name: "\U0001F680 Run Labeler"
uses: "crazy-max/ghaction-github-labeler@v3.1.1"
uses: "crazy-max/ghaction-github-labeler@v4"
with:
skip-delete: false
4 changes: 2 additions & 2 deletions .github/workflows/pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
deploy:
runs-on: "ubuntu-latest"
steps:
- uses: "actions/checkout@v2"
- uses: "actions/checkout@v3"
with:
node-version: "16.x"
- uses: "actions/setup-python@v2"
- uses: "actions/setup-python@v4"
with:
python-version: "3.11"
- run: "pip install mkdocs-material mkdocs-awesome-pages-plugin"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ jobs:
runs-on: "ubuntu-latest"
steps:
- name: "Run release-drafter"
uses: "release-drafter/release-drafter@v5.15.0"
uses: "release-drafter/release-drafter@v5"
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: "ubuntu-latest"
steps:
- name: "Check out repository"
uses: "actions/checkout@v2"
uses: "actions/checkout@v3"

- name: "Get version"
id: "version"
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ repos:
- id: "pyupgrade"
args: ["--py39-plus"]

- repo: "https://github.com/pre-commit/mirrors-isort"
rev: "v5.10.1"
- repo: https://github.com/pycqa/isort
rev: 5.12.0
hooks:
- id: "isort"
- id: isort

- repo: "https://github.com/psf/black"
rev: "22.3.0"
Expand Down
12 changes: 12 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,18 @@
![hacs installs](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Flauwbier.nl%2Fhacs%2Fui_lovelace_minimalist)
![Downloads](https://img.shields.io/github/downloads/UI-Lovelace-Minimalist/UI/total)

> [!IMPORTANT]
> Looking for New Maintainers!
>
> This project is in need of new maintainers! The current maintainers are no longer actively working on it, and without fresh leadership, we may be forced to shut down the project and its associated Discord server.
>
> If you're passionate about this project and would like to take over its development and community management, we’d love to hear from you!
>
> - Join us on Discord to discuss further: [Thread Message](https://discord.com/channels/923363055444832296/928986459975876668/1314292139139534979)
> - Or reach out on GitHub Discussions: [GitHub discussion](https://github.com/UI-Lovelace-Minimalist/UI/discussions/1560)
>
> Thank you for considering helping keep this project alive and thriving! 🙌
It's kind of hard to explain what this is, so let's call it a "theme" (in quotation marks). But one thing is for sure, it is very nice! Taking the exceptional work of tben as a basis, this repository is aimed to ease installation and maintenance of his wonderful work. You can use this interpretation of a SmartHomeUI more or less like a theme in HomeAssistant.

<img src="https://raw.githubusercontent.com/UI-Lovelace-Minimalist/UI/main/docs/assets/img/example_home.png" width="200"> <img src="https://raw.githubusercontent.com/UI-Lovelace-Minimalist/UI/main/docs/assets/img/example_temperature.png" width="200"> <img src="https://raw.githubusercontent.com/UI-Lovelace-Minimalist/UI/main/docs/assets/img/example_consumption.png" width="200"> <img src="https://raw.githubusercontent.com/UI-Lovelace-Minimalist/UI/main/docs/assets/img/example_localisation.png" width="200">
Expand Down
14 changes: 8 additions & 6 deletions custom_cards/custom_card_alarm_time/card_alarm_time.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -176,10 +176,11 @@ card_alarm_time:
type: "custom:button-card"
template: "widget_icon"
tap_action:
action: "call-service"
service: "input_datetime.set_datetime"
service_data:
action: "perform-action"
perform_action: "input_datetime.set_datetime"
target:
entity_id: "[[[ return variables.ulm_card_alarm_time_datetime ]]]"
data:
time: >
[[[
var timestamp = states[variables.ulm_card_alarm_time_datetime].attributes.timestamp;
Expand Down Expand Up @@ -259,10 +260,11 @@ card_alarm_time:
type: "custom:button-card"
template: "widget_icon"
tap_action:
action: "call-service"
service: "input_datetime.set_datetime"
service_data:
action: "perform-action"
perform_action: "input_datetime.set_datetime"
target:
entity_id: "[[[ return variables.ulm_card_alarm_time_datetime ]]]"
data:
time: >
[[[
var timestamp = states[variables.ulm_card_alarm_time_datetime].attributes.timestamp;
Expand Down
47 changes: 24 additions & 23 deletions custom_cards/custom_card_bar_card/custom_card_bar_card.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,26 +44,27 @@ custom_card_bar_card:
name: "off"
min: "[[[ return variables.ulm_custom_card_bar_card_min ]]]"
max: "[[[ return variables.ulm_custom_card_bar_card_max ]]]"
style: |-
bar-card-currentbar {
border-radius: 0px !important;
right: 0;
}
bar-card-backgroundbar {
border-radius: 0px !important;
right: 0;
}
#states {
padding: 0;
height: 35px;
}
bar-card-background {
height: 35px !important;
}
bar-card-indicator {
left: 10px;
}
bar-card-value {
font-weight: bold;
font-size: 12px;
}
card_mod:
style: |-
bar-card-currentbar {
border-radius: 0px !important;
right: 0;
}
bar-card-backgroundbar {
border-radius: 0px !important;
right: 0;
}
#states {
padding: 0;
height: 35px;
}
bar-card-background {
height: 35px !important;
}
bar-card-indicator {
left: 10px;
}
bar-card-value {
font-weight: bold;
font-size: 12px;
}
12 changes: 12 additions & 0 deletions custom_cards/custom_card_camera/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ Version: 1.0.0

## Changelog

<details>
<summary>1.0.1</summary>
Added variable to passthough aspect ratio to the picture entity card. Fix minor issues with title.
</details>
<details>
<summary>1.0.0</summary>
Initial release.
Expand All @@ -35,6 +39,7 @@ Initial release.
ulm_custom_card_camera_title: true
ulm_custom_card_camera_name: "name"
ulm_custom_card_camera_label: "label"
ulm_custom_card_camera_aspect_ratio: '16:9'
```
## Variables
Expand Down Expand Up @@ -68,6 +73,13 @@ Initial release.
<td></td>
<td>Label of your choice</td>
</tr>
<tr>
<td>ulm_custom_card_camera_aspect_ratio</td>
<td>'16:9'</td>
<td>no</td>
<td></td>
<td>Aspect ratio of camera entity</td>
</tr>
</table>
??? note "Template Code"
Expand Down
5 changes: 5 additions & 0 deletions custom_cards/custom_card_camera/custom_card_camera.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,14 @@ custom_card_camera:
show_icon: "[[[ return variables.ulm_custom_card_camera_title; ]]]"
name: "[[[ return variables.ulm_custom_card_camera_name; ]]]"
label: "[[[ return variables.ulm_custom_card_camera_label; ]]]"
tap_action:
action: "more-info"
entity: "[[[ return entity.entity_id ]]]"
styles:
card:
- box-shadow: "none"
- padding: "0"
- --mdc-ripple-press-opacity: 0
name:
- align-self: "end"
- justify-self: "start"
Expand All @@ -70,5 +74,6 @@ custom_card_camera:
entity: "[[[ return entity.entity_id ]]]"
show_name: false
show_state: false
aspect_ratio: "[[[ return variables.ulm_custom_card_camera_aspect_ratio; ]]]"
tap_action:
action: "more-info"
20 changes: 10 additions & 10 deletions custom_cards/custom_card_chromecast/custom_card_chromecast.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ card_media_player_chromecast:
- "icon_info"
- "blue_not_unavailable"
- "ulm_translation_engine"
label: "[[[ return variables.ulm_translation_state_unit ]]]"
label: "[[[ return variables.ulm_translation_state ]]]"
card_media_player_chromecast_with_controls:
variables:
ulm_card_media_player_with_controls_name: "No name set"
Expand Down Expand Up @@ -49,9 +49,9 @@ card_media_player_chromecast_with_controls:
type: "custom:button-card"
template: "widget_icon"
tap_action:
action: "call-service"
service: "media_player.toggle"
service_data:
action: "perform-action"
perform_action: "media_player.toggle"
target:
entity_id: "[[[ return variables.ulm_card_media_player_with_controls_entity ]]]"
icon: "mdi:power"
item2:
Expand All @@ -60,9 +60,9 @@ card_media_player_chromecast_with_controls:
template: "widget_icon"
entity: "[[[ return variables.ulm_card_media_player_with_controls_entity ]]]"
tap_action:
action: "call-service"
service: "media_player.media_play_pause"
service_data:
action: "perform-action"
perform_action: "media_player.media_play_pause"
target:
entity_id: "[[[ return variables.ulm_card_media_player_with_controls_entity ]]]"
icon: "mdi:pause"
state:
Expand All @@ -75,9 +75,9 @@ card_media_player_chromecast_with_controls:
type: "custom:button-card"
template: "widget_icon"
tap_action:
action: "call-service"
service: "media_player.toggle"
service_data:
action: "perform-action"
perform_action: "media_player.toggle"
target:
entity_id: "[[[ return variables.ulm_card_media_player_with_controls_entity ]]]"
icon: "mdi:video-input-hdmi"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ custom_card_eraycetinay_elapsed_time:
let text = '';
if(entity.attributes.has_date) {
text += days > 0 ? days + ' ' + (days > 1 ? variables.custom_card_eraycetinay_elapsed_time_days : variables.custom_card_eraycetinay_elapsed_time_day) +' ' : '';
text += days > 0 ? days + ' ' + (days > 1 ? variables.ulm_custom_card_eraycetinay_elapsed_time_days : variables.ulm_custom_card_eraycetinay_elapsed_time_day) +' ' : '';
}
if(entity.attributes.has_time) {
text += hours > 0 ? hours + ' ' + (hours > 1 ? variables.custom_card_eraycetinay_elapsed_time_hours : variables.custom_card_eraycetinay_elapsed_time_hour) +' ' : '';
text += hours > 0 ? hours + ' ' + (hours > 1 ? variables.ulm_custom_card_eraycetinay_elapsed_time_hours : variables.ulm_custom_card_eraycetinay_elapsed_time_hour) +' ' : '';
}
if(entity.attributes.has_time && !entity.attributes.has_date) {
text += minutes > 0 ? minutes + ' ' + (minutes > 1 ? variables.custom_card_eraycetinay_elapsed_time_minutes : variables.custom_card_eraycetinay_elapsed_time_minute) +' ' : '';
text += minutes > 0 ? minutes + ' ' + (minutes > 1 ? variables.ulm_custom_card_eraycetinay_elapsed_time_minutes : variables.ulm_custom_card_eraycetinay_elapsed_time_minute) +' ' : '';
}
text = text.length ? text += variables.custom_card_eraycetinay_elapsed_time_ago : variables.custom_card_eraycetinay_elapsed_time_justnow;
text = text.length ? text += variables.ulm_custom_card_eraycetinay_elapsed_time_ago : variables.ulm_custom_card_eraycetinay_elapsed_time_justnow;
return text;
]]]
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
---
ulm_custom_card_eraycetinay_elapsed_time_language_variables:
variables:
custom_card_eraycetinay_elapsed_time_day: "Tag"
custom_card_eraycetinay_elapsed_time_days: "Tage"
custom_card_eraycetinay_elapsed_time_hour: "Stunde"
custom_card_eraycetinay_elapsed_time_hours: "Stunden"
custom_card_eraycetinay_elapsed_time_minute: "Minute"
custom_card_eraycetinay_elapsed_time_minutes: "Minuten"
custom_card_eraycetinay_elapsed_time_ago: "her"
custom_card_eraycetinay_elapsed_time_justnow: "Jetzt"
ulm_custom_card_eraycetinay_elapsed_time_day: "Tag"
ulm_custom_card_eraycetinay_elapsed_time_days: "Tage"
ulm_custom_card_eraycetinay_elapsed_time_hour: "Stunde"
ulm_custom_card_eraycetinay_elapsed_time_hours: "Stunden"
ulm_custom_card_eraycetinay_elapsed_time_minute: "Minute"
ulm_custom_card_eraycetinay_elapsed_time_minutes: "Minuten"
ulm_custom_card_eraycetinay_elapsed_time_ago: "her"
ulm_custom_card_eraycetinay_elapsed_time_justnow: "Jetzt"
Loading

0 comments on commit ecdeeb7

Please sign in to comment.