[BasicUI] Integrate ChartThemes in BasicUI themes (#4336)

Take a matching ChartTheme for the current BasicUI theme. Signed-off-by: Holger Reichert <mail@h0lger.de>
eclipse-archived · Sep 26, 2017 · e135552 · e135552
1 parent ccca71e
commit e135552
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/...marthome.ui.basic/src/main/java/org/eclipse/smarthome/ui/basic/internal/WebAppConfig.java b/...marthome.ui.basic/src/main/java/org/eclipse/smarthome/ui/basic/internal/WebAppConfig.java
@@ -21,7 +21,10 @@
 public class WebAppConfig {
     private final static String DEFAULT_SITEMAP = "default";
     private final static String DEFAULT_ICON_TYPE = "png";
-    private final static String DEFAULT_THEME = "default";
+
+    public final static String THEME_NAME_DEFAULT = "default";
+    public final static String THEME_NAME_DARK = "dark";
+    private final static String DEFAULT_THEME = THEME_NAME_DEFAULT;
 
     private String defaultSitemap = DEFAULT_SITEMAP;
     private String iconType = DEFAULT_ICON_TYPE;

diff --git a/....ui.basic/src/main/java/org/eclipse/smarthome/ui/basic/internal/render/ChartRenderer.java b/....ui.basic/src/main/java/org/eclipse/smarthome/ui/basic/internal/render/ChartRenderer.java
@@ -16,6 +16,7 @@
 import org.eclipse.smarthome.core.items.ItemNotFoundException;
 import org.eclipse.smarthome.model.sitemap.Chart;
 import org.eclipse.smarthome.model.sitemap.Widget;
+import org.eclipse.smarthome.ui.basic.internal.WebAppConfig;
 import org.eclipse.smarthome.ui.basic.render.RenderException;
 import org.eclipse.smarthome.ui.basic.render.WidgetRenderer;
 import org.slf4j.Logger;
@@ -55,13 +56,28 @@ public EList<Widget> renderWidget(Widget w, StringBuilder sb) throws RenderExcep
             if (chart.getService() != null) {
                 chartUrl += "&service=" + chart.getService();
             }
+            // if legend parameter is given, add correspondending GET parameter
             if (chart.getLegend() != null) {
                 if (chart.getLegend()) {
                     chartUrl += "&legend=true";
                 } else {
                     chartUrl += "&legend=false";
                 }
             }
+            // add theme GET parameter
+            String chartTheme = null;
+            switch (config.getTheme()) {
+                case WebAppConfig.THEME_NAME_DEFAULT:
+                    chartTheme = "bright";
+                    break;
+                case WebAppConfig.THEME_NAME_DARK:
+                    chartTheme = "dark";
+                    break;
+            }
+            if (chartTheme != null) {
+                chartUrl += "&theme=" + chartTheme;
+            }
+            // add timestamp to circumvent browser cache
             String url = chartUrl + "&t=" + (new Date()).getTime();
 
             String snippet = getSnippet("chart");