From 67a5f0a14e910e68208f3380c5e32f03c3213a9d Mon Sep 17 00:00:00 2001
From: Philip Abbey <philipabbey@users.noreply.github.com>
Date: Fri, 19 Jan 2024 16:11:30 +0000
Subject: [PATCH] Amending naming convention

Removing some inconsistencies
---
 ...ViewMenuItem.mc => HomeAssistantGroupMenuItem.mc} | 12 ++++++++----
 source/HomeAssistantMenuItemFactory.mc               |  4 ++--
 ...istantMenuItem.mc => HomeAssistantTapMenuItem.mc} |  2 +-
 source/HomeAssistantTemplateMenuItem.mc              |  2 +-
 source/HomeAssistantView.mc                          | 10 +++++-----
 5 files changed, 17 insertions(+), 13 deletions(-)
 rename source/{HomeAssistantViewMenuItem.mc => HomeAssistantGroupMenuItem.mc} (79%)
 rename source/{HomeAssistantMenuItem.mc => HomeAssistantTapMenuItem.mc} (97%)

diff --git a/source/HomeAssistantViewMenuItem.mc b/source/HomeAssistantGroupMenuItem.mc
similarity index 79%
rename from source/HomeAssistantViewMenuItem.mc
rename to source/HomeAssistantGroupMenuItem.mc
index 5a92d55..193a6dc 100644
--- a/source/HomeAssistantViewMenuItem.mc
+++ b/source/HomeAssistantGroupMenuItem.mc
@@ -14,20 +14,24 @@
 //
 // Description:
 //
-// Menu button with an icon that opens a sub-menu.
+// Menu button with an icon that opens a sub-menu, i.e. group.
 //
 //-----------------------------------------------------------------------------------
 
 using Toybox.Lang;
 using Toybox.WatchUi;
 
-class HomeAssistantViewMenuItem extends WatchUi.IconMenuItem {
+class HomeAssistantGroupMenuItem extends WatchUi.IconMenuItem {
     private var mMenu as HomeAssistantView;
 
-    function initialize(definition as Lang.Dictionary, icon as WatchUi.Drawable, options as {
+    function initialize(
+        definition as Lang.Dictionary,
+        icon       as WatchUi.Drawable,
+        options    as {
             :alignment as WatchUi.MenuItem.Alignment
         } or Null) {
-        var label = definition.get("name") as Lang.String;
+
+        var label      = definition.get("name")   as Lang.String;
         var identifier = definition.get("entity") as Lang.String;
 
         WatchUi.IconMenuItem.initialize(
diff --git a/source/HomeAssistantMenuItemFactory.mc b/source/HomeAssistantMenuItemFactory.mc
index 76437a1..c8e3114 100644
--- a/source/HomeAssistantMenuItemFactory.mc
+++ b/source/HomeAssistantMenuItemFactory.mc
@@ -123,7 +123,7 @@ class HomeAssistantMenuItemFactory {
         confirm    as Lang.Boolean,
         data       as Lang.Dictionary or Null
     ) as WatchUi.MenuItem {
-        return new HomeAssistantMenuItem(
+        return new HomeAssistantTapMenuItem(
             label,
             null,
             identifier,
@@ -137,6 +137,6 @@ class HomeAssistantMenuItemFactory {
     }
 
     function group(definition as Lang.Dictionary) as WatchUi.MenuItem {
-        return new HomeAssistantViewMenuItem(definition, mGroupTypeIcon, mMenuItemOptions);
+        return new HomeAssistantGroupMenuItem(definition, mGroupTypeIcon, mMenuItemOptions);
     }
 }
diff --git a/source/HomeAssistantMenuItem.mc b/source/HomeAssistantTapMenuItem.mc
similarity index 97%
rename from source/HomeAssistantMenuItem.mc
rename to source/HomeAssistantTapMenuItem.mc
index 5bcf623..23a9542 100644
--- a/source/HomeAssistantMenuItem.mc
+++ b/source/HomeAssistantTapMenuItem.mc
@@ -22,7 +22,7 @@ using Toybox.Lang;
 using Toybox.WatchUi;
 using Toybox.Graphics;
 
-class HomeAssistantMenuItem extends WatchUi.IconMenuItem {
+class HomeAssistantTapMenuItem extends WatchUi.IconMenuItem {
     private var mHomeAssistantService as HomeAssistantService;
     private var mService              as Lang.String;
     private var mConfirm              as Lang.Boolean;
diff --git a/source/HomeAssistantTemplateMenuItem.mc b/source/HomeAssistantTemplateMenuItem.mc
index 71dc398..e53c9c6 100644
--- a/source/HomeAssistantTemplateMenuItem.mc
+++ b/source/HomeAssistantTemplateMenuItem.mc
@@ -14,7 +14,7 @@
 //
 // Description:
 //
-// Rendering a Home Assistant Template.
+// Menu button that renders a Home Assistant Template, and optionally triggers a service.
 //
 // Reference:
 //  * https://developers.home-assistant.io/docs/api/rest/
diff --git a/source/HomeAssistantView.mc b/source/HomeAssistantView.mc
index 36a3fb4..e31722f 100644
--- a/source/HomeAssistantView.mc
+++ b/source/HomeAssistantView.mc
@@ -87,7 +87,7 @@ class HomeAssistantView extends WatchUi.Menu2 {
         var lmi = mItems as Lang.Array<WatchUi.MenuItem>;
         for(var i = 0; i < mItems.size(); i++) {
             var item = lmi[i];
-            if (item instanceof HomeAssistantViewMenuItem) {
+            if (item instanceof HomeAssistantGroupMenuItem) {
                 fullList.addAll(item.getMenuView().getItemsToUpdate());
             } else if (item instanceof HomeAssistantToggleMenuItem) {
                 fullList.add(item);
@@ -150,8 +150,8 @@ class HomeAssistantViewDelegate extends WatchUi.Menu2InputDelegate {
                 System.println(haToggleItem.getLabel() + " " + haToggleItem.getId() + " " + haToggleItem.isEnabled());
             }
             haToggleItem.setState(haToggleItem.isEnabled());
-        } else if (item instanceof HomeAssistantMenuItem) {
-            var haItem = item as HomeAssistantMenuItem;
+        } else if (item instanceof HomeAssistantTapMenuItem) {
+            var haItem = item as HomeAssistantTapMenuItem;
             if (Globals.scDebug) {
                 System.println(haItem.getLabel() + " " + haItem.getId());
             }
@@ -162,8 +162,8 @@ class HomeAssistantViewDelegate extends WatchUi.Menu2InputDelegate {
                 System.println(haItem.getLabel() + " " + haItem.getId());
             }
             haItem.callService();
-        } else if (item instanceof HomeAssistantViewMenuItem) {
-            var haMenuItem = item as HomeAssistantViewMenuItem;
+        } else if (item instanceof HomeAssistantGroupMenuItem) {
+            var haMenuItem = item as HomeAssistantGroupMenuItem;
             if (Globals.scDebug) {
                 System.println("IconMenu: " + haMenuItem.getLabel() + " " + haMenuItem.getId());
             }