From 8c2316a51a47e2ea22d00c9b18e153b89a72feb9 Mon Sep 17 00:00:00 2001 From: estevez-dev Date: Mon, 9 Sep 2019 13:36:33 +0300 Subject: [PATCH] Resolves #446 Fix conditional crads --- lib/cards/card_widget.dart | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/cards/card_widget.dart b/lib/cards/card_widget.dart index df09baa..dcfe9a1 100644 --- a/lib/cards/card_widget.dart +++ b/lib/cards/card_widget.dart @@ -25,14 +25,15 @@ class CardWidget extends StatelessWidget { } if (card.conditions.isNotEmpty) { - bool showCardByConditions = false; + bool showCardByConditions = true; for (var condition in card.conditions) { Entity conditionEntity = HomeAssistant().entities.get(condition['entity']); if (conditionEntity != null && - (condition['state'] != null && conditionEntity.state == condition['state']) || - (condition['state_not'] != null && conditionEntity.state != condition['state_not']) + ((condition['state'] != null && conditionEntity.state != condition['state']) || + (condition['state_not'] != null && conditionEntity.state == condition['state_not'])) ) { - showCardByConditions = true; + showCardByConditions = false; + break; } } if (!showCardByConditions) {