Icon: Replace icon with a newly rendered design

Icon has now been replaced with a newly rendered design, and code changed accordingly. Signed-off-by: Christopher Snowhill <[email protected]>
losnoco · May 2, 2022 · 2aa3ddd · 2aa3ddd
1 parent 5a47021
commit 2aa3ddd
Show file tree

Hide file tree

Showing 37 changed files with 49 additions and 49 deletions.
diff --git a/Application/DockIconController.m b/Application/DockIconController.m
@@ -30,7 +30,7 @@ - (void)stopObserving {
 	if(colorfulIcons) {
 		return [baseName stringByAppendingString:@"Colorful"];
 	} else {
-		return baseName;
+		return [baseName stringByAppendingString:@"Normal"];
 	}
 }
 
@@ -71,14 +71,14 @@ - (void)refreshDockIcon:(NSInteger)playbackStatus withProgress:(double)progressS
 	if(drawIcon) {
 		switch(playbackStatus) {
 			case CogStatusPlaying:
-				badgeImage = [NSImage imageNamed:getBadgeName(@"playDockBadge", colorfulIcons)];
+				badgeImage = [NSImage imageNamed:getBadgeName(@"Play", colorfulIcons)];
 				break;
 			case CogStatusPaused:
-				badgeImage = [NSImage imageNamed:getBadgeName(@"pauseDockBadge", colorfulIcons)];
+				badgeImage = [NSImage imageNamed:getBadgeName(@"Pause", colorfulIcons)];
 				break;
 
 			default:
-				badgeImage = [NSImage imageNamed:getBadgeName(@"stopDockBadge", colorfulIcons)];
+				badgeImage = [NSImage imageNamed:getBadgeName(@"Stop", colorfulIcons)];
 				break;
 		}
 
@@ -87,7 +87,7 @@ - (void)refreshDockIcon:(NSInteger)playbackStatus withProgress:(double)progressS
 		NSImage *newDockImage = [dockImage copy];
 		[newDockImage lockFocus];
 
-		[badgeImage drawInRect:NSMakeRect(0, 0, 128, 128)
+		[badgeImage drawInRect:NSMakeRect(0, 0, 1024, 1024)
 		              fromRect:NSMakeRect(0, 0, badgeSize.width, badgeSize.height)
 		             operation:NSCompositingOperationSourceOver
 		              fraction:1.0];
@@ -164,7 +164,7 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
 }
 
 - (void)awakeFromNib {
-	dockImage = [[NSImage imageNamed:@"icon_blank"] copy];
+	dockImage = [[NSImage imageNamed:@"Plaque"] copy];
 	lastColorfulStatus = -1;
 	lastProgressStatus = [NSNumber numberWithDouble:-1];
 	imageView = nil;

diff --git a/Cog.xcodeproj/project.pbxproj b/Cog.xcodeproj/project.pbxproj
diff --git a/...Icon Precomposed.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json b/...Icon Precomposed.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
@@ -1,61 +1,61 @@
 {
   "images" : [
     {
-      "filename" : "Cog Icon Precomposed_16.png",
+      "filename" : "icon_16x16.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "16x16"
     },
     {
-      "filename" : "Cog Icon Precomposed_16@2x.png",
+      "filename" : "icon_16x16@2x.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "16x16"
     },
     {
-      "filename" : "Cog Icon Precomposed_32.png",
+      "filename" : "icon_32x32.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "32x32"
     },
     {
-      "filename" : "Cog Icon Precomposed_32@2x.png",
+      "filename" : "icon_32x32@2x.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "32x32"
     },
     {
-      "filename" : "Cog Icon Precomposed_128.png",
+      "filename" : "icon_128x128.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "128x128"
     },
     {
-      "filename" : "Cog Icon Precomposed_128@2x.png",
+      "filename" : "icon_128x128@2x.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "128x128"
     },
     {
-      "filename" : "Cog Icon Precomposed_256.png",
+      "filename" : "icon_256x256.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "256x256"
     },
     {
-      "filename" : "Cog Icon Precomposed_256@2x.png",
+      "filename" : "icon_256x256@2x.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "256x256"
     },
     {
-      "filename" : "Cog Icon Precomposed_512.png",
+      "filename" : "icon_512x512.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "512x512"
     },
     {
-      "filename" : "Cog Icon Precomposed_512@2x.png",
+      "filename" : "icon_512x512@2x.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "512x512"

diff --git a/CogAssets.xcassets/AppIcon.appiconset/icon_128x128.png b/CogAssets.xcassets/AppIcon.appiconset/icon_128x128.png
diff --git a/CogAssets.xcassets/AppIcon.appiconset/[email protected] b/CogAssets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/CogAssets.xcassets/AppIcon.appiconset/icon_16x16.png b/CogAssets.xcassets/AppIcon.appiconset/icon_16x16.png
diff --git a/CogAssets.xcassets/AppIcon.appiconset/[email protected] b/CogAssets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/CogAssets.xcassets/AppIcon.appiconset/icon_256x256.png b/CogAssets.xcassets/AppIcon.appiconset/icon_256x256.png
diff --git a/CogAssets.xcassets/AppIcon.appiconset/[email protected] b/CogAssets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/CogAssets.xcassets/AppIcon.appiconset/icon_32x32.png b/CogAssets.xcassets/AppIcon.appiconset/icon_32x32.png
diff --git a/CogAssets.xcassets/AppIcon.appiconset/[email protected] b/CogAssets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/CogAssets.xcassets/AppIcon.appiconset/icon_512x512.png b/CogAssets.xcassets/AppIcon.appiconset/icon_512x512.png
diff --git a/CogAssets.xcassets/AppIcon.appiconset/[email protected] b/CogAssets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/CogAssets.xcassets/Cog Icon Precomposed.appiconset/Cog Icon Precomposed_128.png b/CogAssets.xcassets/Cog Icon Precomposed.appiconset/Cog Icon Precomposed_128.png
diff --git a/CogAssets.xcassets/Cog Icon Precomposed.appiconset/Cog Icon [email protected] b/CogAssets.xcassets/Cog Icon Precomposed.appiconset/Cog Icon [email protected]
diff --git a/CogAssets.xcassets/Cog Icon Precomposed.appiconset/Cog Icon Precomposed_16.png b/CogAssets.xcassets/Cog Icon Precomposed.appiconset/Cog Icon Precomposed_16.png
diff --git a/CogAssets.xcassets/Cog Icon Precomposed.appiconset/Cog Icon [email protected] b/CogAssets.xcassets/Cog Icon Precomposed.appiconset/Cog Icon [email protected]
diff --git a/CogAssets.xcassets/Cog Icon Precomposed.appiconset/Cog Icon Precomposed_256.png b/CogAssets.xcassets/Cog Icon Precomposed.appiconset/Cog Icon Precomposed_256.png
diff --git a/CogAssets.xcassets/Cog Icon Precomposed.appiconset/Cog Icon [email protected] b/CogAssets.xcassets/Cog Icon Precomposed.appiconset/Cog Icon [email protected]
diff --git a/CogAssets.xcassets/Cog Icon Precomposed.appiconset/Cog Icon Precomposed_32.png b/CogAssets.xcassets/Cog Icon Precomposed.appiconset/Cog Icon Precomposed_32.png
diff --git a/CogAssets.xcassets/Cog Icon Precomposed.appiconset/Cog Icon [email protected] b/CogAssets.xcassets/Cog Icon Precomposed.appiconset/Cog Icon [email protected]
diff --git a/CogAssets.xcassets/Cog Icon Precomposed.appiconset/Cog Icon Precomposed_512.png b/CogAssets.xcassets/Cog Icon Precomposed.appiconset/Cog Icon Precomposed_512.png
diff --git a/CogAssets.xcassets/Cog Icon Precomposed.appiconset/Cog Icon [email protected] b/CogAssets.xcassets/Cog Icon Precomposed.appiconset/Cog Icon [email protected]
diff --git a/Icons/icon_blank.icns b/Icons/icon_blank.icns
diff --git a/Images/PauseColorful.png b/Images/PauseColorful.png
diff --git a/Images/PauseNormal.png b/Images/PauseNormal.png
diff --git a/Images/Plaque.png b/Images/Plaque.png
diff --git a/Images/PlayColorful.png b/Images/PlayColorful.png
diff --git a/Images/PlayNormal.png b/Images/PlayNormal.png
diff --git a/Images/StopColorful.png b/Images/StopColorful.png
diff --git a/Images/StopNormal.png b/Images/StopNormal.png
diff --git a/Images/pauseDockBadge.png b/Images/pauseDockBadge.png
diff --git a/Images/pauseDockBadgeColorful.png b/Images/pauseDockBadgeColorful.png
diff --git a/Images/playDockBadge.png b/Images/playDockBadge.png
diff --git a/Images/playDockBadgeColorful.png b/Images/playDockBadgeColorful.png
diff --git a/Images/stopDockBadge.png b/Images/stopDockBadge.png
diff --git a/Images/stopDockBadgeColorful.png b/Images/stopDockBadgeColorful.png