From 8dfe5e87d44e8a1ef17ccbf057d0ab6af23dbbb4 Mon Sep 17 00:00:00 2001
From: joBr99 <29555657+joBr99@users.noreply.github.com>
Date: Sun, 29 Jan 2023 21:10:38 +0100
Subject: [PATCH] fix theme

---
 apps/nspanel-lovelace-ui/luibackend/pages.py |  3 +++
 apps/nspanel-lovelace-ui/luibackend/theme.py | 17 +++--------------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/apps/nspanel-lovelace-ui/luibackend/pages.py b/apps/nspanel-lovelace-ui/luibackend/pages.py
index 3ad30936..d570e11c 100644
--- a/apps/nspanel-lovelace-ui/luibackend/pages.py
+++ b/apps/nspanel-lovelace-ui/luibackend/pages.py
@@ -139,6 +139,9 @@ class LuiPagesGen(object):
             item_str += self.generate_entities_item(item, "cardEntities")
 
         self._send_mqtt_msg(f"weatherUpdate{item_str}")
+        # send color if configured in screensaver
+        if theme is not None:
+            self._send_mqtt_msg(get_screensaver_color_output(theme=theme))
 
     def update_status_icons(self):
         status_res = ""
diff --git a/apps/nspanel-lovelace-ui/luibackend/theme.py b/apps/nspanel-lovelace-ui/luibackend/theme.py
index cdba1b9b..5ed43187 100644
--- a/apps/nspanel-lovelace-ui/luibackend/theme.py
+++ b/apps/nspanel-lovelace-ui/luibackend/theme.py
@@ -30,23 +30,12 @@ default_screensaver_color_mapping = {
 def get_screensaver_color_output(theme, state=None):
     color_output = "color"
     for key in default_screensaver_color_mapping:
-        color_output += f"~{map_color(key=key, theme=theme, state=state)}"
+        color_output += f"~{map_color(key=key, theme=theme)}"
     return color_output
 
-def map_color(key, theme, state=None):
+def map_color(key, theme):
     config_color = default_screensaver_color_mapping[key]
 #   Use theme color if set
     if key in theme:
         config_color = rgb_dec565(theme[key])
-#   Use Autocolouring for weather
-    elif state is not None:
-        if key in ["tMainIcon", "tF1Icon", "tF2Icon", "tF3Icon", "tF4Icon"]:
-            config_color = map_weather_icon_color(key=key, theme=theme, state=state)
-    return config_color
-
-def map_weather_icon_color(key, theme, state):
-    if key in state and state[key] in theme:
-        config_color = rgb_dec565(theme[state[key]])
-    else:
-        config_color = "65535"
-    return config_color
+    return config_color
\ No newline at end of file