Tint with accent color

relikd · Jan 17, 2020 · 51dd688 · 51dd688
1 parent 3524286
commit 51dd688
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,9 +11,9 @@ and this project does adhere to [Semantic Versioning](https://semver.org/spec/v2
 ## [1.1.0] - 2020-01-17
 ### Added
 - *QuickLook*: Thumbnail previews for OPML files (QLOPML v1.3)
+- *Status Bar Menu*: Tint menu bar icon with Accent color (macOS 10.14+)
 
 ### Fixed
-- *Status Bar Menu*: Tint menu bar icon on macOS 10.14+
 - Resolved Xcode warnings in Xcode 11
 
 

diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "relikd/RSXML2" "v2.0.0"
+github "relikd/RSXML2" "f1a02fabbdece48e3f7835725c65a7589d98782f"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1 +1 @@
-github "relikd/RSXML2" "v2.0.0"
+github "relikd/RSXML2" "f1a02fabbdece48e3f7835725c65a7589d98782f"
diff --git a/baRSS/Info.plist b/baRSS/Info.plist
@@ -70,7 +70,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>14598</string>
+	<string>14603</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.news</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/baRSS/NSCategories/NSColor+Ext.m b/baRSS/NSCategories/NSColor+Ext.m
@@ -38,7 +38,11 @@ + (instancetype)menuBarIconColor {
 	static NSColor *color;
 	static dispatch_once_t onceToken;
 	dispatch_once(&onceToken, ^{
-		color = UserPrefsColor(Pref_colorStatusIconTint, [self rssOrange]);
+		if (@available(macOS 10.14, *)) {
+			color = UserPrefsColor(Pref_colorStatusIconTint, [NSColor controlAccentColor]);
+		} else {
+			color = UserPrefsColor(Pref_colorStatusIconTint, [self rssOrange]);
+		}
 	});
 	return color;
 }
@@ -47,7 +51,11 @@ + (instancetype)unreadIndicatorColor {
 	static NSColor *color;
 	static dispatch_once_t onceToken;
 	dispatch_once(&onceToken, ^{
-		color = UserPrefsColor(Pref_colorUnreadIndicator, [NSColor systemBlueColor]);
+		if (@available(macOS 10.14, *)) {
+			color = UserPrefsColor(Pref_colorStatusIconTint, [NSColor controlAccentColor]);
+		} else {
+			color = UserPrefsColor(Pref_colorStatusIconTint, [NSColor systemBlueColor]);
+		}
 	});
 	return color;
 }