Add Feed Inspector

iOS/Inspector/FeedInspectorView.swift

@@ -0,0 +1,99 @@
+//
+//  FeedInspector.swift
+//  NetNewsWire-iOS
+//
+//  Created by Maurice Parker on 9/27/19.
+//  Copyright © 2019 Ranchero Software. All rights reserved.
+//
+
+import SwiftUI
+import Combine
+import Account
+
+struct FeedInspectorView : View {
+	
+	@ObservedObject var viewModel: ViewModel
+	@Environment(\.viewController) private var viewController: UIViewController?
+
+    var body: some View {
+		NavigationView {
+			Form {
+				Section(header:
+					HStack {
+						Spacer()
+						Image(uiImage: self.viewModel.image).resizable().frame(width: 48.0, height: 48.0)
+						Spacer()
+					}) {
+					TextField("Feed Name", text: $viewModel.name)
+					Toggle(isOn: $viewModel.isArticleExtractorAlwaysOn) {
+						Text("Reader View is always on")
+					}
+				}
+				Section(header: Text("HOME PAGE")) {
+					Text(verbatim: self.viewModel.homePageURL)
+				}
+				Section(header: Text("FEED URL")) {
+					Text(verbatim: self.viewModel.feedLinkURL)
+				}
+			}
+			.navigationBarTitle(Text(verbatim: self.viewModel.nameForDisplay), displayMode: .inline)
+			.navigationBarItems(leading: Button(action: { self.viewController?.dismiss(animated: true) }) { Text("Done") } )
+		}
+    }
+	
+	// MARK: ViewModel
+	
+	class ViewModel: ObservableObject {
+		
+		let objectWillChange = ObservableObjectPublisher()
+		let feed: Feed
+		
+		init(feed: Feed) {
+			self.feed = feed
+		}
+		
+		var image: UIImage {
+			if let feedIcon = appDelegate.feedIconDownloader.icon(for: feed) {
+				return feedIcon
+			}
+			if let favicon = appDelegate.faviconDownloader.favicon(for: feed) {
+				return favicon
+			}
+			return FaviconGenerator.favicon(feed)
+		}
+		
+		var nameForDisplay: String {
+			return feed.nameForDisplay
+		}
+		
+		var name: String {
+			get {
+				return feed.editedName ?? feed.name ?? ""
+			}
+			set {
+				objectWillChange.send()
+				feed.editedName = newValue
+			}
+		}
+		
+		var isArticleExtractorAlwaysOn: Bool {
+			get {
+				return feed.isArticleExtractorAlwaysOn ?? false
+			}
+			set {
+				objectWillChange.send()
+				feed.isArticleExtractorAlwaysOn = newValue
+			}
+		}
+		
+		var homePageURL: String {
+			return feed.homePageURL ?? ""
+		}
+		
+		var feedLinkURL: String {
+			return feed.url
+		}
+		
+	}
+
+}

iOS/MasterTimeline/MasterTimelineViewController.swift

@@ -46,6 +46,8 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
 		NotificationCenter.default.addObserver(self, selector: #selector(userDefaultsDidChange(_:)), name: UserDefaults.didChangeNotification, object: nil)
 		NotificationCenter.default.addObserver(self, selector: #selector(progressDidChange(_:)), name: .AccountRefreshProgressDidChange, object: nil)
 		NotificationCenter.default.addObserver(self, selector: #selector(contentSizeCategoryDidChange), name: UIContentSizeCategory.didChangeNotification, object: nil)
+		NotificationCenter.default.addObserver(self, selector: #selector(displayNameDidChange), name: .DisplayNameDidChange, object: nil)
+
 
 		// Setup the Search Controller
 		searchController.delegate = self
@@ -129,6 +131,10 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
 		coordinator.navigateToDetail()
 	}
 	
+	@objc func showFeedInspector(_ sender: UITapGestureRecognizer) {
+		coordinator.showFeedInspector()
+	}
+	
 	// MARK: API
 	
 	func restoreSelectionIfNecessary() {
@@ -365,6 +371,10 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
 		updateProgressIndicatorIfNeeded()
 	}
 	
+	@objc func displayNameDidChange(_ note: Notification) {
+		titleView?.label.text = coordinator.timelineName
+	}
+	
 	// MARK: Reloading
 	
 	func queueReloadAvailableCells() {
@@ -454,12 +464,21 @@ private extension MasterTimelineViewController {
 	}
 
 	func resetUI() {
-		
 		title = coordinator.timelineName
+		
 		if let titleView = Bundle.main.loadNibNamed("MasterTimelineTitleView", owner: self, options: nil)?[0] as? MasterTimelineTitleView {
 			self.titleView = titleView
 			titleView.imageView.image = coordinator.timelineFavicon
 			titleView.label.text = coordinator.timelineName
+			
+			if coordinator.timelineFetcher is Feed {
+				let width = titleView.sizeThatFits(CGSize(width: CGFloat.greatestFiniteMagnitude, height: CGFloat.greatestFiniteMagnitude)).width
+				titleView.widthAnchor.constraint(equalToConstant: width).isActive = true
+				titleView.heightAnchor.constraint(equalToConstant: 44.0).isActive = true
+				let tap = UITapGestureRecognizer(target: self, action:#selector(showFeedInspector(_:)))
+				titleView.addGestureRecognizer(tap)
+			}
+			
 			navigationItem.titleView = titleView
 		}
 

iOS/SceneCoordinator.swift

@@ -788,6 +788,15 @@ class SceneCoordinator: NSObject, UndoableCommandRunner, UnreadCountProvider {
 		}
 	}
 	
+	func showFeedInspector() {
+		guard let feed = timelineFetcher as? Feed else {
+			return
+		}
+		rootSplitViewController.present(style: .formSheet) {
+			FeedInspectorView(viewModel: FeedInspectorView.ViewModel(feed: feed))
+		}
+	}
+	
 	func showAdd(_ type: AddControllerType, initialFeed: String? = nil, initialFeedName: String? = nil) {
 		selectFeed(nil)