Handle entity taps and holds in one place

lib/entity_class/const.dart

@@ -34,4 +34,5 @@ class EntityTapAction {
   static const moreInfo = 'more-info';
   static const toggle = 'toggle';
   static const callService = 'call-service';
+  static const none = 'none';
 }

lib/entity_class/entity_wrapper.class.dart

@@ -6,8 +6,10 @@ class EntityWrapper {
   String icon;
   String tapAction;
   String holdAction;
-  String actionService;
+  String tapActionService;
-  Map<String, dynamic> actionServiceData;
+  Map<String, dynamic> tapActionServiceData;
+  String holdActionService;
+  Map<String, dynamic> holdActionServiceData;
   Entity entity;
 
 
@@ -16,12 +18,66 @@ class EntityWrapper {
     String icon,
     String displayName,
     this.tapAction: EntityTapAction.moreInfo,
-    this.holdAction,
+    this.holdAction: EntityTapAction.none,
-    this.actionService,
+    this.tapActionService,
-    this.actionServiceData
+    this.tapActionServiceData,
+    this.holdActionService,
+    this.holdActionServiceData
   }) {
     this.icon = icon ?? entity.icon;
     this.displayName = displayName ?? entity.displayName;
   }
 
+  void handleTap() {
+    switch (tapAction) {
+      case EntityTapAction.toggle: {
+        eventBus.fire(
+            ServiceCallEvent("homeassistant", "toggle", entity.entityId, null));
+        break;
+      }
+
+      case EntityTapAction.callService: {
+        eventBus.fire(
+            ServiceCallEvent(tapActionService.split(".")[0], tapActionService.split(".")[1], null, tapActionServiceData));
+        break;
+      }
+
+      case EntityTapAction.none: {
+        break;
+      }
+
+      default: {
+        eventBus.fire(
+            new ShowEntityPageEvent(entity));
+        break;
+      }
+    }
+  }
+
+  void handleHold() {
+      switch (holdAction) {
+        case EntityTapAction.toggle: {
+          eventBus.fire(
+              ServiceCallEvent("homeassistant", "toggle", entity.entityId, null));
+          break;
+        }
+
+        case EntityTapAction.callService: {
+          eventBus.fire(
+              ServiceCallEvent(tapActionService.split(".")[0], tapActionService.split(".")[1], null, tapActionServiceData));
+          break;
+        }
+
+        case EntityTapAction.moreInfo: {
+          eventBus.fire(
+              new ShowEntityPageEvent(entity));
+          break;
+        }
+
+        default: {
+          break;
+        }
+      }
+  }
+
 }

lib/entity_widgets/entity_icon.dart

@@ -22,44 +22,12 @@ class EntityIcon extends StatelessWidget {
       ),
       onLongPress: () {
         if (entityModel.handleTap) {
-          switch (entityModel.entityWrapper.holdAction) {
+          entityModel.entityWrapper.handleHold();
-            case EntityTapAction.toggle: {
-              eventBus.fire(
-                  ServiceCallEvent("homeassistant", "toggle", entityModel.entityWrapper.entity.entityId, null));
-              break;
-            }
-
-            default: {
-              eventBus.fire(
-                  new ShowEntityPageEvent(entityModel.entityWrapper.entity));
-              break;
-            }
-          }
-
         }
       },
       onTap: () {
         if (entityModel.handleTap) {
-          switch (entityModel.entityWrapper.tapAction) {
+          entityModel.entityWrapper.handleTap();
-            case EntityTapAction.toggle: {
-              eventBus.fire(
-                  ServiceCallEvent("homeassistant", "toggle", entityModel.entityWrapper.entity.entityId, null));
-              break;
-            }
-
-            case EntityTapAction.callService: {
-              eventBus.fire(
-                  ServiceCallEvent(entityModel.entityWrapper.actionService.split(".")[0], entityModel.entityWrapper.actionService.split(".")[1], null, entityModel.entityWrapper.actionServiceData));
-              break;
-            }
-
-            default: {
-              eventBus.fire(
-                  new ShowEntityPageEvent(entityModel.entityWrapper.entity));
-              break;
-            }
-          }
-
         }
       }
 

lib/entity_widgets/entity_name.dart

@@ -26,44 +26,12 @@ class EntityName extends StatelessWidget {
       ),
       onLongPress: () {
         if (entityModel.handleTap) {
-          switch (entityModel.entityWrapper.holdAction) {
+          entityModel.entityWrapper.handleHold();
-            case EntityTapAction.toggle: {
-              eventBus.fire(
-                  ServiceCallEvent("homeassistant", "toggle", entityModel.entityWrapper.entity.entityId, null));
-              break;
-            }
-
-            default: {
-              eventBus.fire(
-                  new ShowEntityPageEvent(entityModel.entityWrapper.entity));
-              break;
-            }
-          }
-
         }
       },
       onTap: () {
         if (entityModel.handleTap) {
-          switch (entityModel.entityWrapper.tapAction) {
+          entityModel.entityWrapper.handleTap();
-            case EntityTapAction.toggle: {
-              eventBus.fire(
-                  ServiceCallEvent("homeassistant", "toggle", entityModel.entityWrapper.entity.entityId, null));
-              break;
-            }
-
-            case EntityTapAction.callService: {
-              eventBus.fire(
-                  ServiceCallEvent(entityModel.entityWrapper.actionService.split(".")[0], entityModel.entityWrapper.actionService.split(".")[1], null, entityModel.entityWrapper.actionServiceData));
-              break;
-            }
-
-            default: {
-              eventBus.fire(
-                  new ShowEntityPageEvent(entityModel.entityWrapper.entity));
-              break;
-            }
-          }
-
         }
       }
     );

lib/entity_widgets/glance_entity_container.dart

@@ -23,7 +23,7 @@ class GlanceEntityContainer extends StatelessWidget {
     }
     result.add(EntityIcon(
       padding: EdgeInsets.all(0.0),
-      iconSize: Sizes.largeIconSize,
+      iconSize: Sizes.iconSize,
     ));
     if (showState) {
       result.add(SimpleEntityState(

lib/entity_widgets/state/simple_state.dart

@@ -25,44 +25,12 @@ class SimpleEntityState extends StatelessWidget {
               )),
             onLongPress: () {
               if (entityModel.handleTap) {
-                switch (entityModel.entityWrapper.holdAction) {
+                entityModel.entityWrapper.handleHold();
-                  case EntityTapAction.toggle: {
-                    eventBus.fire(
-                        ServiceCallEvent("homeassistant", "toggle", entityModel.entityWrapper.entity.entityId, null));
-                    break;
-                  }
-
-                  default: {
-                    eventBus.fire(
-                        new ShowEntityPageEvent(entityModel.entityWrapper.entity));
-                    break;
-                  }
-                }
-
               }
             },
             onTap: () {
             if (entityModel.handleTap) {
-              switch (entityModel.entityWrapper.tapAction) {
+              entityModel.entityWrapper.handleHold();
-                case EntityTapAction.toggle: {
-                  eventBus.fire(
-                      ServiceCallEvent("homeassistant", "toggle", entityModel.entityWrapper.entity.entityId, null));
-                  break;
-                }
-
-                case EntityTapAction.callService: {
-                  eventBus.fire(
-                      ServiceCallEvent(entityModel.entityWrapper.actionService.split(".")[0], entityModel.entityWrapper.actionService.split(".")[1], null, entityModel.entityWrapper.actionServiceData));
-                  break;
-                }
-
-                default: {
-                  eventBus.fire(
-                      new ShowEntityPageEvent(entityModel.entityWrapper.entity));
-                  break;
-                }
-              }
-
             }
           }
         )

lib/home_assistant.class.dart

@@ -453,9 +453,9 @@ class HomeAssistant {
                     displayName: rawEntity["name"],
                     icon: rawEntity["icon"],
                     tapAction: rawEntity["tap_action"] ?? EntityTapAction.moreInfo,
-                    holdAction: rawEntity["hold_action"] ?? EntityTapAction.moreInfo,
+                    holdAction: rawEntity["hold_action"] ?? EntityTapAction.none,
-                    actionService: rawEntity["service"],
+                    tapActionService: rawEntity["service"],
-                    actionServiceData: rawEntity["service_data"] ?? {"entity_id": e.entityId}
+                    tapActionServiceData: rawEntity["service_data"] ?? {"entity_id": e.entityId}
                   )
               );
             }