Use go:embed for bundling the icon

Jacalz · Jun 6, 2022 · d6fea8b · d6fea8b
1 parent 63363d2
commit d6fea8b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 18 deletions.
diff --git a/internal/assets/assets.go b/internal/assets/assets.go
@@ -1,8 +1,15 @@
 // Package assets contains bundled static resources.
 package assets
 
-//go:generate fyne bundle -package assets -o bundled.go icon
+import (
+	_ "embed"
 
-// AppIcon contains the main application icon.
-// TODO: Use go:embed for the next big release.
-var AppIcon = resourceIcon512Png
+	"fyne.io/fyne/v2"
+)
+
+//go:embed icon/icon-512.png
+var icon []byte
+
+var Icon = &fyne.StaticResource{
+	StaticContent: icon,
+}
diff --git a/internal/assets/bundled.go b/internal/assets/bundled.go
diff --git a/internal/ui/about.go b/internal/ui/about.go
@@ -32,7 +32,7 @@ func newAbout() *about {
 }
 
 func (a *about) buildUI() *fyne.Container {
-	a.icon = canvas.NewImageFromResource(assets.AppIcon)
+	a.icon = canvas.NewImageFromResource(assets.Icon)
 	a.icon.SetMinSize(fyne.NewSize(256, 256))
 
 	a.nameLabel = newBoldLabel("Rymdport")

diff --git a/main.go b/main.go
@@ -10,7 +10,7 @@ import (
 
 func main() {
 	a := app.NewWithID("io.github.jacalz.rymdport")
-	a.SetIcon(assets.AppIcon)
+	a.SetIcon(assets.Icon)
 	w := a.NewWindow("Rymdport")
 
 	w.SetContent(ui.Create(a, w))