remi/GarminHomeAssistant
1
0
Fork 0
mirror of https://github.com/house-of-abbey/GarminHomeAssistant.git synced 2025-06-18 12:28:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removal of menu identifiers as not actually required

Browse Source 
Toggle menu is now consistent with the use of data objects in tap and template. HA 'notify' actions now work.

Co-Authored-By: Joseph Abbey <me@josephabbey.dev>
This commit is contained in:
Philip Abbey
2024-01-19 18:04:55 +00:00
parent 67a5f0a14e
commit 2be255bb71
7 changed files with 60 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
source/HomeAssistantMenuItemFactory.mc
View File

@ -64,27 +64,31 @@ class HomeAssistantMenuItemFactory {
return instance;
}
function toggle(label as Lang.String or Lang.Symbol, identifier as Lang.Object or Null) as WatchUi.MenuItem {
function toggle(label as Lang.String or Lang.Symbol, entity_id as Lang.String or Null) as WatchUi.MenuItem {
return new HomeAssistantToggleMenuItem(
label,
null,
identifier,
false,
{ "entity_id" => entity_id },
mMenuItemOptions
);
}
function template_tap(
label as Lang.String or Lang.Symbol,
identifier as Lang.Object or Null,
entity as Lang.String or Null,
template as Lang.String or Null,
service as Lang.String or Null,
confirm as Lang.Boolean,
data as Lang.Dictionary or Null
) as WatchUi.MenuItem {
if (entity != null) {
if (data == null) {
data = { "entity_id" => entity };
} else {
data.put("entity_id", entity);
}
}
return new HomeAssistantTemplateMenuItem(
label,
identifier,
template,
service,
confirm,
@ -96,20 +100,15 @@ class HomeAssistantMenuItemFactory {
}
function template_notap(
label as Lang.String or Lang.Symbol,
identifier as Lang.Object or Null,
template as Lang.String or Null,
service as Lang.String or Null,
confirm as Lang.Boolean,
data as Lang.Dictionary or Null
label as Lang.String or Lang.Symbol,
template as Lang.String or Null
) as WatchUi.MenuItem {
return new HomeAssistantTemplateMenuItem(
label,
identifier,
template,
service,
confirm,
data,
null,
false,
null,
mInfoTypeIcon,
mMenuItemOptions,
mHomeAssistantService
@ -118,15 +117,20 @@ class HomeAssistantMenuItemFactory {
function tap(
label as Lang.String or Lang.Symbol,
identifier as Lang.Object or Null,
entity as Lang.String or Null,
service as Lang.String or Null,
confirm as Lang.Boolean,
data as Lang.Dictionary or Null
) as WatchUi.MenuItem {
if (entity != null) {
if (data == null) {
data = { "entity_id" => entity };
} else {
data.put("entity_id", entity);
}
}
return new HomeAssistantTapMenuItem(
label,
null,
identifier,
service,
confirm,
data,