0.2.3 added filled and hollow, removed alternative versions of `b…

…lack` and `white` (closes #84)

AnyBar.xcodeproj/project.pbxproj

@@ -10,31 +10,32 @@
 		7648BAC31AA5A50B003DA28F /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = C5AB32C41A8F9091002258B6 /* MainMenu.xib */; };
 		C03A3D3E1AA78DAD0030B668 /* AnyBar.sdef in Resources */ = {isa = PBXBuildFile; fileRef = C03A3D3D1AA78DAD0030B668 /* AnyBar.sdef */; };
 		C03A3D431AA7A6540030B668 /* AnyBarApp.m in Sources */ = {isa = PBXBuildFile; fileRef = C03A3D421AA7A6540030B668 /* AnyBarApp.m */; };
+		C504CCFB25DEE28400DDEE71 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = C504CCF925DEE28400DDEE71 /* [email protected] */; };
+		C504CCFC25DEE28400DDEE71 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = C504CCFA25DEE28400DDEE71 /* [email protected] */; };
 		C5AB32BF1A8F9091002258B6 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = C5AB32BE1A8F9091002258B6 /* AppDelegate.m */; };
 		C5AB32C11A8F9091002258B6 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = C5AB32C01A8F9091002258B6 /* main.m */; };
 		C5AB32C31A8F9091002258B6 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C5AB32C21A8F9091002258B6 /* Images.xcassets */; };
 		C5AB32E71A8F9B4E002258B6 /* GCDAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = C5AB32E41A8F9B4E002258B6 /* GCDAsyncSocket.m */; };
 		C5AB32E81A8F9B4E002258B6 /* GCDAsyncUdpSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = C5AB32E61A8F9B4E002258B6 /* GCDAsyncUdpSocket.m */; };
-		C5E0271D1AA6435E0032F2E9 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = C5E027101AA6435E0032F2E9 /* [email protected] */; };
 		C5E0271E1AA6435E0032F2E9 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = C5E027111AA6435E0032F2E9 /* [email protected] */; };
 		C5E0271F1AA6435E0032F2E9 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = C5E027121AA6435E0032F2E9 /* [email protected] */; };
 		C5E027201AA6435E0032F2E9 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = C5E027131AA6435E0032F2E9 /* [email protected] */; };
 		C5E027211AA6435E0032F2E9 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = C5E027141AA6435E0032F2E9 /* [email protected] */; };
 		C5E027221AA6435E0032F2E9 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = C5E027151AA6435E0032F2E9 /* [email protected] */; };
 		C5E027231AA6435E0032F2E9 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = C5E027161AA6435E0032F2E9 /* [email protected] */; };
 		C5E027241AA6435E0032F2E9 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = C5E027171AA6435E0032F2E9 /* [email protected] */; };
-		C5E027271AA6435E0032F2E9 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = C5E0271A1AA6435E0032F2E9 /* [email protected] */; };
 		C5E027281AA6435E0032F2E9 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = C5E0271B1AA6435E0032F2E9 /* [email protected] */; };
 		C5E027291AA6435E0032F2E9 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = C5E0271C1AA6435E0032F2E9 /* [email protected] */; };
 		C5E0272F1AA64BD90032F2E9 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = C5E0272C1AA64BD90032F2E9 /* [email protected] */; };
-		C5E027301AA64BD90032F2E9 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = C5E0272D1AA64BD90032F2E9 /* [email protected] */; };
 		C5E027311AA64BD90032F2E9 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = C5E0272E1AA64BD90032F2E9 /* [email protected] */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
 		C03A3D3D1AA78DAD0030B668 /* AnyBar.sdef */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = AnyBar.sdef; sourceTree = "<group>"; };
 		C03A3D411AA7A6540030B668 /* AnyBarApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnyBarApp.h; sourceTree = "<group>"; };
 		C03A3D421AA7A6540030B668 /* AnyBarApp.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AnyBarApp.m; sourceTree = "<group>"; };
+		C504CCF925DEE28400DDEE71 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
+		C504CCFA25DEE28400DDEE71 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
 		C511DFFB1AA4E9CF00DEE15F /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 		C5AB32B81A8F9091002258B6 /* AnyBar.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = AnyBar.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		C5AB32BC1A8F9091002258B6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -47,19 +48,16 @@
 		C5AB32E41A8F9B4E002258B6 /* GCDAsyncSocket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDAsyncSocket.m; sourceTree = "<group>"; };
 		C5AB32E51A8F9B4E002258B6 /* GCDAsyncUdpSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDAsyncUdpSocket.h; sourceTree = "<group>"; };
 		C5AB32E61A8F9B4E002258B6 /* GCDAsyncUdpSocket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDAsyncUdpSocket.m; sourceTree = "<group>"; };
-		C5E027101AA6435E0032F2E9 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
 		C5E027111AA6435E0032F2E9 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
 		C5E027121AA6435E0032F2E9 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
 		C5E027131AA6435E0032F2E9 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
 		C5E027141AA6435E0032F2E9 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
 		C5E027151AA6435E0032F2E9 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
 		C5E027161AA6435E0032F2E9 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
 		C5E027171AA6435E0032F2E9 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
-		C5E0271A1AA6435E0032F2E9 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
 		C5E0271B1AA6435E0032F2E9 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
 		C5E0271C1AA6435E0032F2E9 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
 		C5E0272C1AA64BD90032F2E9 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
-		C5E0272D1AA64BD90032F2E9 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
 		C5E0272E1AA64BD90032F2E9 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -77,18 +75,17 @@
 		7648BAAC1AA5A3C0003DA28F /* Resources */ = {
 			isa = PBXGroup;
 			children = (
+				C504CCF925DEE28400DDEE71 /* [email protected] */,
+				C504CCFA25DEE28400DDEE71 /* [email protected] */,
 				C5E0272C1AA64BD90032F2E9 /* [email protected] */,
-				C5E0272D1AA64BD90032F2E9 /* [email protected] */,
 				C5E0272E1AA64BD90032F2E9 /* [email protected] */,
-				C5E027101AA6435E0032F2E9 /* [email protected] */,
 				C5E027111AA6435E0032F2E9 /* [email protected] */,
 				C5E027121AA6435E0032F2E9 /* [email protected] */,
 				C5E027131AA6435E0032F2E9 /* [email protected] */,
 				C5E027141AA6435E0032F2E9 /* [email protected] */,
 				C5E027151AA6435E0032F2E9 /* [email protected] */,
 				C5E027161AA6435E0032F2E9 /* [email protected] */,
 				C5E027171AA6435E0032F2E9 /* [email protected] */,
-				C5E0271A1AA6435E0032F2E9 /* [email protected] */,
 				C5E0271B1AA6435E0032F2E9 /* [email protected] */,
 				C5E0271C1AA6435E0032F2E9 /* [email protected] */,
 			);
@@ -204,18 +201,17 @@
 				C5AB32C31A8F9091002258B6 /* Images.xcassets in Resources */,
 				C5E027291AA6435E0032F2E9 /* [email protected] in Resources */,
 				C5E027311AA64BD90032F2E9 /* [email protected] in Resources */,
-				C5E027301AA64BD90032F2E9 /* [email protected] in Resources */,
-				C5E027271AA6435E0032F2E9 /* [email protected] in Resources */,
 				C5E027281AA6435E0032F2E9 /* [email protected] in Resources */,
 				7648BAC31AA5A50B003DA28F /* MainMenu.xib in Resources */,
 				C5E027211AA6435E0032F2E9 /* [email protected] in Resources */,
 				C5E0272F1AA64BD90032F2E9 /* [email protected] in Resources */,
 				C5E0271E1AA6435E0032F2E9 /* [email protected] in Resources */,
 				C5E027201AA6435E0032F2E9 /* [email protected] in Resources */,
+				C504CCFB25DEE28400DDEE71 /* [email protected] in Resources */,
 				C5E0271F1AA6435E0032F2E9 /* [email protected] in Resources */,
 				C5E027221AA6435E0032F2E9 /* [email protected] in Resources */,
 				C03A3D3E1AA78DAD0030B668 /* AnyBar.sdef in Resources */,
-				C5E0271D1AA6435E0032F2E9 /* black_alt@2x.png in Resources */,
+				C504CCFC25DEE28400DDEE71 /* hollow@2x.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -337,10 +333,11 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				COMBINE_HIDPI_IMAGES = YES;
+				CURRENT_PROJECT_VERSION = 8;
 				INFOPLIST_FILE = AnyBar/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
-				MARKETING_VERSION = 0.2.2;
+				MARKETING_VERSION = 0.2.3;
 				PRODUCT_BUNDLE_IDENTIFIER = "tonsky.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -351,10 +348,11 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				COMBINE_HIDPI_IMAGES = YES;
+				CURRENT_PROJECT_VERSION = 8;
 				INFOPLIST_FILE = AnyBar/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
-				MARKETING_VERSION = 0.2.2;
+				MARKETING_VERSION = 0.2.3;
 				PRODUCT_BUNDLE_IDENTIFIER = "tonsky.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};

AnyBar/AppDelegate.m

@@ -14,7 +14,6 @@ @interface AppDelegate()
 @property (strong, nonatomic) NSStatusItem *statusItem;
 @property (strong, nonatomic) GCDAsyncUdpSocket *udpSocket;
 @property (strong, nonatomic) NSString *imageName;
-@property (assign, nonatomic) BOOL dark;
 @property (assign, nonatomic) int udpPort;
 @property (assign, nonatomic) NSString *appTitle;
 
@@ -24,9 +23,9 @@ @implementation AppDelegate
 
 -(void)applicationDidFinishLaunching:(NSNotification *)aNotification {
     _udpPort = -1;
-    _imageName = [self readStringFromEnvironmentVariable:@"ANYBAR_INIT" usingDefault:@"white"];
+    _imageName = [self readStringFromEnvironmentVariable:@"ANYBAR_INIT" usingDefault:@"hollow"];
     self.statusItem = [self initializeStatusBarItem];
-    [self refreshDarkMode];
+    [self setImage:_imageName];
 
     @try {
         _udpPort = [self getUdpPort];
@@ -37,6 +36,7 @@ -(void)applicationDidFinishLaunching:(NSNotification *)aNotification {
     @catch(NSException *ex) {
         NSLog(@"Error: %@: %@", ex.name, ex.reason);
         _statusItem.image = [NSImage imageNamed:@"[email protected]"];
+        [_statusItem.image setTemplate:NO];
     }
     @finally {
         NSString *portTitle = [NSString stringWithFormat:@"UDP port: %@", _udpPort >= 0 ? [NSNumber numberWithInt:_udpPort] : @"unavailable"];
@@ -49,12 +49,6 @@ -(void)applicationDidFinishLaunching:(NSNotification *)aNotification {
 
         _statusItem.menu = menu;
     }
-
-    NSDistributedNotificationCenter *center = [NSDistributedNotificationCenter defaultCenter];
-    [center addObserver: self
-               selector: @selector(refreshDarkMode)
-                   name: @"AppleInterfaceThemeChangedNotification"
-                 object: nil];
 }
 
 -(void)applicationWillTerminate:(NSNotification *)aNotification {
@@ -78,15 +72,6 @@ -(int) getUdpPort {
     return port;
 }
 
-- (void)refreshDarkMode {
-    NSString *osxMode = [[NSUserDefaults standardUserDefaults] stringForKey:@"AppleInterfaceStyle"];
-    if ([osxMode isEqualToString:@"Dark"])
-        self.dark = YES;
-    else
-        self.dark = NO;
-    [self setImage:_imageName];
-}
-
 -(GCDAsyncUdpSocket*)initializeUdpSocket:(int)port {
     NSError *error = nil;
     GCDAsyncUdpSocket *udpSocket = [[GCDAsyncUdpSocket alloc]
@@ -138,31 +123,27 @@ -(NSString*)homedirImagePath:(NSString *)name {
 }
 
 -(void)setImage:(NSString*) name {
-
     NSImage *image = nil;
-    if (_dark)
-        image = [self tryImage:[self bundledImagePath:[name stringByAppendingString:@"_alt@2x"]]];
+    image = [self tryImage:[self homedirImagePath:[name stringByAppendingString:@"@2x"]]];
     if (!image)
-        image = [self tryImage:[self bundledImagePath:[name stringByAppendingString:@"@2x"]]];
-    if (_dark && !image)
-        image = [self tryImage:[self homedirImagePath:[name stringByAppendingString:@"_alt"]]];
-    if (_dark && !image)
-        image = [self tryImage:[self homedirImagePath:[name stringByAppendingString:@"_alt@2x"]]];
+        image = [self tryImage:[self homedirImagePath:name]];
     if (!image)
-        image = [self tryImage:[self homedirImagePath:[name stringByAppendingString:@"@2x"]]];
+        image = [self tryImage:[self bundledImagePath:[name stringByAppendingString:@"@2x"]]];
     if (!image)
-        image = [self tryImage:[self homedirImagePath:name]];
+        image = [self tryImage:[self bundledImagePath:name]];
     if (!image) {
-        if (_dark)
-            image = [self tryImage:[self bundledImagePath:@"question_alt@2x"]];
-        else
-            image = [self tryImage:[self bundledImagePath:@"question@2x"]];
         NSLog(@"Cannot find image '%@'", name);
+        image = [self tryImage:[self bundledImagePath:@"question@2x"]];
+        _statusItem.image = image;
+        [_statusItem.image setTemplate:NO];
+    } else {
+        _statusItem.image = image;
+        if ([name isEqualToString:@"filled"] || [name isEqualToString:@"hollow"])
+            [_statusItem.image setTemplate:YES];
+        else
+            [_statusItem.image setTemplate:NO];
+        _imageName = name;
     }
-
-    _statusItem.image = image;
-    [_statusItem.image setTemplate:NO];
-    _imageName = name;
 }
 
 -(void)processUdpSocketMsg:(GCDAsyncUdpSocket *)sock withData:(NSData *)data
@@ -177,7 +158,7 @@ -(void)processUdpSocketMsg:(GCDAsyncUdpSocket *)sock withData:(NSData *)data
 
 -(NSStatusItem*) initializeStatusBarItem {
     NSStatusItem *statusItem = [[NSStatusBar systemStatusBar] statusItemWithLength:NSVariableStatusItemLength];
-    statusItem.alternateImage = [NSImage imageNamed:@"white_alt@2x.png"];
+//    statusItem.image = [NSImage imageNamed:@"white@2x.png"];
     statusItem.highlightMode = YES;
     return statusItem;
 }

AnyBar/Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>7</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>LSUIElement</key>

CHANGELOG.md

@@ -1,3 +1,7 @@
+### 0.2.3 / Feb 18, 2021
+
+- Added `filled` and `hollow`, removed alternative versions of `black` and `white` #84
+
 ### 0.2.2 / Nov 3, 2020
 
 - Specify starting color via `ANYBAR_INIT` #80 #81 thx @Gira-X

README.md

@@ -6,9 +6,9 @@ AnyBar is a small indicator for your menubar that does one simple thing: it disp
 
 ## Download
 
-Version 0.2.2:
+Version 0.2.3:
 
-<a href="https://github.com/tonsky/AnyBar/releases/download/0.2.2/AnyBar-0.2.2.zip"><img src="AnyBar/Images.xcassets/AppIcon.appiconset/[email protected]?raw=true" style="width: 128px;" width=128/></a>
+<a href="https://github.com/tonsky/AnyBar/releases/download/0.2.3/AnyBar-0.2.3.zip"><img src="AnyBar/Images.xcassets/AppIcon.appiconset/[email protected]?raw=true" style="width: 128px;" width=128/></a>
 
 Or using [Homebrew Cask](https://github.com/Homebrew/homebrew-cask):
 
@@ -34,19 +34,25 @@ echo -n "black" | nc -4u -w0 localhost 1738
 
 The following default commands change the style of the dot:
 
-<img src="AnyBar/Resources/[email protected]?raw=true" width=19 /> `white`  
-<img src="AnyBar/Resources/[email protected]?raw=true" width=19 /> `red`  
-<img src="AnyBar/Resources/[email protected]?raw=true" width=19 /> `orange`  
-<img src="AnyBar/Resources/[email protected]?raw=true" width=19 /> `yellow`  
-<img src="AnyBar/Resources/[email protected]?raw=true" width=19 /> `green`  
-<img src="AnyBar/Resources/[email protected]?raw=true" width=19 /> `cyan`  
-<img src="AnyBar/Resources/[email protected]?raw=true" width=19 /> `blue`  
-<img src="AnyBar/Resources/[email protected]?raw=true" width=19 /> `purple`  
-<img src="AnyBar/Resources/[email protected]?raw=true" width=19 /> `black`  
-<img src="AnyBar/Resources/[email protected]?raw=true" width=19 /> `question`  
-<img src="AnyBar/Resources/[email protected]?raw=true" width=19 /> `exclamation`  
-
-And one special command forces AnyBar to quit: `quit`
+| Command       | Preview                                                             |
+|---------------|---------------------------------------------------------------------|
+| `white`       | <img src="AnyBar/Resources/[email protected]?raw=true" width=15 />       |
+| `red`         | <img src="AnyBar/Resources/[email protected]?raw=true" width=15 />         |
+| `orange`      | <img src="AnyBar/Resources/[email protected]?raw=true" width=15 />      |
+| `yellow`      | <img src="AnyBar/Resources/[email protected]?raw=true" width=15 />      |
+| `green`       | <img src="AnyBar/Resources/[email protected]?raw=true" width=15 />       |
+| `cyan`        | <img src="AnyBar/Resources/[email protected]?raw=true" width=15 />        |
+| `blue`        | <img src="AnyBar/Resources/[email protected]?raw=true" width=15 />        |
+| `purple`      | <img src="AnyBar/Resources/[email protected]?raw=true" width=15 />      |
+| `black`       | <img src="AnyBar/Resources/[email protected]?raw=true" width=15 />       |
+| `question`    | <img src="AnyBar/Resources/[email protected]?raw=true" width=15 />    |
+| `exclamation` | <img src="AnyBar/Resources/[email protected]?raw=true" width=15 /> |
+| `filled`      | <img src="AnyBar/Resources/[email protected]?raw=true" width=15 />      |
+| `hollow`      | <img src="AnyBar/Resources/[email protected]?raw=true" width=15 />      |
+
+`black` and `white` always has black or white fill. On Big Sur, where text color of menubar might change depending on the wallpaper, you might want to use `filled` and `hollow` instead. They are inverted when menubar changes its appearance.
+
+To quit, send `quit`.
 
 ## Alternative clients