Track info shown in two lines. Different icons.

carlosefonseca · Mar 26, 2020 · 6812826 · 6812826
1 parent 95746d6
commit 6812826
Show file tree

Hide file tree

Showing 8 changed files with 66 additions and 20 deletions.
diff --git a/Statusfy.xcodeproj/project.pbxproj b/Statusfy.xcodeproj/project.pbxproj
@@ -208,6 +208,10 @@
 				LastUpgradeCheck = 1130;
 				ORGANIZATIONNAME = "Paul Young";
 				TargetAttributes = {
+					2C87974B18FF06E600AE2A45 = {
+						DevelopmentTeam = VF8BTMF3F4;
+						ProvisioningStyle = Automatic;
+					};
 					2C87976C18FF06E600AE2A45 = {
 						TestTargetID = 2C87974B18FF06E600AE2A45;
 					};
@@ -434,14 +438,17 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "-";
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEVELOPMENT_TEAM = VF8BTMF3F4;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Statusfy/Statusfy-Prefix.pch";
 				INFOPLIST_FILE = "Statusfy/Statusfy-Info.plist";
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
-				PRODUCT_BUNDLE_IDENTIFIER = "me.paulyoung.${PRODUCT_NAME:rfc1034identifier}";
+				PRODUCT_BUNDLE_IDENTIFIER = com.carlosefonseca.Statusfy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				WRAPPER_EXTENSION = app;
 			};
 			name = Debug;
@@ -450,14 +457,17 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "-";
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEVELOPMENT_TEAM = VF8BTMF3F4;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Statusfy/Statusfy-Prefix.pch";
 				INFOPLIST_FILE = "Statusfy/Statusfy-Info.plist";
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
-				PRODUCT_BUNDLE_IDENTIFIER = "me.paulyoung.${PRODUCT_NAME:rfc1034identifier}";
+				PRODUCT_BUNDLE_IDENTIFIER = com.carlosefonseca.Statusfy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				WRAPPER_EXTENSION = app;
 			};
 			name = Release;

diff --git a/Statusfy/Images.xcassets/Contents.json b/Statusfy/Images.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Statusfy/Images.xcassets/Pause.imageset/Contents.json b/Statusfy/Images.xcassets/Pause.imageset/Contents.json
@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "filename" : "Pause.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/Statusfy/Images.xcassets/Pause.imageset/Pause.pdf b/Statusfy/Images.xcassets/Pause.imageset/Pause.pdf
diff --git a/Statusfy/Images.xcassets/Play.imageset/Contents.json b/Statusfy/Images.xcassets/Play.imageset/Contents.json
@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "filename" : "Play_1.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/Statusfy/Images.xcassets/Play.imageset/Play_1.pdf b/Statusfy/Images.xcassets/Play.imageset/Play_1.pdf
diff --git a/Statusfy/SFYAppDelegate.m b/Statusfy/SFYAppDelegate.m
@@ -57,15 +57,18 @@ - (void)setStatusItemTitle
     NSString *artistName = [[self executeAppleScript:@"get artist of current track"] stringValue];
 
     if (trackName && artistName) {
-        NSString *titleText = [NSString stringWithFormat:@"%@ - %@", trackName, artistName];
+        NSString *titleText = [NSString stringWithFormat:@"%@\n%@", trackName, artistName];
+
+        NSAttributedString * attributtedTitleText = [[NSAttributedString alloc] initWithString:titleText
+                                                                                    attributes:@{
+                                                                                        NSFontAttributeName:[NSFont systemFontOfSize:10],
+                                                                                    }];
 
         if ([self getPlayerStateVisibility]) {
-            NSString *playerState = [self determinePlayerStateText];
-            titleText = [NSString stringWithFormat:@"%@ %@", playerState, titleText];
+            self.statusItem.image = [self determinePlayerStateImage];
         }
-
-        self.statusItem.image = nil;
-        self.statusItem.title = titleText;
+
+        self.statusItem.attributedTitle = attributtedTitleText;
     }
     else {
         NSImage *image = [NSImage imageNamed:@"status_icon"];
@@ -108,22 +111,17 @@ - (NSString *)determinePlayerStateMenuItemTitle
     return [self getPlayerStateVisibility] ? NSLocalizedString(@"Hide Player State", nil) : NSLocalizedString(@"Show Player State", nil);
 }
 
-- (NSString *)determinePlayerStateText
-{
-    NSString *playerStateText = nil;
+- (NSImage *)determinePlayerStateImage {
     NSString *playerStateConstant = [[self executeAppleScript:@"get player state"] stringValue];
-
     if ([playerStateConstant isEqualToString:@"kPSP"]) {
-        playerStateText = NSLocalizedString(@"\u25B6", nil);
+        return [NSImage imageNamed:@"Play"];
     }
     else if ([playerStateConstant isEqualToString:@"kPSp"]) {
-        playerStateText = NSLocalizedString(@"❙ ❙", nil);
+        return [NSImage imageNamed:@"Pause"];
     }
     else {
-        playerStateText = NSLocalizedString(@"\u25FB\uFE0F", nil);
+        return nil;
     }
-
-    return playerStateText;
 }
 
 #pragma mark - Toggle Dock Icon

diff --git a/Statusfy/Statusfy-Info.plist b/Statusfy/Statusfy-Info.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleIconFile</key>
 	<string></string>
 	<key>CFBundleIdentifier</key>
-	<string>me.paulyoung.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>