Add icon image to Timeline

Multiplatform/Shared/Images/ArticleIconImageLoader.swift

@@ -0,0 +1,58 @@
+//
+//  ArticleIconImageLoader.swift
+//  NetNewsWire
+//
+//  Created by Maurice Parker on 7/1/20.
+//  Copyright © 2020 Ranchero Software. All rights reserved.
+//
+
+import Foundation
+import Account
+import Articles
+
+final class ArticleIconImageLoader: ObservableObject {
+	
+	private var article: Article?
+	
+	@Published var image: IconImage?
+	
+	init() {
+		NotificationCenter.default.addObserver(self, selector: #selector(faviconDidBecomeAvailable(_:)), name: .FaviconDidBecomeAvailable, object: nil)
+		NotificationCenter.default.addObserver(self, selector: #selector(webFeedIconDidBecomeAvailable(_:)), name: .WebFeedIconDidBecomeAvailable, object: nil)
+		NotificationCenter.default.addObserver(self, selector: #selector(avatarDidBecomeAvailable(_:)), name: .AvatarDidBecomeAvailable, object: nil)
+	}
+	
+	func loadImage(for article: Article) {
+		self.article = article
+		image = article.iconImage()
+	}
+	
+}
+
+private extension ArticleIconImageLoader {
+	
+	@objc func faviconDidBecomeAvailable(_ note: Notification) {
+		guard let article = article else { return }
+		image = article.iconImage()
+	}
+
+	@objc func webFeedIconDidBecomeAvailable(_ note: Notification) {
+		guard let article = article, let noteFeed = note.userInfo?[UserInfoKey.webFeed] as? WebFeed, noteFeed == article.webFeed else {
+			return
+		}
+		image = article.iconImage()
+	}
+	
+	@objc func avatarDidBecomeAvailable(_ note: Notification) {
+		guard let article = article, let authors = article.authors, let avatarURL = note.userInfo?[UserInfoKey.url] as? String else {
+			return
+		}
+
+		for author in authors {
+			if author.avatarURL == avatarURL {
+				
+				return
+			}
+		}
+	}
+}

Multiplatform/Shared/Images/IconImageView.swift

@@ -16,7 +16,6 @@ struct IconImageView: View {
 		return Image(rsImage: iconImage.image)
 			.resizable()
 			.scaledToFit()
-			.frame(width: 20, height: 20, alignment: /*@START_MENU_TOKEN@*/.center/*@END_MENU_TOKEN@*/)
 			.cornerRadius(4)
     }
 }

Multiplatform/Shared/Sidebar/SidebarItemView.swift

@@ -18,6 +18,7 @@ struct SidebarItemView: View {
 		HStack {
 			if let image = feedIconImageLoader.image {
 				IconImageView(iconImage: image)
+					.frame(width: 20, height: 20, alignment: /*@START_MENU_TOKEN@*/.center/*@END_MENU_TOKEN@*/)
 			}
 			Text(verbatim: sidebarItem.nameForDisplay)
 			Spacer()

Multiplatform/Shared/Timeline/TimelineItemStatusView.swift

@@ -26,8 +26,11 @@ struct TimelineItemStatusView: View {
 				.frame(width: 10, height: 10, alignment: .center)
 				.foregroundColor(.yellow)
 		case .showNone:
-			Spacer()
+			AppAssets.timelineUnread
-				.frame(width: 10, height: 10, alignment: .center)
+				.resizable()
+				.frame(width: 8, height: 8, alignment: .center)
+				.padding(.all, 2)
+				.opacity(0)
 		}
 	}
 	

Multiplatform/Shared/Timeline/TimelineItemView.swift

@@ -10,17 +10,25 @@ import SwiftUI
 
 struct TimelineItemView: View {
 	
+	@StateObject var articleIconImageLoader = ArticleIconImageLoader()
 	var timelineItem: TimelineItem
 	
     var body: some View {
 		VStack {
 			HStack(alignment: .top) {
 				TimelineItemStatusView(status: timelineItem.status)
+				if let image = articleIconImageLoader.image {
+					IconImageView(iconImage: image)
+						.frame(width: AppDefaults.timelineIconSize.size.width, height: AppDefaults.timelineIconSize.size.height, alignment: /*@START_MENU_TOKEN@*/.center/*@END_MENU_TOKEN@*/)
+				}
 				Text(verbatim: timelineItem.article.title ?? "N/A")
 					.frame(maxWidth: .infinity, alignment: .leading)
 			}
 			Divider()
 		}
+		.onAppear {
+			articleIconImageLoader.loadImage(for: timelineItem.article)
+		}
     }
 }
 

NetNewsWire.xcodeproj/project.pbxproj

@@ -153,6 +153,8 @@
 		514E6C0324AD29A300AC6F6E /* TimelineItemStatusView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 514E6C0124AD29A300AC6F6E /* TimelineItemStatusView.swift */; };
 		514E6C0624AD2B5F00AC6F6E /* Image-Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 514E6C0524AD2B5F00AC6F6E /* Image-Extensions.swift */; };
 		514E6C0724AD2B5F00AC6F6E /* Image-Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 514E6C0524AD2B5F00AC6F6E /* Image-Extensions.swift */; };
+		514E6C0924AD39AD00AC6F6E /* ArticleIconImageLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 514E6C0824AD39AD00AC6F6E /* ArticleIconImageLoader.swift */; };
+		514E6C0A24AD39AD00AC6F6E /* ArticleIconImageLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 514E6C0824AD39AD00AC6F6E /* ArticleIconImageLoader.swift */; };
 		5154368B229404D1005E1CDF /* FaviconGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51EF0F76227716200050506E /* FaviconGenerator.swift */; };
 		51554C24228B71910055115A /* SyncDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51554C01228B6EB50055115A /* SyncDatabase.framework */; };
 		51554C25228B71910055115A /* SyncDatabase.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 51554C01228B6EB50055115A /* SyncDatabase.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -1792,6 +1794,7 @@
 		514E6BFE24AD255D00AC6F6E /* PreviewArticles.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreviewArticles.swift; sourceTree = "<group>"; };
 		514E6C0124AD29A300AC6F6E /* TimelineItemStatusView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineItemStatusView.swift; sourceTree = "<group>"; };
 		514E6C0524AD2B5F00AC6F6E /* Image-Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Image-Extensions.swift"; sourceTree = "<group>"; };
+		514E6C0824AD39AD00AC6F6E /* ArticleIconImageLoader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArticleIconImageLoader.swift; sourceTree = "<group>"; };
 		51554BFC228B6EB50055115A /* SyncDatabase.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SyncDatabase.xcodeproj; path = Frameworks/SyncDatabase/SyncDatabase.xcodeproj; sourceTree = SOURCE_ROOT; };
 		515A50E5243D07A90089E588 /* ExtensionPointManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExtensionPointManager.swift; sourceTree = "<group>"; };
 		515A5106243D0CCD0089E588 /* TwitterFeedProvider-Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "TwitterFeedProvider-Extensions.swift"; sourceTree = "<group>"; };
@@ -2639,6 +2642,7 @@
 		51919FB124AAB95300541E64 /* Images */ = {
 			isa = PBXGroup;
 			children = (
+				514E6C0824AD39AD00AC6F6E /* ArticleIconImageLoader.swift */,
 				51919FB224AAB97900541E64 /* FeedIconImageLoader.swift */,
 				51919FB524AABCA100541E64 /* IconImageView.swift */,
 			);
@@ -4756,6 +4760,7 @@
 				51E498F124A8085D00B667CB /* StarredFeedDelegate.swift in Sources */,
 				51E498FF24A808BB00B667CB /* SingleFaviconDownloader.swift in Sources */,
 				51E4997224A8784300B667CB /* DefaultFeedsImporter.swift in Sources */,
+				514E6C0924AD39AD00AC6F6E /* ArticleIconImageLoader.swift in Sources */,
 				51919FAF24AA8EFA00541E64 /* SidebarItemView.swift in Sources */,
 				514E6BDA24ACEA0400AC6F6E /* TimelineItemView.swift in Sources */,
 				51E4990D24A808C500B667CB /* RSHTMLMetadata+Extension.swift in Sources */,
@@ -4887,6 +4892,7 @@
 				51E498CC24A8085D00B667CB /* SearchFeedDelegate.swift in Sources */,
 				51E498C824A8085D00B667CB /* SmartFeedsController.swift in Sources */,
 				51E4992C24A8676300B667CB /* ArticleSorter.swift in Sources */,
+				514E6C0A24AD39AD00AC6F6E /* ArticleIconImageLoader.swift in Sources */,
 				51E4995024A8734C00B667CB /* ExtensionPoint.swift in Sources */,
 				51E4990E24A808CC00B667CB /* HTMLMetadataDownloader.swift in Sources */,
 				51E498FB24A808BA00B667CB /* FaviconGenerator.swift in Sources */,