Merge branch 'release/1.2.10'

ygini · Jul 10, 2017 · 884dabf · 884dabf
2 parents d38407d + 16449a7
commit 884dabf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 18 deletions.
diff --git a/src/Hello IT/AppDelegate.m b/src/Hello IT/AppDelegate.m
@@ -60,21 +60,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
                                                                   @"content": @[
                                                                           @{@"functionIdentifier": @"public.title",
                                                                             @"settings": @{
-                                                                                    @"title": @"Hello IT default content",
-                                                                                    }
-                                                                            },
-                                                                          @{@"functionIdentifier": @"public.open.resource",
-                                                                            @"settings": @{
-                                                                                    @"title": @"Hello IT Documentation",
-                                                                                    @"URL": @"https://github.com/ygini/Hello-IT/wiki",
-                                                                                    @"imagePath": @"/System/Library/CoreServices/CoreTypes.bundle/Contents/Resources/HelpIcon.icns"
-
-                                                                                    }
-                                                                            },
-                                                                          @{@"functionIdentifier": @"public.open.resource",
-                                                                            @"settings": @{
-                                                                                    @"title": @"The page needed to deploy your custom content",
-                                                                                    @"URL": @"https://github.com/ygini/Hello-IT/wiki/Preferences"
+                                                                                    @"title": @"You Mac isn't managed, please call your IT support",
                                                                                     }
                                                                             },
                                                                           @{@"functionIdentifier": @"public.script.item",
@@ -225,7 +211,8 @@ - (void)updateStatusItem {
         self.statusItem.image = icon;
     } else {
         NSColor *textColor = nil;
-
+        NSString *osxMode = [[NSUserDefaults standardUserDefaults] stringForKey:@"AppleInterfaceStyle"];
+
         switch (self.testState) {
             case HITPluginTestStateError:
                 textColor = [NSColor redColor];
@@ -237,7 +224,11 @@ - (void)updateStatusItem {
                 textColor = [NSColor orangeColor];
                 break;
             default:
-                textColor = [NSColor blackColor];
+                if ([osxMode isEqualToString:@"Dark"]) {
+                    textColor = [NSColor whiteColor];
+                } else {
+                    textColor = [NSColor blackColor];
+                }
                 break;
         }
 

diff --git a/src/Hello IT/Info.plist b/src/Hello IT/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.9</string>
+	<string>1.2.10</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>