Merge branch 'develop'

lanayotech · Dec 6, 2019 · 56232e9 · 56232e9
2 parents 1eecf38 + f89def1
commit 56232e9
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 26 deletions.
diff --git a/Podfile.lock b/Podfile.lock
@@ -1,12 +1,16 @@
 PODS:
-  - Sparkle (1.18.1)
+  - Sparkle (1.22.0)
 
 DEPENDENCIES:
   - Sparkle
 
+SPEC REPOS:
+  trunk:
+    - Sparkle
+
 SPEC CHECKSUMS:
-  Sparkle: 06ea33170007c5937ee54da481b4481af98fac79
+  Sparkle: 593ac2e677c07bcb6c3b22d621240e7cbedaab57
 
 PODFILE CHECKSUM: e45240f106f07044e1efd268e5e93b5b059de8a3
 
-COCOAPODS: 1.3.1
+COCOAPODS: 1.8.4
diff --git a/Vagrant Manager.xcodeproj/project.pbxproj b/Vagrant Manager.xcodeproj/project.pbxproj
@@ -695,7 +695,6 @@
 				B1357A6B187CEB3B00811CBC /* Resources */,
 				83BCB0451921B1AA00206967 /* CopyFiles */,
 				1A2A14C45607EB080326A596 /* [CP] Embed Pods Frameworks */,
-				95E23E880A25E17C3F0E72DD /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -721,6 +720,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -825,7 +825,7 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-Vagrant Manager/Pods-Vagrant Manager-frameworks.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-Vagrant Manager/Pods-Vagrant Manager-frameworks.sh",
 				"${PODS_ROOT}/Sparkle/Sparkle.framework",
 				"${PODS_ROOT}/Sparkle/Sparkle.framework.dSYM",
 			);
@@ -836,22 +836,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Vagrant Manager/Pods-Vagrant Manager-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		95E23E880A25E17C3F0E72DD /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Vagrant Manager/Pods-Vagrant Manager-resources.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Vagrant Manager/Pods-Vagrant Manager-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		D168E0F13DA1DD5BD7139B64 /* [CP] Check Pods Manifest.lock */ = {
@@ -1077,6 +1062,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				COMBINE_HIDPI_IMAGES = YES;
+				CURRENT_PROJECT_VERSION = 2.7.1;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
@@ -1085,6 +1071,7 @@
 				GCC_PREFIX_HEADER = "Vagrant Manager/Vagrant Manager-Prefix.pch";
 				INFOPLIST_FILE = "Vagrant Manager/Vagrant Manager-Info.plist";
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				MARKETING_VERSION = 2.7.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "lanayo.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
@@ -1097,6 +1084,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				COMBINE_HIDPI_IMAGES = YES;
+				CURRENT_PROJECT_VERSION = 2.7.1;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
@@ -1105,6 +1093,7 @@
 				GCC_PREFIX_HEADER = "Vagrant Manager/Vagrant Manager-Prefix.pch";
 				INFOPLIST_FILE = "Vagrant Manager/Vagrant Manager-Info.plist";
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				MARKETING_VERSION = 2.7.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "lanayo.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;

diff --git a/Vagrant Manager/AboutWindow.m b/Vagrant Manager/AboutWindow.m
@@ -22,9 +22,17 @@ - (id)initWithWindow:(NSWindow *)window {
 
 - (void)windowDidLoad {
     [super windowDidLoad];
+
+    BOOL isDarkMode = [[[NSUserDefaults standardUserDefaults] stringForKey:@"AppleInterfaceStyle"] isEqualToString:@"Dark"];
+
+    NSString *styles = @"";
+
+    if (isDarkMode) {
+        styles = @"<style>body { color:#fff; } a { color: #66f; }</style>";
+    }
 
-    NSString *str = @"<div style=\"text-align:center;font-family:Arial;font-size:13px\">Copyright &copy;{YEAR} Lanayo Tech<br><br>Vagrant Manager {VERSION}<br><br>For more information visit:<br><a href=\"{URL}\">{URL}</a><br><br>or check us out on GitHub:<br><a href=\"{GITHUB_URL}\">{GITHUB_URL}</a></div>";
-
+    NSString *str = [NSString stringWithFormat:@"%@<div style=\"text-align:center;font-family:Arial;font-size:13px\">Copyright &copy;{YEAR} Lanayo Tech<br><br>Vagrant Manager {VERSION}<br><br>For more information visit:<br><a href=\"{URL}\">{URL}</a><br><br>or check us out on GitHub:<br><a href=\"{GITHUB_URL}\">{GITHUB_URL}</a></div>", styles];
+    
     NSString *dateString = [NSString stringWithCString:__DATE__ encoding:NSASCIIStringEncoding];
     NSString *yearString = [dateString substringWithRange:NSMakeRange([dateString length] - 4, 4)];
 

diff --git a/Vagrant Manager/TaskOutputWindow.m b/Vagrant Manager/TaskOutputWindow.m
@@ -117,7 +117,7 @@ - (void)receivedOutput:(NSNotification*)notif {
         if (!_isClosed) {
             //smart scrolling logic for command output
             BOOL scroll = (NSMaxY(self.outputTextView.visibleRect) == NSMaxY(self.outputTextView.bounds));
-            [self.outputTextView.textStorage appendAttributedString:[[NSAttributedString alloc] initWithString:str]];
+            [self.outputTextView.textStorage appendAttributedString:[[NSAttributedString alloc] initWithString:str attributes:@{NSForegroundColorAttributeName: NSColor.controlTextColor}]];
             if([NSFont fontWithName:@"Menlo" size:11]) {
                 [self.outputTextView.textStorage setFont:[NSFont fontWithName:@"Menlo" size:11]];
             }

diff --git a/Vagrant Manager/Vagrant Manager-Info.plist b/Vagrant Manager/Vagrant Manager-Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.7.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.7.0</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>Configuration</key>
 	<string>${CONFIGURATION}</string>
 	<key>LSApplicationCategoryType</key>