Make Article icons/avatars match Timeline icons/avatars Issue #1274

iOS/Article/ArticleIconSchemeHandler.swift

@@ -0,0 +1,44 @@
+//
+//  AccountViewControllerSchemeHandler.swift
+//  NetNewsWire-iOS
+//
+//  Created by Maurice Parker on 11/7/19.
+//  Copyright © 2019 Ranchero Software. All rights reserved.
+//
+
+import Foundation
+import WebKit
+import Articles
+
+class ArticleIconSchemeHandler: NSObject, WKURLSchemeHandler {
+	
+	var currentArticle: Article?
+	
+	func webView(_ webView: WKWebView, start urlSchemeTask: WKURLSchemeTask) {
+		DispatchQueue.main.async {
+			guard let responseURL = urlSchemeTask.request.url, let iconImage = self.currentArticle?.iconImage() else {
+				urlSchemeTask.didFailWithError(URLError(.fileDoesNotExist))
+				return
+			}
+
+			let iconView = IconView(frame: CGRect(x: 0, y: 0, width: 48, height: 48))
+			iconView.iconImage = iconImage
+			let renderedImage = iconView.asImage()
+			
+			guard let data = renderedImage.dataRepresentation() else {
+				urlSchemeTask.didFailWithError(URLError(.fileDoesNotExist))
+				return
+			}
+			
+			let response = URLResponse(url: responseURL, mimeType: "image/png", expectedContentLength: data.count, textEncodingName: nil);
+			urlSchemeTask.didReceive(response)
+			urlSchemeTask.didReceive(data)
+			urlSchemeTask.didFinish()
+		}
+	}
+	
+	func webView(_ webView: WKWebView, stop urlSchemeTask: WKURLSchemeTask) {
+		urlSchemeTask.didFailWithError(URLError(.unknown))
+	}
+	
+}

iOS/Article/ArticleViewController.swift

@@ -166,9 +166,9 @@ class ArticleViewController: UIViewController {
 		case .loading:
 			rendering = ArticleRenderer.loadingHTML(style: style)
 		case .article(let article):
-			rendering = ArticleRenderer.articleHTML(article: article, style: style)
+			rendering = ArticleRenderer.articleHTML(article: article, style: style, useImageIcon: true)
 		case .extracted(let article, let extractedArticle):
-			rendering = ArticleRenderer.articleHTML(article: article, extractedArticle: extractedArticle, style: style)
+			rendering = ArticleRenderer.articleHTML(article: article, extractedArticle: extractedArticle, style: style, useImageIcon: true)
 		}
 		
 		let templateData = TemplateData(style: rendering.style, body: rendering.html)
@@ -180,6 +180,7 @@ class ArticleViewController: UIViewController {
 			render = "render(\(json));"
 		}
 
+		ArticleViewControllerWebViewProvider.shared.articleIconSchemeHandler.currentArticle = currentArticle
 		webView?.scrollView.setZoomScale(1.0, animated: false)
 		webView?.evaluateJavaScript(render)
 		

iOS/Article/ArticleViewControllerWebViewProvider.swift

@@ -15,6 +15,8 @@ class ArticleViewControllerWebViewProvider: NSObject, WKNavigationDelegate {
 	
 	static let shared = ArticleViewControllerWebViewProvider()
 	
+	let articleIconSchemeHandler = ArticleIconSchemeHandler()
+	
 	private let minimumQueueDepth = 3
 	private let maximumQueueDepth = 6
 	private var queue: [WKWebView] = []
@@ -72,6 +74,7 @@ class ArticleViewControllerWebViewProvider: NSObject, WKNavigationDelegate {
 			configuration.setValue(true, forKey: "allowUniversalAccessFromFileURLs")
 			configuration.allowsInlineMediaPlayback = true
 			configuration.mediaTypesRequiringUserActionForPlayback = .video
+			configuration.setURLSchemeHandler(articleIconSchemeHandler, forURLScheme: ArticleRenderer.imageIconScheme)
 			
 			let webView = WKWebView(frame: .zero, configuration: configuration)
 			enqueueWebView(webView)

iOS/IconView.swift

@@ -16,18 +16,12 @@ final class IconView: UIView {
 				imageView.image = iconImage?.image
 
 				if self.traitCollection.userInterfaceStyle == .dark {
-					DispatchQueue.global(qos: .default).async {
-						if self.iconImage?.isDark ?? false {
-							DispatchQueue.main.async {
-								self.isDisconcernable = false
-								self.setNeedsLayout()
-							}
-						} else {
-							DispatchQueue.main.async {
-								self.isDisconcernable = true
-								self.setNeedsLayout()
-							}
-						}
+					if self.iconImage?.isDark ?? false {
+						self.isDisconcernable = false
+						self.setNeedsLayout()
+					} else {
+						self.isDisconcernable = true
+						self.setNeedsLayout()
 					}
 				} else {
 					self.setNeedsLayout()