From 433cfda2955ff03e6ffe4286274621801dc14e6b Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Mon, 29 Aug 2022 11:57:15 +0200
Subject: [PATCH] remove Emoji func; add FontAwesome func

---
 blocks/acpi/main.go | 4 ++--
 blocks/date/main.go | 2 +-
 blocks/rss/main.go  | 2 +-
 rendering/emoji.go  | 5 ++---
 rendering/text.go   | 2 +-
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/blocks/acpi/main.go b/blocks/acpi/main.go
index f221b0c..da5aedc 100644
--- a/blocks/acpi/main.go
+++ b/blocks/acpi/main.go
@@ -51,7 +51,7 @@ func main() {
 
 func CreateChargingBlock(level int) string {
 	value := fmt.Sprintf("%d%%", level)
-	symbol := r.Emoji(emoji.UpArrow)
+	symbol := string(emoji.UpArrow)
 	options := r.NewBlockOptions()
 	options.FullText = r.TextWithPadding(fmt.Sprintf("%s %s", value, symbol), CreateFB(level))
 
@@ -62,7 +62,7 @@ func CreateChargingBlock(level int) string {
 
 func CreateDischargingBlock(level int) string {
 	value := fmt.Sprintf("%d%%", level)
-	symbol := r.Emoji(emoji.DownArrow)
+	symbol := string(emoji.DownArrow)
 
 	block := r.Block("battery", r.BlockOptions{
 		FullText: r.TextWithPadding(fmt.Sprintf("%s %s", value, symbol), CreateFB(level)),
diff --git a/blocks/date/main.go b/blocks/date/main.go
index f579be8..8b622bc 100644
--- a/blocks/date/main.go
+++ b/blocks/date/main.go
@@ -28,7 +28,7 @@ func main() {
 		go runCalendar(&wg)
 	}
 
-	symbol := r.Emoji(emoji.Calendar)
+	symbol := string(emoji.Calendar)
 	date := timefmt.Format(now, argFormat)
 
 	options := r.NewBlockOptions()
diff --git a/blocks/rss/main.go b/blocks/rss/main.go
index b694bf4..cd5fb4d 100644
--- a/blocks/rss/main.go
+++ b/blocks/rss/main.go
@@ -42,7 +42,7 @@ func main() {
 	body, _ := io.ReadAll(resp.Body)
 	content := string(body)
 	count := strings.Count(content, "<item") + strings.Count(content, "<entry")
-	label := "<span font='FontAwesome'>\uf09e</span>"
+	label := r.FontAwesome("\uf09e")
 
 	fb := r.FB{
 		Foreground: os.Args[4],
diff --git a/rendering/emoji.go b/rendering/emoji.go
index 9821b1c..5448c5f 100644
--- a/rendering/emoji.go
+++ b/rendering/emoji.go
@@ -2,9 +2,8 @@ package rendering
 
 import (
 	"fmt"
-	"github.com/enescakir/emoji"
 )
 
-func Emoji(e emoji.Emoji) string {
-	return fmt.Sprintf("<span font='FontAwesome'>%s</span>", e)
+func FontAwesome(str string) string {
+	return fmt.Sprintf(`<span font="FontAwesome">%s</span>`, str)
 }
diff --git a/rendering/text.go b/rendering/text.go
index 91a8f0a..e12ec67 100644
--- a/rendering/text.go
+++ b/rendering/text.go
@@ -18,7 +18,7 @@ func Text(text string, fb FB) string {
 		fb.Background = Color("default_background")
 	}
 
-	return fmt.Sprintf("<span background='%s' foreground='%s'>%s</span>", fb.Background, fb.Foreground, text)
+	return fmt.Sprintf(`<span background="%s" foreground="%s">%s</span>`, fb.Background, fb.Foreground, text)
 }
 
 func TextWithPadding(text string, fb FB) string {