From 440980a96fb47a037ff83fedfb6bb1383f4f33f3 Mon Sep 17 00:00:00 2001
From: SomeoneOnEarth <github@someone.earth>
Date: Sun, 19 Nov 2023 02:04:23 +0100
Subject: [PATCH] Aligned naming of menu item types

---
 resources-icons-18/drawables.xml              |  4 +--
 .../{menu.svg => group_type.svg}              |  0
 resources-icons-18/{tap.svg => tap_type.svg}  |  0
 resources-icons-21/drawables.xml              |  4 +--
 .../{menu.svg => group_type.svg}              |  0
 resources-icons-21/{tap.svg => tap_type.svg}  |  0
 resources-icons-24/drawables.xml              |  4 +--
 .../{menu.svg => group_type.svg}              |  0
 resources-icons-24/{tap.svg => tap_type.svg}  |  0
 resources-icons-26/drawables.xml              |  4 +--
 .../{menu.svg => group_type.svg}              |  0
 resources-icons-26/{tap.svg => tap_type.svg}  |  0
 resources-icons-28/drawables.xml              |  4 +--
 .../{menu.svg => group_type.svg}              |  0
 resources-icons-28/{tap.svg => tap_type.svg}  |  0
 resources-icons-30/drawables.xml              |  4 +--
 .../{menu.svg => group_type.svg}              |  0
 resources-icons-30/{tap.svg => tap_type.svg}  |  0
 resources-icons-32/drawables.xml              |  4 +--
 .../{menu.svg => group_type.svg}              |  0
 resources-icons-32/{tap.svg => tap_type.svg}  |  0
 resources-icons-38/drawables.xml              |  4 +--
 .../{menu.svg => group_type.svg}              |  0
 resources-icons-38/{tap.svg => tap_type.svg}  |  0
 resources-icons-42/drawables.xml              |  4 +--
 .../{menu.svg => group_type.svg}              |  0
 resources-icons-42/{tap.svg => tap_type.svg}  |  0
 resources-icons-46/drawables.xml              |  4 +--
 .../{menu.svg => group_type.svg}              |  0
 resources-icons-46/{tap.svg => tap_type.svg}  |  0
 resources-icons-48/drawables.xml              |  4 +--
 .../{menu.svg => group_type.svg}              |  0
 resources-icons-48/{tap.svg => tap_type.svg}  |  0
 resources-icons-53/drawables.xml              |  4 +--
 .../{menu.svg => group_type.svg}              |  0
 resources-icons-53/{tap.svg => tap_type.svg}  |  0
 resources/settings/properties.xml             |  2 +-
 resources/settings/settings.xml               |  4 +--
 source/HomeAssistantMenuItemFactory.mc        | 26 +++++++++----------
 39 files changed, 40 insertions(+), 40 deletions(-)
 rename resources-icons-18/{menu.svg => group_type.svg} (100%)
 rename resources-icons-18/{tap.svg => tap_type.svg} (100%)
 rename resources-icons-21/{menu.svg => group_type.svg} (100%)
 rename resources-icons-21/{tap.svg => tap_type.svg} (100%)
 rename resources-icons-24/{menu.svg => group_type.svg} (100%)
 rename resources-icons-24/{tap.svg => tap_type.svg} (100%)
 rename resources-icons-26/{menu.svg => group_type.svg} (100%)
 rename resources-icons-26/{tap.svg => tap_type.svg} (100%)
 rename resources-icons-28/{menu.svg => group_type.svg} (100%)
 rename resources-icons-28/{tap.svg => tap_type.svg} (100%)
 rename resources-icons-30/{menu.svg => group_type.svg} (100%)
 rename resources-icons-30/{tap.svg => tap_type.svg} (100%)
 rename resources-icons-32/{menu.svg => group_type.svg} (100%)
 rename resources-icons-32/{tap.svg => tap_type.svg} (100%)
 rename resources-icons-38/{menu.svg => group_type.svg} (100%)
 rename resources-icons-38/{tap.svg => tap_type.svg} (100%)
 rename resources-icons-42/{menu.svg => group_type.svg} (100%)
 rename resources-icons-42/{tap.svg => tap_type.svg} (100%)
 rename resources-icons-46/{menu.svg => group_type.svg} (100%)
 rename resources-icons-46/{tap.svg => tap_type.svg} (100%)
 rename resources-icons-48/{menu.svg => group_type.svg} (100%)
 rename resources-icons-48/{tap.svg => tap_type.svg} (100%)
 rename resources-icons-53/{menu.svg => group_type.svg} (100%)
 rename resources-icons-53/{tap.svg => tap_type.svg} (100%)

diff --git a/resources-icons-18/drawables.xml b/resources-icons-18/drawables.xml
index 3d491a1..d560ef6 100644
--- a/resources-icons-18/drawables.xml
+++ b/resources-icons-18/drawables.xml
@@ -17,6 +17,6 @@
 
 <drawables>
     <bitmap id="ErrorIcon" filename="error.svg"/>
-    <bitmap id="MenuIcon" filename="menu.svg"/>
-    <bitmap id="TapIcon" filename="tap.svg"/>
+    <bitmap id="GroupTypeIcon" filename="group_type.svg"/>
+    <bitmap id="TapTypeIcon" filename="tap_type.svg"/>
 </drawables>
diff --git a/resources-icons-18/menu.svg b/resources-icons-18/group_type.svg
similarity index 100%
rename from resources-icons-18/menu.svg
rename to resources-icons-18/group_type.svg
diff --git a/resources-icons-18/tap.svg b/resources-icons-18/tap_type.svg
similarity index 100%
rename from resources-icons-18/tap.svg
rename to resources-icons-18/tap_type.svg
diff --git a/resources-icons-21/drawables.xml b/resources-icons-21/drawables.xml
index 3d491a1..d560ef6 100644
--- a/resources-icons-21/drawables.xml
+++ b/resources-icons-21/drawables.xml
@@ -17,6 +17,6 @@
 
 <drawables>
     <bitmap id="ErrorIcon" filename="error.svg"/>
-    <bitmap id="MenuIcon" filename="menu.svg"/>
-    <bitmap id="TapIcon" filename="tap.svg"/>
+    <bitmap id="GroupTypeIcon" filename="group_type.svg"/>
+    <bitmap id="TapTypeIcon" filename="tap_type.svg"/>
 </drawables>
diff --git a/resources-icons-21/menu.svg b/resources-icons-21/group_type.svg
similarity index 100%
rename from resources-icons-21/menu.svg
rename to resources-icons-21/group_type.svg
diff --git a/resources-icons-21/tap.svg b/resources-icons-21/tap_type.svg
similarity index 100%
rename from resources-icons-21/tap.svg
rename to resources-icons-21/tap_type.svg
diff --git a/resources-icons-24/drawables.xml b/resources-icons-24/drawables.xml
index 3d491a1..d560ef6 100644
--- a/resources-icons-24/drawables.xml
+++ b/resources-icons-24/drawables.xml
@@ -17,6 +17,6 @@
 
 <drawables>
     <bitmap id="ErrorIcon" filename="error.svg"/>
-    <bitmap id="MenuIcon" filename="menu.svg"/>
-    <bitmap id="TapIcon" filename="tap.svg"/>
+    <bitmap id="GroupTypeIcon" filename="group_type.svg"/>
+    <bitmap id="TapTypeIcon" filename="tap_type.svg"/>
 </drawables>
diff --git a/resources-icons-24/menu.svg b/resources-icons-24/group_type.svg
similarity index 100%
rename from resources-icons-24/menu.svg
rename to resources-icons-24/group_type.svg
diff --git a/resources-icons-24/tap.svg b/resources-icons-24/tap_type.svg
similarity index 100%
rename from resources-icons-24/tap.svg
rename to resources-icons-24/tap_type.svg
diff --git a/resources-icons-26/drawables.xml b/resources-icons-26/drawables.xml
index 3d491a1..d560ef6 100644
--- a/resources-icons-26/drawables.xml
+++ b/resources-icons-26/drawables.xml
@@ -17,6 +17,6 @@
 
 <drawables>
     <bitmap id="ErrorIcon" filename="error.svg"/>
-    <bitmap id="MenuIcon" filename="menu.svg"/>
-    <bitmap id="TapIcon" filename="tap.svg"/>
+    <bitmap id="GroupTypeIcon" filename="group_type.svg"/>
+    <bitmap id="TapTypeIcon" filename="tap_type.svg"/>
 </drawables>
diff --git a/resources-icons-26/menu.svg b/resources-icons-26/group_type.svg
similarity index 100%
rename from resources-icons-26/menu.svg
rename to resources-icons-26/group_type.svg
diff --git a/resources-icons-26/tap.svg b/resources-icons-26/tap_type.svg
similarity index 100%
rename from resources-icons-26/tap.svg
rename to resources-icons-26/tap_type.svg
diff --git a/resources-icons-28/drawables.xml b/resources-icons-28/drawables.xml
index 3d491a1..d560ef6 100644
--- a/resources-icons-28/drawables.xml
+++ b/resources-icons-28/drawables.xml
@@ -17,6 +17,6 @@
 
 <drawables>
     <bitmap id="ErrorIcon" filename="error.svg"/>
-    <bitmap id="MenuIcon" filename="menu.svg"/>
-    <bitmap id="TapIcon" filename="tap.svg"/>
+    <bitmap id="GroupTypeIcon" filename="group_type.svg"/>
+    <bitmap id="TapTypeIcon" filename="tap_type.svg"/>
 </drawables>
diff --git a/resources-icons-28/menu.svg b/resources-icons-28/group_type.svg
similarity index 100%
rename from resources-icons-28/menu.svg
rename to resources-icons-28/group_type.svg
diff --git a/resources-icons-28/tap.svg b/resources-icons-28/tap_type.svg
similarity index 100%
rename from resources-icons-28/tap.svg
rename to resources-icons-28/tap_type.svg
diff --git a/resources-icons-30/drawables.xml b/resources-icons-30/drawables.xml
index 3d491a1..d560ef6 100644
--- a/resources-icons-30/drawables.xml
+++ b/resources-icons-30/drawables.xml
@@ -17,6 +17,6 @@
 
 <drawables>
     <bitmap id="ErrorIcon" filename="error.svg"/>
-    <bitmap id="MenuIcon" filename="menu.svg"/>
-    <bitmap id="TapIcon" filename="tap.svg"/>
+    <bitmap id="GroupTypeIcon" filename="group_type.svg"/>
+    <bitmap id="TapTypeIcon" filename="tap_type.svg"/>
 </drawables>
diff --git a/resources-icons-30/menu.svg b/resources-icons-30/group_type.svg
similarity index 100%
rename from resources-icons-30/menu.svg
rename to resources-icons-30/group_type.svg
diff --git a/resources-icons-30/tap.svg b/resources-icons-30/tap_type.svg
similarity index 100%
rename from resources-icons-30/tap.svg
rename to resources-icons-30/tap_type.svg
diff --git a/resources-icons-32/drawables.xml b/resources-icons-32/drawables.xml
index 3d491a1..d560ef6 100644
--- a/resources-icons-32/drawables.xml
+++ b/resources-icons-32/drawables.xml
@@ -17,6 +17,6 @@
 
 <drawables>
     <bitmap id="ErrorIcon" filename="error.svg"/>
-    <bitmap id="MenuIcon" filename="menu.svg"/>
-    <bitmap id="TapIcon" filename="tap.svg"/>
+    <bitmap id="GroupTypeIcon" filename="group_type.svg"/>
+    <bitmap id="TapTypeIcon" filename="tap_type.svg"/>
 </drawables>
diff --git a/resources-icons-32/menu.svg b/resources-icons-32/group_type.svg
similarity index 100%
rename from resources-icons-32/menu.svg
rename to resources-icons-32/group_type.svg
diff --git a/resources-icons-32/tap.svg b/resources-icons-32/tap_type.svg
similarity index 100%
rename from resources-icons-32/tap.svg
rename to resources-icons-32/tap_type.svg
diff --git a/resources-icons-38/drawables.xml b/resources-icons-38/drawables.xml
index 3d491a1..d560ef6 100644
--- a/resources-icons-38/drawables.xml
+++ b/resources-icons-38/drawables.xml
@@ -17,6 +17,6 @@
 
 <drawables>
     <bitmap id="ErrorIcon" filename="error.svg"/>
-    <bitmap id="MenuIcon" filename="menu.svg"/>
-    <bitmap id="TapIcon" filename="tap.svg"/>
+    <bitmap id="GroupTypeIcon" filename="group_type.svg"/>
+    <bitmap id="TapTypeIcon" filename="tap_type.svg"/>
 </drawables>
diff --git a/resources-icons-38/menu.svg b/resources-icons-38/group_type.svg
similarity index 100%
rename from resources-icons-38/menu.svg
rename to resources-icons-38/group_type.svg
diff --git a/resources-icons-38/tap.svg b/resources-icons-38/tap_type.svg
similarity index 100%
rename from resources-icons-38/tap.svg
rename to resources-icons-38/tap_type.svg
diff --git a/resources-icons-42/drawables.xml b/resources-icons-42/drawables.xml
index 3d491a1..d560ef6 100644
--- a/resources-icons-42/drawables.xml
+++ b/resources-icons-42/drawables.xml
@@ -17,6 +17,6 @@
 
 <drawables>
     <bitmap id="ErrorIcon" filename="error.svg"/>
-    <bitmap id="MenuIcon" filename="menu.svg"/>
-    <bitmap id="TapIcon" filename="tap.svg"/>
+    <bitmap id="GroupTypeIcon" filename="group_type.svg"/>
+    <bitmap id="TapTypeIcon" filename="tap_type.svg"/>
 </drawables>
diff --git a/resources-icons-42/menu.svg b/resources-icons-42/group_type.svg
similarity index 100%
rename from resources-icons-42/menu.svg
rename to resources-icons-42/group_type.svg
diff --git a/resources-icons-42/tap.svg b/resources-icons-42/tap_type.svg
similarity index 100%
rename from resources-icons-42/tap.svg
rename to resources-icons-42/tap_type.svg
diff --git a/resources-icons-46/drawables.xml b/resources-icons-46/drawables.xml
index 3d491a1..d560ef6 100644
--- a/resources-icons-46/drawables.xml
+++ b/resources-icons-46/drawables.xml
@@ -17,6 +17,6 @@
 
 <drawables>
     <bitmap id="ErrorIcon" filename="error.svg"/>
-    <bitmap id="MenuIcon" filename="menu.svg"/>
-    <bitmap id="TapIcon" filename="tap.svg"/>
+    <bitmap id="GroupTypeIcon" filename="group_type.svg"/>
+    <bitmap id="TapTypeIcon" filename="tap_type.svg"/>
 </drawables>
diff --git a/resources-icons-46/menu.svg b/resources-icons-46/group_type.svg
similarity index 100%
rename from resources-icons-46/menu.svg
rename to resources-icons-46/group_type.svg
diff --git a/resources-icons-46/tap.svg b/resources-icons-46/tap_type.svg
similarity index 100%
rename from resources-icons-46/tap.svg
rename to resources-icons-46/tap_type.svg
diff --git a/resources-icons-48/drawables.xml b/resources-icons-48/drawables.xml
index 3d491a1..d560ef6 100644
--- a/resources-icons-48/drawables.xml
+++ b/resources-icons-48/drawables.xml
@@ -17,6 +17,6 @@
 
 <drawables>
     <bitmap id="ErrorIcon" filename="error.svg"/>
-    <bitmap id="MenuIcon" filename="menu.svg"/>
-    <bitmap id="TapIcon" filename="tap.svg"/>
+    <bitmap id="GroupTypeIcon" filename="group_type.svg"/>
+    <bitmap id="TapTypeIcon" filename="tap_type.svg"/>
 </drawables>
diff --git a/resources-icons-48/menu.svg b/resources-icons-48/group_type.svg
similarity index 100%
rename from resources-icons-48/menu.svg
rename to resources-icons-48/group_type.svg
diff --git a/resources-icons-48/tap.svg b/resources-icons-48/tap_type.svg
similarity index 100%
rename from resources-icons-48/tap.svg
rename to resources-icons-48/tap_type.svg
diff --git a/resources-icons-53/drawables.xml b/resources-icons-53/drawables.xml
index 3d491a1..d560ef6 100644
--- a/resources-icons-53/drawables.xml
+++ b/resources-icons-53/drawables.xml
@@ -17,6 +17,6 @@
 
 <drawables>
     <bitmap id="ErrorIcon" filename="error.svg"/>
-    <bitmap id="MenuIcon" filename="menu.svg"/>
-    <bitmap id="TapIcon" filename="tap.svg"/>
+    <bitmap id="GroupTypeIcon" filename="group_type.svg"/>
+    <bitmap id="TapTypeIcon" filename="tap_type.svg"/>
 </drawables>
diff --git a/resources-icons-53/menu.svg b/resources-icons-53/group_type.svg
similarity index 100%
rename from resources-icons-53/menu.svg
rename to resources-icons-53/group_type.svg
diff --git a/resources-icons-53/tap.svg b/resources-icons-53/tap_type.svg
similarity index 100%
rename from resources-icons-53/tap.svg
rename to resources-icons-53/tap_type.svg
diff --git a/resources/settings/properties.xml b/resources/settings/properties.xml
index abfa39e..d3ffc6d 100644
--- a/resources/settings/properties.xml
+++ b/resources/settings/properties.xml
@@ -24,7 +24,7 @@
   <!-- Best be a public URL in order to work away from your home LAN and have a trusted HTTPS certificate -->
   <property id="config_url" type="string"></property>
 
-  <property id="lean_ui" type="boolean"></property>
+  <property id="types_representation" type="boolean"></property>
 
   <property id="menu_alignment" type="boolean"></property>
 </properties>
diff --git a/resources/settings/settings.xml b/resources/settings/settings.xml
index b5be02c..f8598ba 100644
--- a/resources/settings/settings.xml
+++ b/resources/settings/settings.xml
@@ -44,8 +44,8 @@
   </setting>
 
   <setting
-    propertyKey="@Properties.lean_ui"
-    title="More leaner UI"
+    propertyKey="@Properties.types_representation"
+    title="Representing types with labels (off) or with icons (on)"
   >
     <settingConfig
       type="boolean"
diff --git a/source/HomeAssistantMenuItemFactory.mc b/source/HomeAssistantMenuItemFactory.mc
index 2f8f7a6..43027b2 100644
--- a/source/HomeAssistantMenuItemFactory.mc
+++ b/source/HomeAssistantMenuItemFactory.mc
@@ -27,11 +27,11 @@ class HomeAssistantMenuItemFactory {
     private var mMenuItemAlignment;
     private var mLabelToggle;
     private var strMenuItemTap;
-    private var bLeanDesign;
+    private var bRepresentTypesWithIcons;
 
-    private var mTapIcon;
+    private var mTapTypeIcon;
 
-    private var mMenuIcon;
+    private var mGroupTypeIcon;
 
     private static var instance;
 
@@ -41,7 +41,7 @@ class HomeAssistantMenuItemFactory {
                             :disabled => WatchUi.loadResource($.Rez.Strings.MenuItemOff) as Lang.String
                        };
         
-        bLeanDesign = Application.Properties.getValue("lean_ui") as Lang.Boolean;
+        bRepresentTypesWithIcons = Application.Properties.getValue("types_representation") as Lang.Boolean;
 
         var menuItemAlignment = Application.Properties.getValue("menu_alignment") as Lang.Boolean;
 
@@ -53,14 +53,14 @@ class HomeAssistantMenuItemFactory {
         
 
         strMenuItemTap = WatchUi.loadResource($.Rez.Strings.MenuItemTap);
-        mTapIcon = new WatchUi.Bitmap({
-                            :rezId=>$.Rez.Drawables.TapIcon,
+        mTapTypeIcon = new WatchUi.Bitmap({
+                            :rezId=>$.Rez.Drawables.TapTypeIcon,
                             :locX=>WatchUi.LAYOUT_HALIGN_CENTER,
                             :locY=>WatchUi.LAYOUT_VALIGN_CENTER
                        });
 
-        mMenuIcon = new WatchUi.Bitmap({
-                            :rezId=>Rez.Drawables.MenuIcon,
+        mGroupTypeIcon = new WatchUi.Bitmap({
+                            :rezId=>$.Rez.Drawables.GroupTypeIcon,
                             :locX=>WatchUi.LAYOUT_HALIGN_CENTER,
                             :locY=>WatchUi.LAYOUT_VALIGN_CENTER
         });
@@ -76,7 +76,7 @@ class HomeAssistantMenuItemFactory {
     function toggle(label as Lang.String or Lang.Symbol, identifier as Lang.Object or Null) as WatchUi.MenuItem{
         var subLabel = null;
 
-        if (bLeanDesign == false){
+        if (bRepresentTypesWithIcons == false){
             subLabel=mLabelToggle;
         }
      
@@ -90,13 +90,13 @@ class HomeAssistantMenuItemFactory {
     }
 
     function tap(label as Lang.String or Lang.Symbol, identifier as Lang.Object or Null, service as Lang.String or Null) as WatchUi.MenuItem{
-        if (bLeanDesign) {
+        if (bRepresentTypesWithIcons) {
             return new HomeAssistantIconMenuItem(
                                 label,
                                 null,
                                 identifier,
                                 service,
-                                mTapIcon,
+                                mTapTypeIcon,
                                 mMenuItemAlignment
                     );
             
@@ -112,8 +112,8 @@ class HomeAssistantMenuItemFactory {
     }
 
     function group(definition as Lang.Dictionary) as WatchUi.MenuItem{
-        if (bLeanDesign) {
-            return new HomeAssistantViewIconMenuItem(definition, mMenuIcon, mMenuItemAlignment);
+        if (bRepresentTypesWithIcons) {
+            return new HomeAssistantViewIconMenuItem(definition, mGroupTypeIcon, mMenuItemAlignment);
         } else {
             return new HomeAssistantViewMenuItem(definition);
         }