diff --git a/Mac/AppAssets.swift b/Mac/AppAssets.swift index d679f248e..a1649d307 100644 --- a/Mac/AppAssets.swift +++ b/Mac/AppAssets.swift @@ -48,6 +48,8 @@ struct AppAssets { return RSImage(named: "accountTheOldReader") }() + static let nnwFeedIcon = RSImage(named: "feedIcon")! + @available(macOS 11.0, *) static var addNewSidebarItemImage: RSImage = { return NSImage(systemSymbolName: "plus", accessibilityDescription: nil)! diff --git a/Mac/Resources/Assets.xcassets/FeedIcon.imageset/Contents.json b/Mac/Resources/Assets.xcassets/FeedIcon.imageset/Contents.json new file mode 100644 index 000000000..2467ddc46 --- /dev/null +++ b/Mac/Resources/Assets.xcassets/FeedIcon.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "FeedIcon 2.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "FeedIcon.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "FeedIcon 1.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Mac/Resources/Assets.xcassets/FeedIcon.imageset/FeedIcon 1.png b/Mac/Resources/Assets.xcassets/FeedIcon.imageset/FeedIcon 1.png new file mode 100644 index 000000000..7551d44a7 Binary files /dev/null and b/Mac/Resources/Assets.xcassets/FeedIcon.imageset/FeedIcon 1.png differ diff --git a/Mac/Resources/Assets.xcassets/FeedIcon.imageset/FeedIcon 2.png b/Mac/Resources/Assets.xcassets/FeedIcon.imageset/FeedIcon 2.png new file mode 100644 index 000000000..7551d44a7 Binary files /dev/null and b/Mac/Resources/Assets.xcassets/FeedIcon.imageset/FeedIcon 2.png differ diff --git a/Mac/Resources/Assets.xcassets/FeedIcon.imageset/FeedIcon.png b/Mac/Resources/Assets.xcassets/FeedIcon.imageset/FeedIcon.png new file mode 100644 index 000000000..7551d44a7 Binary files /dev/null and b/Mac/Resources/Assets.xcassets/FeedIcon.imageset/FeedIcon.png differ diff --git a/Shared/Extensions/RSImage-AppIcons.swift b/Shared/Extensions/RSImage-AppIcons.swift index df5670732..f464eef33 100644 --- a/Shared/Extensions/RSImage-AppIcons.swift +++ b/Shared/Extensions/RSImage-AppIcons.swift @@ -33,4 +33,6 @@ extension IconImage { } return nil }() + + static let nnwFeedIcon = IconImage(AppAssets.nnwFeedIcon) } diff --git a/Shared/Favicons/FaviconDownloader.swift b/Shared/Favicons/FaviconDownloader.swift index b0942f35b..042df87d2 100644 --- a/Shared/Favicons/FaviconDownloader.swift +++ b/Shared/Favicons/FaviconDownloader.swift @@ -123,7 +123,7 @@ final class FaviconDownloader { if let url = URL(string: homePageURL) { if url.host == "nnw.ranchero.com" || url.host == "netnewswire.blog" { - return IconImage.appIcon + return IconImage.nnwFeedIcon } } diff --git a/Shared/Images/FeedIconDownloader.swift b/Shared/Images/FeedIconDownloader.swift index c4284289e..f86513a1a 100644 --- a/Shared/Images/FeedIconDownloader.swift +++ b/Shared/Images/FeedIconDownloader.swift @@ -52,7 +52,7 @@ public final class FeedIconDownloader { } if let homePageURLString = feed.homePageURL, let homePageURL = URL(string: homePageURLString), (homePageURL.host == "nnw.ranchero.com" || homePageURL.host == "netnewswire.blog") { - return IconImage.appIcon + return IconImage.nnwFeedIcon } func checkHomePageURL() {