From 441c237ce87f78919a4a301512253b87a0cd02ae Mon Sep 17 00:00:00 2001
From: Kristopher Johnson <kris@kristopherjohnson.net>
Date: Mon, 28 Oct 2019 21:44:57 -0400
Subject: [PATCH] Use hourglass image rather than emoji

---
 MenubarCountdown/AppDelegate.swift            |  10 ++++++++-
 .../Assets.xcassets/Contents.json             |   6 +++++
 .../HourglassIcon.imageset/Contents.json      |  21 ++++++++++++++++++
 .../HourglassIconBlack.png                    | Bin 0 -> 1056 bytes
 4 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 MenubarCountdown/Assets.xcassets/Contents.json
 create mode 100644 MenubarCountdown/Assets.xcassets/HourglassIcon.imageset/Contents.json
 create mode 100644 MenubarCountdown/Assets.xcassets/HourglassIcon.imageset/HourglassIconBlack.png

diff --git a/MenubarCountdown/AppDelegate.swift b/MenubarCountdown/AppDelegate.swift
index 1825cb2..423688c 100644
--- a/MenubarCountdown/AppDelegate.swift
+++ b/MenubarCountdown/AppDelegate.swift
@@ -179,6 +179,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele
         else {
             timeString = NSString(format: "%02d:%02d", hours, minutes) as String
         }
+        statusItem.button?.image = nil
         statusItem.button?.title = timeString
     }
 
@@ -186,7 +187,14 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele
      Change the status item to an hourglass icon
      */
     func showStatusItemIcon() {
-        statusItem.button?.title = "⌛️"
+        statusItem.button?.title = ""
+        if let image = NSImage(named: "HourglassIcon") {
+            image.isTemplate = true
+            statusItem.button?.image = image
+        }
+        else {
+            Log.error("unable to load HourglassIcon")
+        }
     }
 
     func startBlinking() {
diff --git a/MenubarCountdown/Assets.xcassets/Contents.json b/MenubarCountdown/Assets.xcassets/Contents.json
new file mode 100644
index 0000000..da4a164
--- /dev/null
+++ b/MenubarCountdown/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/MenubarCountdown/Assets.xcassets/HourglassIcon.imageset/Contents.json b/MenubarCountdown/Assets.xcassets/HourglassIcon.imageset/Contents.json
new file mode 100644
index 0000000..00fd51c
--- /dev/null
+++ b/MenubarCountdown/Assets.xcassets/HourglassIcon.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "HourglassIconBlack.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/MenubarCountdown/Assets.xcassets/HourglassIcon.imageset/HourglassIconBlack.png b/MenubarCountdown/Assets.xcassets/HourglassIcon.imageset/HourglassIconBlack.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c532cd15ab554977b8c982b7d48997baca695ef
GIT binary patch
literal 1056
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|#^NA%Cx&(BWL^R}8&V@Y(|mmy
zw18|523AHX23C*~AogOEhO>hh4H=k#ViG_c#b^X(ivZb0?U@WLKpLdJ4TwR&1BgL<
zFzuF8nVFZa;G3FQqTraEUzDd{re~^W#9(A#XlZ3=U}a>XU}R`zY+z+*$-uz8fRTY2
ztQ)9*0TbM0p#{tcHc*~n+lin*K#H@#BeIx*fm;}a85w5H0XmPVC^ICYB*NFnDmgz_
zFEJ%QDOIl`w*aJz!KT6r$jnVGNmQuF&B-gas<2f8tFQvHLBje<3ScEA*|tg%z5xo(
z`9-M;rg|oN21<5Z3JMA~MJZ`kK`w4k?LeNbQbtKhft9{~d3m{Bxv^e;QM$gNrKP35
zfswwEkuFe$ZgFK^Nn(X=Ua>O75STeGsl~}fnFS@8`FRQ;a}$&DOG|8(lt3220mPjp
znP~`{@`|C}0(wv%B%^PrXP}Qw8_=_G_o3*jNGyP80{aSLnGMJ&E9d;&f}+&oVxXh!
zOl`o%qlh6K2T>mplv<phQws8gow*TI1F|5xhDdB0kOh%60Nropo1c=IR_T&hl4=J^
zGrEQbx<(cuury<%kERAqw{sCN;pG>F<mczu;Yf-QBajtB&9Ko2#R^g^L6QJi6qp9=
zxPUrg>B){u&A#F&Fo|`0x;Tbd2qq^i5K3?{ey%>@e4AQZ_iu5HgG`fM%sEv4$*Xxb
zxLrK$;$V33QuBEQk$R<{%>fpPFAhI7O=*46rgU2IX7Bu$OjFn-Sq?S+nDVGd(C56h
z1hdC}*Q8{FkCwuBy$#Mrd`%E#d37L_!|(70NtY7>YuW_4lxL_leR*Kc5z-^T{ZC-^
b1eH>TG8?|y-DUQnprr5V>gTe~DWM4fom(Zf

literal 0
HcmV?d00001