FreshRSS/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire.git synced 2024-12-25 09:11:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use an image for feeds that don’t have favicons. Currently using the image at /System/Library/CoreServices/CoreTypes.bundle/Contents/Resources/BookmarkIcon.icns — but this might change.

Browse Source
This commit is contained in:
Brent Simmons 2017-12-28 18:11:12 -08:00
parent ab80e91ea7
commit 953a97afd7
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Evergreen/AppDelegate.swift
View File

@ -27,6 +27,12 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations,
var feedIconDownloader: FeedIconDownloader!
var appName: String!
lazy var genericFeedImage: NSImage? = {
let path = "/System/Library/CoreServices/CoreTypes.bundle/Contents/Resources/BookmarkIcon.icns"
let image = NSImage(contentsOfFile: path)
return image
}()
var unreadCount = 0 {
didSet {
if unreadCount != oldValue {

5
Evergreen/FeedList/FeedListViewController.swift
View File

@ -111,7 +111,10 @@ extension FeedListViewController: NSOutlineViewDelegate {
return NSImage(named: NSImage.Name.folder)
}
else if let feed = node.representedObject as? FeedListFeed {
return appDelegate.faviconDownloader.favicon(withHomePageURL: feed.homePageURL)
if let image = appDelegate.faviconDownloader.favicon(withHomePageURL: feed.homePageURL) {
return image
}
return appDelegate.genericFeedImage
}
return nil
}

5
Evergreen/MainWindow/Sidebar/SidebarViewController.swift
View File

@ -522,7 +522,10 @@ private extension SidebarViewController {
extension Feed: SmallIconProvider {
var smallIcon: NSImage? {
return appDelegate.faviconDownloader.favicon(for: self)
if let image = appDelegate.faviconDownloader.favicon(for: self) {
return image
}
return appDelegate.genericFeedImage
}
}