Merge pull request #15 from Bunn/remove-anonymous-gist

Since GitHub removed support for anonymous gists....
Bunn · Oct 7, 2019 · 60b727a · 60b727a
2 parents e3e5299 + 247ff09
commit 60b727a
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 12 deletions.
diff --git a/macGist.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/macGist.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/macGist/Assets.xcassets/x-icon.imageset/Contents.json b/macGist/Assets.xcassets/x-icon.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "x-icon.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/macGist/Assets.xcassets/x-icon.imageset/x-icon.png b/macGist/Assets.xcassets/x-icon.imageset/x-icon.png
diff --git a/macGist/Assets.xcassets/x-icon.imageset/[email protected] b/macGist/Assets.xcassets/x-icon.imageset/[email protected]
diff --git a/macGist/Menu.swift b/macGist/Menu.swift
@@ -9,20 +9,23 @@
 import Foundation
 import AppKit
 
-enum Images {
+public enum Images {
     case standardIcon
     case checkmarkIcon
+    case failureIcon
 
-    var image: NSImage? {
-        var image: NSImage?
+    var image: NSImage {
+        var image: NSImage
 
         switch self {
         case .standardIcon:
-            image = NSImage(named: "icon")
+            image = NSImage(named: "icon")!
         case .checkmarkIcon:
-            image = NSImage(named: "check_white_icon")
+            image = NSImage(named: "check_white_icon")!
+        case .failureIcon:
+            image = NSImage(named: "x-icon")!
         }
-        image?.isTemplate = true
+        image.isTemplate = true
         return image
     }
 }
@@ -39,15 +42,11 @@ class Menu {
         let githubAPI = GitHubAPI()
 
         if githubAPI.isAuthenticated {
-            let authenticatedItem = NSMenuItem(title: "Authenticated Gist", action: #selector(Menu.createAuthenticatedGist), keyEquivalent: "")
+            let authenticatedItem = NSMenuItem(title: "Post Gist", action: #selector(Menu.createAuthenticatedGist), keyEquivalent: "")
             authenticatedItem.target = self
             menu.addItem(authenticatedItem)
         }
 
-        let anonymousItem = NSMenuItem(title: "Anonymous Gist", action: #selector(Menu.createAnonymousGist), keyEquivalent: "")
-        anonymousItem.target = self
-        menu.addItem(anonymousItem)
-
         let settingsMenuItem = NSMenuItem(title: "Settings", action: #selector(Menu.openSettings), keyEquivalent: "")
         settingsMenuItem.target = self
         menu.addItem(settingsMenuItem)
@@ -65,8 +64,16 @@ class Menu {
     }
 
     private func displaySuccessIcon() {
+        displayTemporary(icon: Images.checkmarkIcon.image)
+    }
+
+    private func displayFailureIcon() {
+        displayTemporary(icon: Images.failureIcon.image)
+    }
+
+    private func displayTemporary(icon: NSImage) {
         DispatchQueue.main.async {
-            self.item.image = Images.checkmarkIcon.image
+            self.item.image = icon
         }
 
         let deadlineTime = DispatchTime.now() + .seconds(2)
@@ -83,6 +90,8 @@ class Menu {
                 PasteboardHelper().save(string: value)
                 self.displaySuccessIcon()
                 self.notificationHelper.sendNotification(withIdentifier: value)
+            } else {
+                self.displayFailureIcon()
             }
         }
     }