From ec2b23c9f05230364f66b7aa174a0148fc6b1c3d Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Tue, 12 Nov 2019 15:52:07 -0600
Subject: [PATCH] Change Feed Inspector to use same IconView class as other
 places in code displaying feed icons.

---
 .../FeedInspectorViewController.swift         | 20 ++++--------
 Mac/Inspector/Inspector.storyboard            | 31 +++++++++----------
 Mac/MainWindow/IconView.swift                 |  1 +
 3 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/Mac/Inspector/FeedInspectorViewController.swift b/Mac/Inspector/FeedInspectorViewController.swift
index 18ac3e770..964668798 100644
--- a/Mac/Inspector/FeedInspectorViewController.swift
+++ b/Mac/Inspector/FeedInspectorViewController.swift
@@ -12,7 +12,7 @@ import Account
 
 final class FeedInspectorViewController: NSViewController, Inspector {
 
-	@IBOutlet weak var imageView: NSImageView?
+	@IBOutlet weak var iconView: IconView!
 	@IBOutlet weak var nameTextField: NSTextField?
 	@IBOutlet weak var homePageURLTextField: NSTextField?
 	@IBOutlet weak var urlTextField: NSTextField?
@@ -43,11 +43,7 @@ final class FeedInspectorViewController: NSViewController, Inspector {
 	// MARK: NSViewController
 
 	override func viewDidLoad() {
-		imageView!.wantsLayer = true
-		imageView!.layer?.cornerRadius = 4.0
-
 		updateUI()
-
 		NotificationCenter.default.addObserver(self, selector: #selector(imageDidBecomeAvailable(_:)), name: .ImageDidBecomeAvailable, object: nil)
 	}
 
@@ -101,25 +97,21 @@ private extension FeedInspectorViewController {
 	}
 
 	func updateImage() {
-		guard let feed = feed else {
-			imageView?.image = nil
+		guard let feed = feed, let iconView = iconView else {
 			return
 		}
 
 		if let feedIcon = appDelegate.feedIconDownloader.icon(for: feed) {
-			imageView?.image = feedIcon.image
+			iconView.iconImage = feedIcon
 			return
 		}
 
-		if let favicon = appDelegate.faviconDownloader.favicon(for: feed)?.image {
-			if favicon.size.height < 16.0 && favicon.size.width < 16.0 {
-				favicon.size = NSSize(width: 16, height: 16)
-			}
-			imageView?.image = favicon
+		if let favicon = appDelegate.faviconDownloader.favicon(for: feed) {
+			iconView.iconImage = favicon
 			return
 		}
 
-		imageView?.image = feed.smallIcon?.image
+		iconView.iconImage = feed.smallIcon
 	}
 
 	func updateName() {
diff --git a/Mac/Inspector/Inspector.storyboard b/Mac/Inspector/Inspector.storyboard
index eb460de87..b35d220cf 100644
--- a/Mac/Inspector/Inspector.storyboard
+++ b/Mac/Inspector/Inspector.storyboard
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="15504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="cfG-Pn-VJS">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="15505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="cfG-Pn-VJS">
     <dependencies>
-        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15504"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -37,14 +36,6 @@
                         <rect key="frame" x="0.0" y="0.0" width="256" height="332"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
-                            <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="H9X-OG-K0p">
-                                <rect key="frame" x="104" y="264" width="48" height="48"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="48" id="1Cy-0w-dBg"/>
-                                    <constraint firstAttribute="height" constant="48" id="edb-lw-Ict"/>
-                                </constraints>
-                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="NSNetwork" id="MZ2-89-Bje"/>
-                            </imageView>
                             <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="IWu-80-XC5">
                                 <rect key="frame" x="20" y="200" width="216" height="56"/>
                                 <constraints>
@@ -114,13 +105,19 @@ Field</string>
                                     <action selector="isNotifyAboutNewArticlesChanged:" target="sfH-oR-GXm" id="Vx9-pQ-RnP"/>
                                 </connections>
                             </button>
+                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="I6k-QR-VmV" customClass="IconView" customModule="NetNewsWire" customModuleProvider="target">
+                                <rect key="frame" x="104" y="264" width="48" height="48"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="48" id="Faa-nE-lkA"/>
+                                    <constraint firstAttribute="width" constant="48" id="esD-dT-oWU"/>
+                                </constraints>
+                            </customView>
                         </subviews>
                         <constraints>
                             <constraint firstItem="zm0-15-BFy" firstAttribute="top" secondItem="2WO-Iu-p5e" secondAttribute="bottom" constant="4" id="2fb-QO-XIm"/>
-                            <constraint firstItem="IWu-80-XC5" firstAttribute="top" secondItem="H9X-OG-K0p" secondAttribute="bottom" constant="8" symbolic="YES" id="4WB-WJ-3Z4"/>
                             <constraint firstItem="ZBX-E8-k9c" firstAttribute="top" secondItem="IWu-80-XC5" secondAttribute="bottom" constant="20" id="5L7-aZ-vdg"/>
                             <constraint firstItem="nH2-ab-KJ5" firstAttribute="leading" secondItem="ecA-UY-KEd" secondAttribute="leading" constant="20" symbolic="YES" id="8pK-lW-xQk"/>
-                            <constraint firstItem="H9X-OG-K0p" firstAttribute="centerX" secondItem="ecA-UY-KEd" secondAttribute="centerX" id="9CA-KA-HEg"/>
+                            <constraint firstItem="IWu-80-XC5" firstAttribute="top" secondItem="I6k-QR-VmV" secondAttribute="bottom" constant="8" symbolic="YES" id="Bea-j0-QMb"/>
                             <constraint firstItem="nH2-ab-KJ5" firstAttribute="top" secondItem="ZBX-E8-k9c" secondAttribute="bottom" constant="20" id="CpA-X9-EbP"/>
                             <constraint firstAttribute="bottom" secondItem="Vvk-KG-JlG" secondAttribute="bottom" constant="20" id="IxJ-5N-NhL"/>
                             <constraint firstAttribute="trailing" secondItem="ju6-Zo-8X4" secondAttribute="trailing" constant="20" symbolic="YES" id="Jzi-tP-TIw"/>
@@ -128,11 +125,12 @@ Field</string>
                             <constraint firstItem="ju6-Zo-8X4" firstAttribute="leading" secondItem="ecA-UY-KEd" secondAttribute="leading" constant="20" symbolic="YES" id="NwI-2x-dAr"/>
                             <constraint firstItem="ju6-Zo-8X4" firstAttribute="top" secondItem="zm0-15-BFy" secondAttribute="bottom" constant="20" id="PFv-jF-JIZ"/>
                             <constraint firstItem="2WO-Iu-p5e" firstAttribute="leading" secondItem="ecA-UY-KEd" secondAttribute="leading" constant="20" symbolic="YES" id="PeT-mm-2HJ"/>
+                            <constraint firstItem="I6k-QR-VmV" firstAttribute="top" secondItem="ecA-UY-KEd" secondAttribute="top" constant="20" symbolic="YES" id="URB-DN-7vz"/>
                             <constraint firstAttribute="trailing" secondItem="IWu-80-XC5" secondAttribute="trailing" constant="20" symbolic="YES" id="WW6-xR-Zue"/>
-                            <constraint firstItem="H9X-OG-K0p" firstAttribute="top" secondItem="ecA-UY-KEd" secondAttribute="top" constant="20" symbolic="YES" id="Z6q-PN-wOC"/>
                             <constraint firstItem="zm0-15-BFy" firstAttribute="leading" secondItem="ecA-UY-KEd" secondAttribute="leading" constant="20" symbolic="YES" id="aho-BJ-kmB"/>
                             <constraint firstItem="ZBX-E8-k9c" firstAttribute="leading" secondItem="ecA-UY-KEd" secondAttribute="leading" constant="20" symbolic="YES" id="cjR-0i-YNG"/>
                             <constraint firstAttribute="trailing" secondItem="2WO-Iu-p5e" secondAttribute="trailing" constant="20" symbolic="YES" id="dLU-a6-nfx"/>
+                            <constraint firstItem="I6k-QR-VmV" firstAttribute="centerX" secondItem="ecA-UY-KEd" secondAttribute="centerX" id="gFG-ZY-eNp"/>
                             <constraint firstAttribute="trailing" secondItem="zm0-15-BFy" secondAttribute="trailing" constant="20" symbolic="YES" id="js6-b2-FIR"/>
                             <constraint firstItem="IWu-80-XC5" firstAttribute="leading" secondItem="ecA-UY-KEd" secondAttribute="leading" constant="20" symbolic="YES" id="r6h-Z0-g7b"/>
                             <constraint firstItem="2WO-Iu-p5e" firstAttribute="top" secondItem="nH2-ab-KJ5" secondAttribute="bottom" constant="20" id="rRv-qO-dPa"/>
@@ -142,7 +140,7 @@ Field</string>
                     </view>
                     <connections>
                         <outlet property="homePageURLTextField" destination="zm0-15-BFy" id="0Jh-yy-mnF"/>
-                        <outlet property="imageView" destination="H9X-OG-K0p" id="Rm6-X6-csH"/>
+                        <outlet property="iconView" destination="I6k-QR-VmV" id="zrk-zx-zk7"/>
                         <outlet property="isNotifyAboutNewArticlesCheckBox" destination="ZBX-E8-k9c" id="FWc-Ds-LUy"/>
                         <outlet property="isReaderViewAlwaysOnCheckBox" destination="nH2-ab-KJ5" id="xPg-P5-3cr"/>
                         <outlet property="nameTextField" destination="IWu-80-XC5" id="zg4-5h-hoP"/>
@@ -151,7 +149,7 @@ Field</string>
                 </viewController>
                 <customObject id="1ho-ZO-Gkb" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="67" y="69.5"/>
+            <point key="canvasLocation" x="67" y="69"/>
         </scene>
         <!--Folder-->
         <scene sceneID="8By-fa-WDQ">
@@ -294,7 +292,6 @@ Field</string>
     </scenes>
     <resources>
         <image name="NSFolder" width="32" height="32"/>
-        <image name="NSNetwork" width="32" height="32"/>
         <image name="NSSmartBadgeTemplate" width="14" height="14"/>
     </resources>
 </document>
diff --git a/Mac/MainWindow/IconView.swift b/Mac/MainWindow/IconView.swift
index 92d9f30dd..e03ea6be4 100644
--- a/Mac/MainWindow/IconView.swift
+++ b/Mac/MainWindow/IconView.swift
@@ -82,6 +82,7 @@ private extension IconView {
 	func commonInit() {
 		addSubview(imageView)
 		wantsLayer = true
+		layer?.cornerRadius = 4.0
 	}
 
 	func rectForImageView() -> NSRect {