[BasicUI] Add support for framework7 icons (#2013)

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
openhab · Aug 13, 2023 · 391f0fd · 391f0fd
1 parent 034d8b9
commit 391f0fd
Show file tree

Hide file tree

Showing 8 changed files with 67 additions and 1 deletion.
diff --git a/bundles/org.openhab.ui.basic/gulpfile.js b/bundles/org.openhab.ui.basic/gulpfile.js
@@ -17,7 +17,9 @@
 	var paths = {
 	        FontLibs: [
 			'./node_modules/material-design-icons/iconfont/MaterialIcons-Regular.woff*',
-			'./node_modules/material-design-icons/iconfont/MaterialIcons-Regular.ttf'
+			'./node_modules/material-design-icons/iconfont/MaterialIcons-Regular.ttf',
+			'./node_modules/framework7-icons/fonts/Framework7Icons-Regular.woff*',
+			'./node_modules/framework7-icons/fonts/Framework7Icons-Regular.ttf'
 	        ]
 	    };
 

diff --git a/bundles/org.openhab.ui.basic/package-lock.json b/bundles/org.openhab.ui.basic/package-lock.json
diff --git a/bundles/org.openhab.ui.basic/package.json b/bundles/org.openhab.ui.basic/package.json
@@ -11,6 +11,7 @@
     "gulp-sass": "^5.0.0",
     "gulp-uglify": "^3.0.2",
     "material-design-icons": "^3.0.1",
+    "framework7-icons": "^5.0.5",
     "node-sass": "^8.0.0"
   }
 }
diff --git a/...b.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/AbstractWidgetRenderer.java b/...b.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/AbstractWidgetRenderer.java
@@ -61,6 +61,7 @@ public abstract class AbstractWidgetRenderer implements WidgetRenderer {
     private static final String ICON_SOURCE_IF = "if";
     private static final String ICON_SOURCE_ICONIFY = "iconify";
     private static final String ICON_SOURCE_MATERIAL = "material";
+    private static final String ICON_SOURCE_FRAMEWORK7 = "f7";
     private static final String ICON_SET_OH_CLASSIC = "classic";
     private static final String DEFAULT_ICON_SOURCE = ICON_SOURCE_OH;
     private static final String DEFAULT_ICON_SET = ICON_SET_OH_CLASSIC;
@@ -176,6 +177,9 @@ private String preprocessIcon(String originalSnippet, Widget w, boolean ignoreSt
                 case ICON_SOURCE_MATERIAL:
                     iconSnippet = getSnippet("icon_material");
                     break;
+                case ICON_SOURCE_FRAMEWORK7:
+                    iconSnippet = getSnippet("icon_framework7");
+                    break;
                 default:
                     break;
             }

diff --git a/bundles/org.openhab.ui.basic/src/main/resources/snippets/icon_framework7.html b/bundles/org.openhab.ui.basic/src/main/resources/snippets/icon_framework7.html
@@ -0,0 +1 @@
+<spam class="f7-icons">%icon_name%</spam>
diff --git a/bundles/org.openhab.ui.basic/src/main/resources/snippets/main.html b/bundles/org.openhab.ui.basic/src/main/resources/snippets/main.html
@@ -25,6 +25,7 @@
 
 		<link rel="stylesheet" type="text/css" href="mdl/material.min.css" />
 		<link rel="stylesheet" type="text/css" href="material-icons.css" />
+		<link rel="stylesheet" type="text/css" href="framework7-icons.css" />
 		<link rel="stylesheet" type="text/css" href="smarthome.css" />
 
 		<script type="application/json" id="config">{"webAudio":%config.web-audio%}</script>

diff --git a/bundles/org.openhab.ui.basic/src/main/resources/web/framework7-icons.css b/bundles/org.openhab.ui.basic/src/main/resources/web/framework7-icons.css
@@ -0,0 +1,33 @@
+@font-face {
+  font-family: 'Framework7 Icons';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Framework7 Icons'),
+       local('Framework7Icons-Regular'),
+       url('fonts/Framework7Icons-Regular.woff2') format('woff2'),
+       url('fonts/Framework7Icons-Regular.woff') format('woff'),
+       url('fonts/Framework7Icons-Regular.ttf') format('truetype');
+}
+
+.f7-icons,
+.framework7-icons {
+  font-family: 'Framework7 Icons';
+  font-weight: normal;
+  font-style: normal;
+  font-size: 28px;
+  line-height: 1;
+  letter-spacing: normal;
+  text-transform: none;
+  display: inline-block;
+  white-space: nowrap;
+  word-wrap: normal;
+  direction: ltr;
+  -webkit-font-smoothing: antialiased;
+  text-rendering: optimizeLegibility;
+  -moz-osx-font-smoothing: grayscale;
+  -webkit-font-feature-settings: 'liga';
+  -moz-font-feature-settings: 'liga=1';
+  -moz-font-feature-settings: 'liga';
+  font-feature-settings: 'liga';
+  text-align: center;
+}
diff --git a/bundles/org.openhab.ui.basic/web-src/_layout.scss b/bundles/org.openhab.ui.basic/web-src/_layout.scss
@@ -170,6 +170,16 @@
 				font-size: 28px;
 			}
 		}
+		.f7-icons {
+			font-size: 32px;
+			vertical-align: middle;
+			html:not(.ui-icons-enabled) & {
+				display: none;
+			}
+			html.ui-layout-condensed & {
+				font-size: 28px;
+			}
+		}
 	}
 	&__label {
 		@media screen and (max-width: $layout-tablet-size-threshold) {