Refactor icon stuff

Author: svilenmarkov

docs/configuration.md

@@ -188,7 +188,7 @@ This assumes that the config you want to print is in your current working direct
 
 ## Icons
 
-For widgets which provide you with the ability to specify icons such as the monitor, bookmarks, docker containers, etc, you can use the `icon` property to specify a URL to an image. Alternatively, you can also use icon names from multiple libraries via prefixes:
+For widgets which provide you with the ability to specify icons such as the monitor, bookmarks, docker containers, etc, you can use the `icon` property to specify a URL to an image or use icon names from multiple libraries via prefixes:
 
 ```yml
 icon: si:immich # si for Simple icons https://simpleicons.org/

internal/glance/config-fields.go

@@ -131,18 +131,15 @@ func (d *durationField) UnmarshalYAML(node *yaml.Node) error {
 
 type customIconField struct {
 	URL        template.URL
-	IsFlatIcon bool
-	// TODO: along with whether the icon is flat, we also need to know
-	// whether the icon is black or white by default in order to properly
-	// invert the color based on the theme being light or dark
+	AutoInvert bool
 }
 
 func newCustomIconField(value string) customIconField {
 	const autoInvertPrefix = "auto-invert "
 	field := customIconField{}
 
 	if strings.HasPrefix(value, autoInvertPrefix) {
-		field.IsFlatIcon = true
+		field.AutoInvert = true
 		value = strings.TrimPrefix(value, autoInvertPrefix)
 	}
 
@@ -164,12 +161,12 @@ func newCustomIconField(value string) customIconField {
 
 	switch prefix {
 	case "si":
-		field.IsFlatIcon = true
+		field.AutoInvert = true
 		field.URL = template.URL("https://cdn.jsdelivr.net/npm/simple-icons@latest/icons/" + basename + ".svg")
 	case "di":
 		field.URL = template.URL("https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/" + ext + "/" + basename + "." + ext)
 	case "mdi":
-		field.IsFlatIcon = true
+		field.AutoInvert = true
 		field.URL = template.URL("https://cdn.jsdelivr.net/npm/@mdi/svg@latest/svg/" + basename + ".svg")
 	case "sh":
 		field.URL = template.URL("https://cdn.jsdelivr.net/gh/selfhst/icons/" + ext + "/" + basename + "." + ext)

internal/glance/templates/bookmarks.html

@@ -13,7 +13,7 @@
             <div class="flex items-center gap-10">
                 {{- if ne "" .Icon.URL }}
                 <div class="bookmarks-icon-container">
-                    <img class="bookmarks-icon{{ if .Icon.IsFlatIcon }} flat-icon{{ end }}" src="{{ .Icon.URL }}" alt="" loading="lazy">
+                    <img class="bookmarks-icon{{ if .Icon.AutoInvert }} flat-icon{{ end }}" src="{{ .Icon.URL }}" alt="" loading="lazy">
                 </div>
                 {{- end }}
                 <a href="{{ .URL | safeURL }}" class="bookmarks-link {{ if .HideArrow }}bookmarks-link-no-arrow {{ end }}color-highlight size-h4" {{ if .Target }}target="{{ .Target }}"{{ end }} rel="noreferrer">{{ .Title }}</a>

internal/glance/templates/docker-containers.html

@@ -5,7 +5,7 @@
     {{- range .Containers }}
     <li class="docker-container flex items-center gap-15">
         <div class="shrink-0" data-popover-type="html" data-popover-position="above" data-popover-offset="0.25" data-popover-margin="0.1rem" data-popover-max-width="400px" aria-hidden="true">
-            <img class="docker-container-icon{{ if .Icon.IsFlatIcon }} flat-icon{{ end }}" src="{{ .Icon.URL }}" alt="" loading="lazy">
+            <img class="docker-container-icon{{ if .Icon.AutoInvert }} flat-icon{{ end }}" src="{{ .Icon.URL }}" alt="" loading="lazy">
             <div data-popover-html>
                 <div class="color-highlight text-truncate block">{{ .Image }}</div>
                 <div>{{ .StateText }}</div>

internal/glance/templates/monitor.html

@@ -22,7 +22,7 @@
 
 {{ define "site" }}
 {{ if .Icon.URL }}
-<img class="monitor-site-icon{{ if .Icon.IsFlatIcon }} flat-icon{{ end }}" src="{{ .Icon.URL }}" alt="" loading="lazy">
+<img class="monitor-site-icon{{ if .Icon.AutoInvert }} flat-icon{{ end }}" src="{{ .Icon.URL }}" alt="" loading="lazy">
 {{ end }}
 <div class="grow min-width-0">
     <a class="size-h3 color-highlight text-truncate block" href="{{ .URL | safeURL }}" {{ if not .SameTab }}target="_blank"{{ end }} rel="noreferrer">{{ .Title }}</a>