pick up icon override from entities card

voorkant · Dec 15, 2024 · 38cc136 · 38cc136
1 parent 037eceb
commit 38cc136
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/src/front-lvgl.cpp b/src/front-lvgl.cpp
@@ -84,11 +84,13 @@ void renderCard(std::vector<std::unique_ptr<UIEntity>>& uielements, nlohmann::ba
       auto objs = card["entities"];
       for (auto ent : objs) {
         string entityname;
+        string icon;
         if (ent.type() == json::value_t::string) {
           entityname = ent;
         }
         else {
           entityname = ent["entity"];
+          icon = ent.value("icon", "");
         }
         std::shared_ptr<HAEntity> entity = HABackend::getInstance().getEntityByName(entityname);
         if (entity->getEntityType() == EntityType::Light) {
@@ -100,7 +102,7 @@ void renderCard(std::vector<std::unique_ptr<UIEntity>>& uielements, nlohmann::ba
           uielements.push_back(std::move(btn));
         }
         else if (entity->getEntityType() == EntityType::Sensor) {
-          std::unique_ptr<UIEntity> sensor = std::make_unique<UISensor>(entity, cont_row);
+          std::unique_ptr<UIEntity> sensor = std::make_unique<UISensor>(entity, cont_row, icon);
           uielements.push_back(std::move(sensor));
         }
         else {

diff --git a/src/uicomponents/UIComponents.cpp b/src/uicomponents/UIComponents.cpp
@@ -181,8 +181,12 @@ void UIDummy::update()
   }
 };
 
-string getIconFor(std::shared_ptr<HAEntity> _entity) // for now, this function -always- returns something that starts with mdi:
+// if _icon is passed, we got one from the dashboard, use that
+string getIconFor(std::shared_ptr<HAEntity> _entity, std::string _icon) // for now, this function -always- returns something that starts with mdi:
 {
+  if (!_icon.empty()) {
+    return _icon;
+  }
   json state = _entity->getJsonState();
 
   // 1. see if the state simply contains an icon - user might have set it explicitly
@@ -218,7 +222,7 @@ string getIconFor(std::shared_ptr<HAEntity> _entity) // for now, this function -
   return "mdi:border-none";
 }
 
-UISensor::UISensor(std::shared_ptr<HAEntity> _entity, lv_obj_t* _parent) :
+UISensor::UISensor(std::shared_ptr<HAEntity> _entity, lv_obj_t* _parent, std::string _icon) :
   UIEntity(_entity, _parent)
 {
   lv_obj_t* flowpanel = lv_obj_create(_parent);
@@ -235,7 +239,7 @@ UISensor::UISensor(std::shared_ptr<HAEntity> _entity, lv_obj_t* _parent) :
   lv_obj_set_height(iconpart, LV_SIZE_CONTENT);
   lv_obj_set_style_pad_all(iconpart, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
   lv_obj_set_style_border_width(iconpart, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
-  string icon = getIconFor(_entity);
+  string icon = getIconFor(_entity, _icon);
   // cerr << "iconmap[" << _entity->platform << "," << _entity->translation_key << "]=" << voorkant::lvgl::iconmap[{_entity->platform, _entity->translation_key}] << endl;
 
   if (icon.substr(0, 4) == "mdi:") {

diff --git a/src/uicomponents/UIComponents.hpp b/src/uicomponents/UIComponents.hpp
@@ -85,7 +85,7 @@ class UIDummy : public UIEntity
 class UISensor : public UIEntity
 {
 public:
-  UISensor(std::shared_ptr<HAEntity> _entity, lv_obj_t* _parent);
+  UISensor(std::shared_ptr<HAEntity> _entity, lv_obj_t* _parent, std::string _icon = "");
   void update() override;
 
 private: