Merge pull request #44 from tommoor/template-images

Template Images (OSX dark mode compatibility)
deivuh · May 2, 2016 · 30b29f8 · 30b29f8
2 parents fefa0d5 + eed95b0
commit 30b29f8
Show file tree

Hide file tree

Showing 43 changed files with 244 additions and 174 deletions.
diff --git a/DODropletManager/AppDelegate.m b/DODropletManager/AppDelegate.m
@@ -127,7 +127,7 @@ - (void) createMenuItems {
         _statusItem = [[NSStatusBar systemStatusBar] statusItemWithLength:NSVariableStatusItemLength];
 
         _statusItem.title = @"";
-        _statusItem.alternateImage = [NSImage imageNamed:@"DropletStatusIconHighlighted"];
+        _statusItem.alternateImage = [NSImage imageNamed:@"dropletStatusIconHighlightedTemplate"];
         _statusItem.highlightMode = YES;
         menu = [[NSMenu alloc] init];
         addItems = YES;
@@ -140,7 +140,7 @@ - (void) createMenuItems {
         }
     }
 
-    [self setStatusImage: @"DropletStatusIcon"];
+    [self setStatusImage: @"dropletStatusIconTemplate"];
 
     int dropletMIIndex = 0;
 
@@ -175,45 +175,45 @@ - (void) createMenuItems {
 
         NSMenuItem *viewOnWebMI = [[NSMenuItem alloc] initWithTitle:@"View on website" action:@selector(viewDropletOnBrowser:) keyEquivalent:@""];
 
-        [viewOnWebMI setImage:[NSImage imageNamed:@"info-icon"]];
+        [viewOnWebMI setImage:[NSImage imageNamed:@"infoIconTemplate"]];
         [viewOnWebMI setRepresentedObject:droplet];
 
         [submenu addItem:viewOnWebMI];
 
         NSMenuItem *connectToDroplet = [[NSMenuItem alloc] initWithTitle:@"Connect to Droplet" action:@selector(establishSSHConnectionToDroplet:) keyEquivalent:@""];
 
-        [connectToDroplet setImage:[NSImage imageNamed:@"ssh-icon"]];
+        [connectToDroplet setImage:[NSImage imageNamed:@"sshIconTemplate"]];
         [connectToDroplet setRepresentedObject:droplet];
 
         [submenu addItem:connectToDroplet];
 
         NSMenuItem *rebootMI = [[NSMenuItem alloc] initWithTitle:@"Reboot" action:@selector(confirmReboot:) keyEquivalent:@""];
 
-        [rebootMI setImage:[NSImage imageNamed:@"reboot-icon"]];
+        [rebootMI setImage:[NSImage imageNamed:@"rebootIconTemplate"]];
         [rebootMI setRepresentedObject:droplet];
 
         [submenu addItem:rebootMI];
 
         if (droplet.active) {
             NSMenuItem *shutdownMI = [[NSMenuItem alloc] initWithTitle:@"Shutdown" action:@selector(confirmShutdown:) keyEquivalent:@""];
 
-            [shutdownMI setImage:[NSImage imageNamed:@"power-icon"]];
+            [shutdownMI setImage:[NSImage imageNamed:@"powerIconTemplate"]];
             [shutdownMI setRepresentedObject:droplet];
 
             [submenu addItem:shutdownMI];
 
         } else {
 
             NSMenuItem *turnOnMI = [[NSMenuItem alloc] initWithTitle:@"Power On" action:@selector(turnOnDroplet:) keyEquivalent:@""];
-            [turnOnMI setImage:[NSImage imageNamed:@"power-icon"]];
+            [turnOnMI setImage:[NSImage imageNamed:@"powerIconTemplate"]];
             [turnOnMI setRepresentedObject:droplet];
 
             [submenu addItem:turnOnMI];
         }
 
         NSMenuItem *deleteDropletMI = [[NSMenuItem alloc] initWithTitle:@"Delete Droplet" action:@selector(confirmDropletDeletion:) keyEquivalent:@""];
 
-        [deleteDropletMI setImage:[NSImage imageNamed:@"trash-icon"]];
+        [deleteDropletMI setImage:[NSImage imageNamed:@"trashIconTemplate"]];
         [deleteDropletMI setRepresentedObject:droplet];
 
         [submenu addItem:deleteDropletMI];
@@ -465,16 +465,17 @@ - (void) refreshingTimerTick:(NSTimer*)timer {
         delta = -delta;
     }
 
-    NSImage *img1 = [NSImage imageNamed:@"DropletStatusIconHighlighted"];
-    NSImage *img2 = [NSImage imageNamed:@"DropletStatusIcon"];
+    NSImage *img1 = [NSImage imageNamed:@"dropletStatusIconHighlightedTemplate"];
+    NSImage *img2 = [NSImage imageNamed:@"dropletStatusIconTemplate"];
     NSSize size = img1.size;
     NSImage *img = [[NSImage alloc] initWithSize: size];
     NSRect r = NSMakeRect(0, 0, size.width, size.height);
     [img lockFocus];
     [img1 drawInRect: r fromRect: r operation: NSCompositeCopy fraction: 1.0];
     [img2 drawInRect: r fromRect: r operation: NSCompositeSourceOver fraction: fade];
     [img unlockFocus];
-
+    [img setTemplate:YES];
+
     _statusItem.image = img;
 }
 
@@ -497,7 +498,7 @@ - (void) receivedNotification:(NSNotification *) notification
         refreshMI.title = NSLocalizedString(@"Refresh", @"Refresh");
         refreshMI.action = @selector(refresh:);
 
-        [self setStatusImage: @"DropletStatusIconFailed"];
+        [self setStatusImage: @"dropletStatusIconFailedTemplate"];
 
     }
 }

diff --git a/DODropletManager/Images.xcassets/Contents.json b/DODropletManager/Images.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/DODropletManager/Images.xcassets/DropletStatusIcon.imageset/Contents.json b/DODropletManager/Images.xcassets/DropletStatusIcon.imageset/Contents.json
diff --git a/DODropletManager/Images.xcassets/DropletStatusIconFailed.imageset/Contents.json b/DODropletManager/Images.xcassets/DropletStatusIconFailed.imageset/Contents.json
diff --git a/...Images.xcassets/DropletStatusIconFailed.imageset/[email protected] b/...Images.xcassets/DropletStatusIconFailed.imageset/[email protected]
diff --git a/DODropletManager/Images.xcassets/DropletStatusIconHighlighted.imageset/Contents.json b/DODropletManager/Images.xcassets/DropletStatusIconHighlighted.imageset/Contents.json
diff --git a/...xcassets/DropletStatusIconHighlighted.imageset/DropletStatusIconHighlighted.png b/...xcassets/DropletStatusIconHighlighted.imageset/DropletStatusIconHighlighted.png
diff --git a/...ssets/DropletStatusIconHighlighted.imageset/[email protected] b/...ssets/DropletStatusIconHighlighted.imageset/[email protected]
diff --git a/DODropletManager/Images.xcassets/dropletStatusIconFailedTemplate.imageset/Contents.json b/DODropletManager/Images.xcassets/dropletStatusIconFailedTemplate.imageset/Contents.json
@@ -0,0 +1,25 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "DropletStatusIconFailed.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/...iled.imageset/DropletStatusIconFailed.png → ...late.imageset/DropletStatusIconFailed.png b/...iled.imageset/DropletStatusIconFailed.png → ...late.imageset/DropletStatusIconFailed.png
diff --git a/...cassets/dropletStatusIconFailedTemplate.imageset/[email protected] b/...cassets/dropletStatusIconFailedTemplate.imageset/[email protected]
diff --git a/DODropletManager/Images.xcassets/dropletStatusIconHighlightedTemplate.imageset/Contents.json b/DODropletManager/Images.xcassets/dropletStatusIconHighlightedTemplate.imageset/Contents.json
@@ -0,0 +1,25 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "DropletStatusIconHighlighted.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/.../dropletStatusIconHighlightedTemplate.imageset/DropletStatusIconHighlighted.png b/.../dropletStatusIconHighlightedTemplate.imageset/DropletStatusIconHighlighted.png
diff --git a/...opletStatusIconHighlightedTemplate.imageset/[email protected] b/...opletStatusIconHighlightedTemplate.imageset/[email protected]
diff --git a/DODropletManager/Images.xcassets/dropletStatusIconTemplate.imageset/Contents.json b/DODropletManager/Images.xcassets/dropletStatusIconTemplate.imageset/Contents.json
@@ -0,0 +1,25 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "DropletStatusIcon.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/...StatusIcon.imageset/DropletStatusIcon.png → ...onTemplate.imageset/DropletStatusIcon.png b/...StatusIcon.imageset/DropletStatusIcon.png → ...onTemplate.imageset/DropletStatusIcon.png
diff --git a/...tusIcon.imageset/[email protected] → ...emplate.imageset/[email protected] b/...tusIcon.imageset/[email protected] → ...emplate.imageset/[email protected]
diff --git a/DODropletManager/Images.xcassets/info-icon.imageset/Contents.json b/DODropletManager/Images.xcassets/info-icon.imageset/Contents.json
diff --git a/DODropletManager/Images.xcassets/infoIconTemplate.imageset/Contents.json b/DODropletManager/Images.xcassets/infoIconTemplate.imageset/Contents.json
@@ -0,0 +1,25 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "info-icon.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/...xcassets/info-icon.imageset/info-icon.png → ...s/infoIconTemplate.imageset/info-icon.png b/...xcassets/info-icon.imageset/info-icon.png → ...s/infoIconTemplate.imageset/info-icon.png
diff --git a/...ssets/info-icon.imageset/[email protected] → ...nfoIconTemplate.imageset/[email protected] b/...ssets/info-icon.imageset/[email protected] → ...nfoIconTemplate.imageset/[email protected]
diff --git a/DODropletManager/Images.xcassets/power-icon-highlighted.imageset/Contents.json b/DODropletManager/Images.xcassets/power-icon-highlighted.imageset/Contents.json
diff --git a/DODropletManager/Images.xcassets/power-icon.imageset/Contents.json b/DODropletManager/Images.xcassets/power-icon.imageset/Contents.json
diff --git a/DODropletManager/Images.xcassets/powerIconHighlightedTemplate.imageset/Contents.json b/DODropletManager/Images.xcassets/powerIconHighlightedTemplate.imageset/Contents.json
@@ -0,0 +1,25 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "power-icon-highlighted.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/...ghted.imageset/power-icon-highlighted.png → ...plate.imageset/power-icon-highlighted.png b/...ghted.imageset/power-icon-highlighted.png → ...plate.imageset/power-icon-highlighted.png
diff --git a/...ed.imageset/[email protected] → ...te.imageset/[email protected] b/...ed.imageset/[email protected] → ...te.imageset/[email protected]
diff --git a/DODropletManager/Images.xcassets/powerIconTemplate.imageset/Contents.json b/DODropletManager/Images.xcassets/powerIconTemplate.imageset/Contents.json
@@ -0,0 +1,25 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "power-icon.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/...assets/power-icon.imageset/power-icon.png → ...powerIconTemplate.imageset/power-icon.png b/...assets/power-icon.imageset/power-icon.png → ...powerIconTemplate.imageset/power-icon.png
diff --git a/...ets/power-icon.imageset/[email protected] → ...erIconTemplate.imageset/[email protected] b/...ets/power-icon.imageset/[email protected] → ...erIconTemplate.imageset/[email protected]