Skip to content

Commit d32ad60

Browse files
tonskytonsky
committed
0.2.3 added filled and hollow, removed alternative versions of black and white (closes #84)
1 parent d7e312d commit d32ad60

13 files changed

Lines changed: 56 additions & 67 deletions

‎AnyBar.xcodeproj/project.pbxproj‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,31 +10,32 @@
1010
7648BAC31AA5A50B003DA28F /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = C5AB32C41A8F9091002258B6 /* MainMenu.xib */; };
1111
C03A3D3E1AA78DAD0030B668 /* AnyBar.sdef in Resources */ = {isa = PBXBuildFile; fileRef = C03A3D3D1AA78DAD0030B668 /* AnyBar.sdef */; };
1212
C03A3D431AA7A6540030B668 /* AnyBarApp.m in Sources */ = {isa = PBXBuildFile; fileRef = C03A3D421AA7A6540030B668 /* AnyBarApp.m */; };
13+
C504CCFB25DEE28400DDEE71 /* filled@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C504CCF925DEE28400DDEE71 /* filled@2x.png */; };
14+
C504CCFC25DEE28400DDEE71 /* hollow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C504CCFA25DEE28400DDEE71 /* hollow@2x.png */; };
1315
C5AB32BF1A8F9091002258B6 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = C5AB32BE1A8F9091002258B6 /* AppDelegate.m */; };
1416
C5AB32C11A8F9091002258B6 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = C5AB32C01A8F9091002258B6 /* main.m */; };
1517
C5AB32C31A8F9091002258B6 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C5AB32C21A8F9091002258B6 /* Images.xcassets */; };
1618
C5AB32E71A8F9B4E002258B6 /* GCDAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = C5AB32E41A8F9B4E002258B6 /* GCDAsyncSocket.m */; };
1719
C5AB32E81A8F9B4E002258B6 /* GCDAsyncUdpSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = C5AB32E61A8F9B4E002258B6 /* GCDAsyncUdpSocket.m */; };
18-
C5E0271D1AA6435E0032F2E9 /* black_alt@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C5E027101AA6435E0032F2E9 /* black_alt@2x.png */; };
1920
C5E0271E1AA6435E0032F2E9 /* black@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C5E027111AA6435E0032F2E9 /* black@2x.png */; };
2021
C5E0271F1AA6435E0032F2E9 /* blue@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C5E027121AA6435E0032F2E9 /* blue@2x.png */; };
2122
C5E027201AA6435E0032F2E9 /* cyan@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C5E027131AA6435E0032F2E9 /* cyan@2x.png */; };
2223
C5E027211AA6435E0032F2E9 /* green@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C5E027141AA6435E0032F2E9 /* green@2x.png */; };
2324
C5E027221AA6435E0032F2E9 /* orange@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C5E027151AA6435E0032F2E9 /* orange@2x.png */; };
2425
C5E027231AA6435E0032F2E9 /* purple@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C5E027161AA6435E0032F2E9 /* purple@2x.png */; };
2526
C5E027241AA6435E0032F2E9 /* red@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C5E027171AA6435E0032F2E9 /* red@2x.png */; };
26-
C5E027271AA6435E0032F2E9 /* white_alt@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C5E0271A1AA6435E0032F2E9 /* white_alt@2x.png */; };
2727
C5E027281AA6435E0032F2E9 /* white@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C5E0271B1AA6435E0032F2E9 /* white@2x.png */; };
2828
C5E027291AA6435E0032F2E9 /* yellow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C5E0271C1AA6435E0032F2E9 /* yellow@2x.png */; };
2929
C5E0272F1AA64BD90032F2E9 /* exclamation@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C5E0272C1AA64BD90032F2E9 /* exclamation@2x.png */; };
30-
C5E027301AA64BD90032F2E9 /* question_alt@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C5E0272D1AA64BD90032F2E9 /* question_alt@2x.png */; };
3130
C5E027311AA64BD90032F2E9 /* question@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C5E0272E1AA64BD90032F2E9 /* question@2x.png */; };
3231
/* End PBXBuildFile section */
3332

3433
/* Begin PBXFileReference section */
3534
C03A3D3D1AA78DAD0030B668 /* AnyBar.sdef */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = AnyBar.sdef; sourceTree = "<group>"; };
3635
C03A3D411AA7A6540030B668 /* AnyBarApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnyBarApp.h; sourceTree = "<group>"; };
3736
C03A3D421AA7A6540030B668 /* AnyBarApp.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AnyBarApp.m; sourceTree = "<group>"; };
37+
C504CCF925DEE28400DDEE71 /* filled@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "filled@2x.png"; sourceTree = "<group>"; };
38+
C504CCFA25DEE28400DDEE71 /* hollow@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "hollow@2x.png"; sourceTree = "<group>"; };
3839
C511DFFB1AA4E9CF00DEE15F /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
3940
C5AB32B81A8F9091002258B6 /* AnyBar.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = AnyBar.app; sourceTree = BUILT_PRODUCTS_DIR; };
4041
C5AB32BC1A8F9091002258B6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -47,19 +48,16 @@
4748
C5AB32E41A8F9B4E002258B6 /* GCDAsyncSocket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDAsyncSocket.m; sourceTree = "<group>"; };
4849
C5AB32E51A8F9B4E002258B6 /* GCDAsyncUdpSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDAsyncUdpSocket.h; sourceTree = "<group>"; };
4950
C5AB32E61A8F9B4E002258B6 /* GCDAsyncUdpSocket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDAsyncUdpSocket.m; sourceTree = "<group>"; };
50-
C5E027101AA6435E0032F2E9 /* black_alt@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "black_alt@2x.png"; sourceTree = "<group>"; };
5151
C5E027111AA6435E0032F2E9 /* black@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "black@2x.png"; sourceTree = "<group>"; };
5252
C5E027121AA6435E0032F2E9 /* blue@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "blue@2x.png"; sourceTree = "<group>"; };
5353
C5E027131AA6435E0032F2E9 /* cyan@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "cyan@2x.png"; sourceTree = "<group>"; };
5454
C5E027141AA6435E0032F2E9 /* green@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "green@2x.png"; sourceTree = "<group>"; };
5555
C5E027151AA6435E0032F2E9 /* orange@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "orange@2x.png"; sourceTree = "<group>"; };
5656
C5E027161AA6435E0032F2E9 /* purple@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "purple@2x.png"; sourceTree = "<group>"; };
5757
C5E027171AA6435E0032F2E9 /* red@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "red@2x.png"; sourceTree = "<group>"; };
58-
C5E0271A1AA6435E0032F2E9 /* white_alt@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "white_alt@2x.png"; sourceTree = "<group>"; };
5958
C5E0271B1AA6435E0032F2E9 /* white@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "white@2x.png"; sourceTree = "<group>"; };
6059
C5E0271C1AA6435E0032F2E9 /* yellow@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "yellow@2x.png"; sourceTree = "<group>"; };
6160
C5E0272C1AA64BD90032F2E9 /* exclamation@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "exclamation@2x.png"; sourceTree = "<group>"; };
62-
C5E0272D1AA64BD90032F2E9 /* question_alt@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "question_alt@2x.png"; sourceTree = "<group>"; };
6361
C5E0272E1AA64BD90032F2E9 /* question@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "question@2x.png"; sourceTree = "<group>"; };
6462
/* End PBXFileReference section */
6563

@@ -77,18 +75,17 @@
7775
7648BAAC1AA5A3C0003DA28F /* Resources */ = {
7876
isa = PBXGroup;
7977
children = (
78+
C504CCF925DEE28400DDEE71 /* filled@2x.png */,
79+
C504CCFA25DEE28400DDEE71 /* hollow@2x.png */,
8080
C5E0272C1AA64BD90032F2E9 /* exclamation@2x.png */,
81-
C5E0272D1AA64BD90032F2E9 /* question_alt@2x.png */,
8281
C5E0272E1AA64BD90032F2E9 /* question@2x.png */,
83-
C5E027101AA6435E0032F2E9 /* black_alt@2x.png */,
8482
C5E027111AA6435E0032F2E9 /* black@2x.png */,
8583
C5E027121AA6435E0032F2E9 /* blue@2x.png */,
8684
C5E027131AA6435E0032F2E9 /* cyan@2x.png */,
8785
C5E027141AA6435E0032F2E9 /* green@2x.png */,
8886
C5E027151AA6435E0032F2E9 /* orange@2x.png */,
8987
C5E027161AA6435E0032F2E9 /* purple@2x.png */,
9088
C5E027171AA6435E0032F2E9 /* red@2x.png */,
91-
C5E0271A1AA6435E0032F2E9 /* white_alt@2x.png */,
9289
C5E0271B1AA6435E0032F2E9 /* white@2x.png */,
9390
C5E0271C1AA6435E0032F2E9 /* yellow@2x.png */,
9491
);
@@ -204,18 +201,17 @@
204201
C5AB32C31A8F9091002258B6 /* Images.xcassets in Resources */,
205202
C5E027291AA6435E0032F2E9 /* yellow@2x.png in Resources */,
206203
C5E027311AA64BD90032F2E9 /* question@2x.png in Resources */,
207-
C5E027301AA64BD90032F2E9 /* question_alt@2x.png in Resources */,
208-
C5E027271AA6435E0032F2E9 /* white_alt@2x.png in Resources */,
209204
C5E027281AA6435E0032F2E9 /* white@2x.png in Resources */,
210205
7648BAC31AA5A50B003DA28F /* MainMenu.xib in Resources */,
211206
C5E027211AA6435E0032F2E9 /* green@2x.png in Resources */,
212207
C5E0272F1AA64BD90032F2E9 /* exclamation@2x.png in Resources */,
213208
C5E0271E1AA6435E0032F2E9 /* black@2x.png in Resources */,
214209
C5E027201AA6435E0032F2E9 /* cyan@2x.png in Resources */,
210+
C504CCFB25DEE28400DDEE71 /* filled@2x.png in Resources */,
215211
C5E0271F1AA6435E0032F2E9 /* blue@2x.png in Resources */,
216212
C5E027221AA6435E0032F2E9 /* orange@2x.png in Resources */,
217213
C03A3D3E1AA78DAD0030B668 /* AnyBar.sdef in Resources */,
218-
C5E0271D1AA6435E0032F2E9 /* black_alt@2x.png in Resources */,
214+
C504CCFC25DEE28400DDEE71 /* hollow@2x.png in Resources */,
219215
);
220216
runOnlyForDeploymentPostprocessing = 0;
221217
};
@@ -337,10 +333,11 @@
337333
buildSettings = {
338334
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
339335
COMBINE_HIDPI_IMAGES = YES;
336+
CURRENT_PROJECT_VERSION = 8;
340337
INFOPLIST_FILE = AnyBar/Info.plist;
341338
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
342339
MACOSX_DEPLOYMENT_TARGET = 10.9;
343-
MARKETING_VERSION = 0.2.2;
340+
MARKETING_VERSION = 0.2.3;
344341
PRODUCT_BUNDLE_IDENTIFIER = "tonsky.$(PRODUCT_NAME:rfc1034identifier)";
345342
PRODUCT_NAME = "$(TARGET_NAME)";
346343
};
@@ -351,10 +348,11 @@
351348
buildSettings = {
352349
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
353350
COMBINE_HIDPI_IMAGES = YES;
351+
CURRENT_PROJECT_VERSION = 8;
354352
INFOPLIST_FILE = AnyBar/Info.plist;
355353
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
356354
MACOSX_DEPLOYMENT_TARGET = 10.9;
357-
MARKETING_VERSION = 0.2.2;
355+
MARKETING_VERSION = 0.2.3;
358356
PRODUCT_BUNDLE_IDENTIFIER = "tonsky.$(PRODUCT_NAME:rfc1034identifier)";
359357
PRODUCT_NAME = "$(TARGET_NAME)";
360358
};

‎AnyBar/AppDelegate.m‎

Lines changed: 18 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ @interface AppDelegate()
1414
@property (strong, nonatomic) NSStatusItem *statusItem;
1515
@property (strong, nonatomic) GCDAsyncUdpSocket *udpSocket;
1616
@property (strong, nonatomic) NSString *imageName;
17-
@property (assign, nonatomic) BOOL dark;
1817
@property (assign, nonatomic) int udpPort;
1918
@property (assign, nonatomic) NSString *appTitle;
2019

@@ -24,9 +23,9 @@ @implementation AppDelegate
2423

2524
-(void)applicationDidFinishLaunching:(NSNotification *)aNotification {
2625
_udpPort = -1;
27-
_imageName = [self readStringFromEnvironmentVariable:@"ANYBAR_INIT" usingDefault:@"white"];
26+
_imageName = [self readStringFromEnvironmentVariable:@"ANYBAR_INIT" usingDefault:@"hollow"];
2827
self.statusItem = [self initializeStatusBarItem];
29-
[self refreshDarkMode];
28+
[self setImage:_imageName];
3029

3130
@try {
3231
_udpPort = [self getUdpPort];
@@ -37,6 +36,7 @@ -(void)applicationDidFinishLaunching:(NSNotification *)aNotification {
3736
@catch(NSException *ex) {
3837
NSLog(@"Error: %@: %@", ex.name, ex.reason);
3938
_statusItem.image = [NSImage imageNamed:@"exclamation@2x.png"];
39+
[_statusItem.image setTemplate:NO];
4040
}
4141
@finally {
4242
NSString *portTitle = [NSString stringWithFormat:@"UDP port: %@", _udpPort >= 0 ? [NSNumber numberWithInt:_udpPort] : @"unavailable"];
@@ -49,12 +49,6 @@ -(void)applicationDidFinishLaunching:(NSNotification *)aNotification {
4949

5050
_statusItem.menu = menu;
5151
}
52-
53-
NSDistributedNotificationCenter *center = [NSDistributedNotificationCenter defaultCenter];
54-
[center addObserver: self
55-
selector: @selector(refreshDarkMode)
56-
name: @"AppleInterfaceThemeChangedNotification"
57-
object: nil];
5852
}
5953

6054
-(void)applicationWillTerminate:(NSNotification *)aNotification {
@@ -78,15 +72,6 @@ -(int) getUdpPort {
7872
return port;
7973
}
8074

81-
- (void)refreshDarkMode {
82-
NSString *osxMode = [[NSUserDefaults standardUserDefaults] stringForKey:@"AppleInterfaceStyle"];
83-
if ([osxMode isEqualToString:@"Dark"])
84-
self.dark = YES;
85-
else
86-
self.dark = NO;
87-
[self setImage:_imageName];
88-
}
89-
9075
-(GCDAsyncUdpSocket*)initializeUdpSocket:(int)port {
9176
NSError *error = nil;
9277
GCDAsyncUdpSocket *udpSocket = [[GCDAsyncUdpSocket alloc]
@@ -138,31 +123,27 @@ -(NSString*)homedirImagePath:(NSString *)name {
138123
}
139124

140125
-(void)setImage:(NSString*) name {
141-
142126
NSImage *image = nil;
143-
if (_dark)
144-
image = [self tryImage:[self bundledImagePath:[name stringByAppendingString:@"_alt@2x"]]];
127+
image = [self tryImage:[self homedirImagePath:[name stringByAppendingString:@"@2x"]]];
145128
if (!image)
146-
image = [self tryImage:[self bundledImagePath:[name stringByAppendingString:@"@2x"]]];
147-
if (_dark && !image)
148-
image = [self tryImage:[self homedirImagePath:[name stringByAppendingString:@"_alt"]]];
149-
if (_dark && !image)
150-
image = [self tryImage:[self homedirImagePath:[name stringByAppendingString:@"_alt@2x"]]];
129+
image = [self tryImage:[self homedirImagePath:name]];
151130
if (!image)
152-
image = [self tryImage:[self homedirImagePath:[name stringByAppendingString:@"@2x"]]];
131+
image = [self tryImage:[self bundledImagePath:[name stringByAppendingString:@"@2x"]]];
153132
if (!image)
154-
image = [self tryImage:[self homedirImagePath:name]];
133+
image = [self tryImage:[self bundledImagePath:name]];
155134
if (!image) {
156-
if (_dark)
157-
image = [self tryImage:[self bundledImagePath:@"question_alt@2x"]];
158-
else
159-
image = [self tryImage:[self bundledImagePath:@"question@2x"]];
160135
NSLog(@"Cannot find image '%@'", name);
136+
image = [self tryImage:[self bundledImagePath:@"question@2x"]];
137+
_statusItem.image = image;
138+
[_statusItem.image setTemplate:NO];
139+
} else {
140+
_statusItem.image = image;
141+
if ([name isEqualToString:@"filled"] || [name isEqualToString:@"hollow"])
142+
[_statusItem.image setTemplate:YES];
143+
else
144+
[_statusItem.image setTemplate:NO];
145+
_imageName = name;
161146
}
162-
163-
_statusItem.image = image;
164-
[_statusItem.image setTemplate:NO];
165-
_imageName = name;
166147
}
167148

168149
-(void)processUdpSocketMsg:(GCDAsyncUdpSocket *)sock withData:(NSData *)data
@@ -177,7 +158,7 @@ -(void)processUdpSocketMsg:(GCDAsyncUdpSocket *)sock withData:(NSData *)data
177158

178159
-(NSStatusItem*) initializeStatusBarItem {
179160
NSStatusItem *statusItem = [[NSStatusBar systemStatusBar] statusItemWithLength:NSVariableStatusItemLength];
180-
statusItem.alternateImage = [NSImage imageNamed:@"white_alt@2x.png"];
161+
// statusItem.image = [NSImage imageNamed:@"white@2x.png"];
181162
statusItem.highlightMode = YES;
182163
return statusItem;
183164
}

‎AnyBar/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<key>CFBundleSignature</key>
2222
<string>????</string>
2323
<key>CFBundleVersion</key>
24-
<string>7</string>
24+
<string>$(CURRENT_PROJECT_VERSION)</string>
2525
<key>LSMinimumSystemVersion</key>
2626
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
2727
<key>LSUIElement</key>

‎AnyBar/Resources/black@2x.png‎

495 Bytes
Loading

‎AnyBar/Resources/black_alt@2x.png‎

-391 Bytes
Binary file not shown.

‎AnyBar/Resources/filled@2x.png‎

359 Bytes
Loading

‎AnyBar/Resources/hollow@2x.png‎

468 Bytes
Loading

‎AnyBar/Resources/question@2x.png‎

109 Bytes
Loading

‎AnyBar/Resources/question_alt@2x.png‎

-721 Bytes
Binary file not shown.

‎AnyBar/Resources/white@2x.png‎

431 Bytes
Loading

0 commit comments

Comments
 (0)