Skip to content

Commit 9ae2d5c

Browse files
authored
Merge pull request #598 from UI-Lovelace-Minimalist/release
Release V0.0.8
2 parents 7f4e6cf + 67bebd2 commit 9ae2d5c

File tree

18 files changed

+436
-113
lines changed

18 files changed

+436
-113
lines changed

.pre-commit-config.yaml

+23-15
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
---
22
ci:
33
autofix_commit_msg: |
4-
[pre-commit.ci] auto fixes from pre-commit.com hooks
5-
for more information, see https://pre-commit.ci
4+
[pre-commit.ci] auto fixes from pre-commit.com hooks
5+
for more information, see https://pre-commit.ci
66
autofix_prs: true
7-
autoupdate_branch: "dev"
7+
autoupdate_branch: "release"
88
autoupdate_commit_msg: "[pre-commit.ci] pre-commit autoupdate"
99
autoupdate_schedule: "weekly"
1010
skip: []
1111
submodules: false
1212

1313
repos:
14-
1514
- repo: "https://github.com/pre-commit/pre-commit-hooks"
16-
rev: "v4.1.0"
15+
rev: "v4.2.0"
1716
hooks:
1817
- id: "check-executables-have-shebangs"
1918
- id: "check-json"
@@ -37,21 +36,30 @@ repos:
3736
args: ["--format", "parsable", "--strict"]
3837
# exclude: ".pre-commit-config.yaml"
3938
exclude: |
40-
(?x)^(
41-
.pre-commit-config.yaml
42-
)$
39+
(?x)^(
40+
.pre-commit-config.yaml
41+
)$
4342
4443
- repo: https://github.com/igorshubovych/markdownlint-cli
45-
rev: v0.30.0
44+
rev: v0.31.1
4645
hooks:
47-
- id: markdownlint
48-
args: ["--fix"]
46+
- id: markdownlint
47+
args: ["--fix"]
4948

5049
- repo: "https://github.com/jumanjihouse/pre-commit-hook-yamlfmt"
5150
rev: "0.1.1"
5251
hooks:
5352
- id: "yamlfmt"
54-
args: ["--mapping", "2", "--sequence", "4", "--offset", "2", "--preserve-quotes"]
53+
args:
54+
[
55+
"--mapping",
56+
"2",
57+
"--sequence",
58+
"4",
59+
"--offset",
60+
"2",
61+
"--preserve-quotes",
62+
]
5563
exclude: ".*"
5664

5765
- repo: "https://github.com/mattlqx/pre-commit-search-and-replace"
@@ -60,7 +68,7 @@ repos:
6068
- id: "search-and-replace"
6169

6270
- repo: "https://github.com/asottile/pyupgrade"
63-
rev: "v2.29.1"
71+
rev: "v2.31.1"
6472
hooks:
6573
- id: "pyupgrade"
6674
args: ["--py39-plus"]
@@ -71,7 +79,7 @@ repos:
7179
- id: "isort"
7280

7381
- repo: "https://github.com/psf/black"
74-
rev: "21.12b0"
82+
rev: "22.3.0"
7583
hooks:
7684
- id: "black"
7785
args:
@@ -91,7 +99,7 @@ repos:
9199
files: '^(custom_components/.+)?[^/]+\.py$'
92100

93101
- repo: "https://github.com/PyCQA/bandit"
94-
rev: "1.7.1"
102+
rev: "1.7.4"
95103
hooks:
96104
- id: "bandit"
97105
args:

custom_cards/custom_card_yagrasdemonde_lights_count/README.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ This is a `custom-card` to display number of lights on or covers open.
1212
![Screenshot light mode](../../docs/assets/img/screenshot_light_count_lights.png)
1313
![Screenshot dark mode](../../docs/assets/img/screenshot_dark_count_lights.png)
1414

15-
1615
## Credits
1716

1817
Author: yagrasdemonde - 04/2022
@@ -59,12 +58,15 @@ template:
5958
## Usage
6059
6160
For lights
61+
6262
```yaml
6363
- type: "custom:button-card"
6464
template: custom_card_yagrasdemonde_lights_count
6565
entity: sensor.lights_on
6666
```
67+
6768
For covers
69+
6870
```yaml
6971
- type: "custom:button-card"
7072
template: custom_card_yagrasdemonde_lights_count

custom_components/ui_lovelace_minimalist/configure.py

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
"Norwegian": "no",
2727
"Polish": "pl",
2828
"Portuguese": "pt",
29+
"Portuguese (Brazil)": "pt-BR",
2930
"Slovak": "sk",
3031
"Swedish": "sv",
3132
"Turkish": "tr",

custom_components/ui_lovelace_minimalist/const.py

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"Norwegian",
2323
"Polish",
2424
"Portuguese",
25+
"Portuguese (Brazil)",
2526
"Slovak",
2627
"Swedish",
2728
"Turkish",

custom_components/ui_lovelace_minimalist/lovelace/themefiles/minimalist-ios-tapbar/minimalist-ios-tapbar.yaml

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
minimalist-ios-tapbar:
3-
# version 1.0.0
3+
# version 1.0.1
44
# By LRvdLinden
55
# Journal
66
state-icon-color: "rgb(var(--color-theme))"
@@ -13,16 +13,18 @@ minimalist-ios-tapbar:
1313
divider-color: "rgba(var(--color-theme),.12)"
1414
accent-color: "var(--google-yellow)"
1515
card-mod-theme: "minimalist-ios-tapbar"
16-
header-height: "97px"
17-
16+
card-mod-root: |
17+
app-toolbar {
18+
display: none;
19+
}
20+
header-height: "78px"
1821
card-mod-view-yaml: |
1922
"*:first-child$": |
2023
#columns .column > * {
2124
padding-left: 5px;
2225
padding-right: 5px;
2326
padding-bottom: 5px;
2427
}
25-
2628
# Move navbar
2729
card-mod-root-yaml: |
2830
ha-tabs$: |
@@ -54,8 +56,9 @@ minimalist-ios-tapbar:
5456
height: var(--header-height) !important;
5557
}
5658
app-toolbar {
57-
height: 115px !important;
58-
padding-bottom: env(safe-area-inset-bottom) !important;
59+
height: var(--header-height) !important;
60+
padding: 10px 0px !important;
61+
background: var( --ha-card-background, var(--card-background-color) );
5962
}
6063
#view {
6164
margin-top: calc(-1 * var(--header-height)) !important;
@@ -66,8 +69,9 @@ minimalist-ios-tapbar:
6669
--mdc-icon-size: 26px;
6770
display: flex;
6871
justify-content: space-between;
69-
padding: 0 10px;
70-
height:50px !important;
72+
padding: 10px;
73+
margin-top:15px;
74+
height:var(--header-height) !important;
7175
}
7276
paper-tab[aria-selected=true] {
7377
color: var(--header-active-tab-color);
@@ -77,12 +81,8 @@ minimalist-ios-tapbar:
7781
color: var(--header-all-tabs-color);
7882
border-radius: 25px;
7983
height:50px;
80-
/*width: calc(100% / 4);
81-
padding: 0;*/
82-
padding-left: 20px;
83-
padding-right: 20px;
84+
padding: 0 20px;
8485
}
85-
8686
# Color themes
8787
modes:
8888
light:
@@ -121,7 +121,7 @@ minimalist-ios-tapbar:
121121
header-all-tabs-color: "var(--paper-item-icon-color)"
122122
header-tab-indicator-color: "rgba(0, 0, 0, 0)"
123123
app-header-text-color: "var(--primary-text-color)"
124-
app-header-background-color: "var( --ha-card-background, var(--card-background-color, white) )"
124+
app-header-background-color: "var(--primary-background-color)"
125125
paper-tabs-selection-bar-color: "var(--primary-text-color)"
126126
footer-shadow: "0px -1px 3px 0px rgba(0,0,0,0.12)"
127127
# background and sidebar
@@ -181,7 +181,7 @@ minimalist-ios-tapbar:
181181
header-all-tabs-color: "var(--paper-item-icon-color)"
182182
header-tab-indicator-color: "rgba(0, 0, 0, 0)"
183183
app-header-text-color: "var(--primary-text-color)"
184-
app-header-background-color: "var( --ha-card-background, var(--card-background-color, rgb(29, 29, 29)) )"
184+
app-header-background-color: "var(--primary-background-color)"
185185
paper-tabs-selection-bar-color: "var(--primary-text-color)"
186186
footer-shadow: "0px -1px 3px 0px rgba(0,0,0,0.12)"
187187
# background and sidebar
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
---
2+
ulm_language_variables:
3+
variables:
4+
ulm_on: "Ligado"
5+
ulm_off: "Desligado"
6+
ulm_open: "Aberto"
7+
ulm_closed: "Fechado"
8+
ulm_unavailable: "Indisponível"
9+
ulm_standby: "Em espera"
10+
ulm_idle: "Inativo"
11+
ulm_currency: "R$"
12+
ulm_auto: "Auto"
13+
ulm_heat: "Quente"
14+
ulm_cool: "Frio"
15+
ulm_dry: "Seco"
16+
ulm_fan_only: "Apenas ventilador"
17+
ulm_heat_cool: "Quente/Frio"
18+
ulm_heating: "Aquecimento"
19+
ulm_cooling: "Refrigeração"
20+
ulm_person_state_home: "Em casa"
21+
ulm_person_state_away: "Fora de casa"
22+
ulm_person_state_not_home: "Fora de casa"
23+
ulm_device_state_home: "Online"
24+
ulm_device_state_not_home: "Offline"
25+
ulm_popups_back: "Voltar"
26+
ulm_popups_toggle: "Alternar"
27+
ulm_popups_statistics: "Estatística"
28+
ulm_popups_history: "História"
29+
ulm_popups_brightness: "Brilho"
30+
ulm_popups_color_temp: "Temperatura"
31+
ulm_popups_color: "Cor"
32+
ulm_unknown: "Desconhecido"
33+
ulm_alarm_armed_home: "Armado em casa"
34+
ulm_alarm_armed_away: "Armado fora de casa"
35+
ulm_alarm_armed_night: "Armado de noite"
36+
ulm_alarm_disarmed: "Desarmado"
37+
ulm_alarm_arming: "Armando"
38+
ulm_alarm_triggered: "DISPARADO"
39+
ulm_playing: "Tocando"
40+
ulm_paused: "Pausado"
41+
ulm_updates_available: "Atualizações disponíveis!"
42+
ulm_no_updates_available: "Sem atualizações disponíveis"
43+
ulm_morning: "Bom dia"
44+
ulm_afternoon: "Boa tarde"
45+
ulm_evening: "Boa noite"
46+
ulm_hello: "Olá"
47+
ulm_cleaning: "Limpando"
48+
ulm_returning: "Retornando"
49+
ulm_docked: "Na base"
50+
ulm_mopping: "Passando pano"

custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_cover.yaml

+23-4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ card_cover:
66
variables:
77
ulm_card_cover_name: "[[[ return entity.attributes.friendly_name ]]]"
88
ulm_card_cover_display_left_right: false
9+
ulm_card_curtain_display_collapse_expand: false
910
ulm_card_cover_enable_controls: false
1011
ulm_card_cover_enable_slider: false
1112
ulm_card_cover_enable_horizontal: false
@@ -111,14 +112,26 @@ card_cover:
111112
var icon = "mdi:help-circle";
112113
if (typeof states[entity.entity_id].attributes.current_position === "undefined"){
113114
if (states[entity.entity_id].state == "closed"){
114-
var icon = "mdi:window-shutter";
115+
if (variables.ulm_card_curtain_display_collapse_expand){
116+
var icon = "mdi:curtains-closed";
117+
} else
118+
var icon = "mdi:window-shutter";
115119
} else
116-
var icon = "mdi:window-shutter-open";
120+
if (variables.ulm_card_curtain_display_collapse_expand){
121+
var icon = "mdi:curtains";
122+
} else
123+
var icon = "mdi:window-shutter-open";
117124
} else {
118125
if (states[entity.entity_id].attributes.current_position == 0){
119-
var icon = "mdi:window-shutter";
126+
if (variables.ulm_card_curtain_display_collapse_expand){
127+
var icon = "mdi:curtains-closed";
128+
} else
129+
var icon = "mdi:window-shutter";
120130
} else
121-
var icon = "mdi:window-shutter-open";
131+
if (variables.ulm_card_curtain_display_collapse_expand){
132+
var icon = "mdi:curtains";
133+
} else
134+
var icon = "mdi:window-shutter-open";
122135
}
123136
return icon ;
124137
]]]
@@ -241,6 +254,9 @@ card_cover:
241254
if (variables.ulm_card_cover_display_left_right){
242255
return "mdi:arrow-left";
243256
}
257+
if (variables.ulm_card_curtain_display_collapse_expand){
258+
return "mdi:arrow-collapse-horizontal";
259+
}
244260
return "mdi:arrow-down";
245261
]]]
246262
item2:
@@ -272,6 +288,9 @@ card_cover:
272288
if (variables.ulm_card_cover_display_left_right){
273289
return "mdi:arrow-right";
274290
}
291+
if (variables.ulm_card_curtain_display_collapse_expand){
292+
return "mdi:arrow-expand-horizontal";
293+
}
275294
return "mdi:arrow-up";
276295
]]]
277296
item3:

custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_light.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ card_light:
88
ulm_card_light_icon: "[[[ return entity.attributes.icon ]]]"
99
ulm_card_light_enable_collapse: false
1010
ulm_card_light_enable_slider: false
11+
ulm_card_light_enable_slider_minSet: 0
12+
ulm_card_light_enable_slider_maxSet: 100
1113
ulm_card_light_enable_horizontal: false
1214
ulm_card_light_enable_horizontal_wide: false
1315
ulm_card_light_enable_color: false
@@ -250,6 +252,8 @@ card_light:
250252
entity: "[[[ return entity.entity_id ]]]"
251253
radius: "14px"
252254
height: "42px"
255+
minSet: "[[[ return variables.ulm_card_light_enable_slider_minSet ]]]"
256+
maxSet: "[[[ return variables.ulm_card_light_enable_slider_maxSet ]]]"
253257
mainSliderColor: >
254258
[[[
255259
var color = entity.attributes.rgb_color;

0 commit comments

Comments
 (0)