Add icon next to accounts in the Settings listing. Issue #1160

iOS/AppAssets.swift

@@ -7,9 +7,22 @@
 //
 import UIKit
 import RSCore
+import Account
 
 struct AppAssets {
 
+	static var accountLocalImage: UIImage = {
+		return UIImage(named: "accountLocal")!
+	}()
+
+	static var accountFeedbinImage: UIImage = {
+		return UIImage(named: "accountFeedbin")!
+	}()
+
+	static var accountFreshRSSImage: UIImage = {
+		return UIImage(named: "accountFreshRSS")!
+	}()
+
 	static var articleExtractorError: UIImage = {
 		return UIImage(named: "articleExtractorError")!
 	}()
@@ -161,4 +174,17 @@ struct AppAssets {
 		return UIColor(named: "vibrantTextColor")!
 	}()
 
+	static func image(for accountType: AccountType) -> UIImage? {
+		switch accountType {
+		case .onMyMac:
+			return AppAssets.accountLocalImage
+		case .feedbin:
+			return AppAssets.accountFeedbinImage
+		case .freshRSS:
+			return AppAssets.accountFreshRSSImage
+		default:
+			return nil
+		}
+	}
+	
 }

iOS/Settings/SettingsAccountTableViewCell.swift

@@ -0,0 +1,30 @@
+//
+//  SettingsAccountTableViewCell.swift
+//  NetNewsWire-iOS
+//
+//  Created by Maurice Parker on 10/23/19.
+//  Copyright © 2019 Ranchero Software. All rights reserved.
+//
+
+import UIKit
+
+class SettingsAccountTableViewCell: VibrantTableViewCell {
+
+	@IBOutlet weak var accountImage: UIImageView!
+	@IBOutlet weak var accountNameLabel: UILabel!
+
+	override func setHighlighted(_ highlighted: Bool, animated: Bool) {
+		super.setHighlighted(highlighted, animated: animated)
+		let tintColor = isHighlighted || isSelected ? AppAssets.vibrantTextColor : UIColor.label
+		accountImage?.tintColor = tintColor
+		accountNameLabel?.highlightedTextColor = tintColor
+	}
+
+	override func setSelected(_ selected: Bool, animated: Bool) {
+		super.setSelected(selected, animated: animated)
+		let tintColor = isHighlighted || isSelected ? AppAssets.vibrantTextColor : UIColor.label
+		accountImage?.tintColor = tintColor
+		accountNameLabel?.highlightedTextColor = tintColor
+	}
+	
+}

iOS/Settings/SettingsAccountTableViewCell.xib

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15508"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" id="JCb-QB-CrO" customClass="SettingsAccountTableViewCell" customModule="NetNewsWire" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="JCb-QB-CrO" id="FzD-t2-JGy">
+                <rect key="frame" x="0.0" y="0.0" width="383" height="44"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="yiw-9t-gil">
+                        <rect key="frame" x="20" y="11" width="22" height="22"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="22" id="43E-Em-Z6O"/>
+                            <constraint firstAttribute="height" constant="22" id="mTY-cQ-1R1"/>
+                        </constraints>
+                    </imageView>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TRx-RV-za8">
+                        <rect key="frame" x="50" y="11.5" width="42" height="21"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <nil key="textColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                </subviews>
+                <constraints>
+                    <constraint firstItem="TRx-RV-za8" firstAttribute="centerY" secondItem="FzD-t2-JGy" secondAttribute="centerY" id="95H-d4-DVW"/>
+                    <constraint firstItem="TRx-RV-za8" firstAttribute="leading" secondItem="yiw-9t-gil" secondAttribute="trailing" constant="8" symbolic="YES" id="RUN-Ol-xSl"/>
+                    <constraint firstItem="yiw-9t-gil" firstAttribute="leading" secondItem="FzD-t2-JGy" secondAttribute="leading" constant="20" symbolic="YES" id="oU9-E3-lEt"/>
+                    <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="TRx-RV-za8" secondAttribute="trailing" constant="8" id="sJ6-wr-JIw"/>
+                    <constraint firstItem="yiw-9t-gil" firstAttribute="centerY" secondItem="FzD-t2-JGy" secondAttribute="centerY" id="tUD-tI-dgr"/>
+                </constraints>
+            </tableViewCellContentView>
+            <connections>
+                <outlet property="accountImage" destination="yiw-9t-gil" id="E8w-FW-Jc9"/>
+                <outlet property="accountNameLabel" destination="TRx-RV-za8" id="BOl-hK-2mT"/>
+            </connections>
+            <point key="canvasLocation" x="7" y="-9"/>
+        </tableViewCell>
+    </objects>
+</document>

iOS/Settings/SettingsViewController.swift

@@ -33,8 +33,9 @@ class SettingsViewController: UITableViewController {
 		NotificationCenter.default.addObserver(self, selector: #selector(accountsDidChange), name: .UserDidAddAccount, object: nil)
 		NotificationCenter.default.addObserver(self, selector: #selector(accountsDidChange), name: .UserDidDeleteAccount, object: nil)
 
+		tableView.register(UINib(nibName: "SettingsAccountTableViewCell", bundle: nil), forCellReuseIdentifier: "SettingsAccountTableViewCell")
 		tableView.register(UINib(nibName: "SettingsTableViewCell", bundle: nil), forCellReuseIdentifier: "SettingsTableViewCell")
-		
+
 	}
 	
 	override func viewWillAppear(_ animated: Bool) {
@@ -94,15 +95,18 @@ class SettingsViewController: UITableViewController {
 		let cell: UITableViewCell
 		switch indexPath.section {
 		case 1:
-			
-			cell = tableView.dequeueReusableCell(withIdentifier: "SettingsTableViewCell", for: indexPath)
-			cell.textLabel?.adjustsFontForContentSizeCategory = true
-			
+						
 			let sortedAccounts = AccountManager.shared.sortedAccounts
 			if indexPath.row == sortedAccounts.count {
+				cell = tableView.dequeueReusableCell(withIdentifier: "SettingsTableViewCell", for: indexPath)
+				cell.textLabel?.adjustsFontForContentSizeCategory = true
 				cell.textLabel?.text = NSLocalizedString("Add Account", comment: "Accounts")
 			} else {
-				cell.textLabel?.text = sortedAccounts[indexPath.row].nameForDisplay
+				let acctCell = tableView.dequeueReusableCell(withIdentifier: "SettingsAccountTableViewCell", for: indexPath) as! SettingsAccountTableViewCell
+				let account = sortedAccounts[indexPath.row]
+				acctCell.accountImage?.image = AppAssets.image(for: account.type)
+				acctCell.accountNameLabel?.text = account.nameForDisplay
+				cell = acctCell
 			}
 			
 		default: