Remove Add Account from the Add dialog.

NetNewsWire.xcodeproj/project.pbxproj

@@ -17,7 +17,6 @@
 		512E09012268907400BDCFDD /* MasterTableViewSectionHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 512E08F722688F7C00BDCFDD /* MasterTableViewSectionHeader.swift */; };
 		512E09352268B25900BDCFDD /* UISplitViewController-Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 512E092B2268B25500BDCFDD /* UISplitViewController-Extensions.swift */; };
 		512E094D2268B8AB00BDCFDD /* DeleteCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84B99C9C1FAE83C600ECDEDB /* DeleteCommand.swift */; };
-		517D9075226639F500323654 /* AddAccountViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 517D906B2266392900323654 /* AddAccountViewController.swift */; };
 		5183CCD0226E1E880010922C /* NonIntrinsicLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5183CCCF226E1E880010922C /* NonIntrinsicLabel.swift */; };
 		5183CCDA226E31A50010922C /* NonIntrinsicImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5183CCD9226E31A50010922C /* NonIntrinsicImageView.swift */; };
 		519B8D332143397200FA689C /* SharingServiceDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 519B8D322143397200FA689C /* SharingServiceDelegate.swift */; };
@@ -610,7 +609,6 @@
 		5127B237222B4849006D641D /* DetailKeyboardShortcuts.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = DetailKeyboardShortcuts.plist; sourceTree = "<group>"; };
 		512E08F722688F7C00BDCFDD /* MasterTableViewSectionHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MasterTableViewSectionHeader.swift; sourceTree = "<group>"; };
 		512E092B2268B25500BDCFDD /* UISplitViewController-Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UISplitViewController-Extensions.swift"; sourceTree = "<group>"; };
-		517D906B2266392900323654 /* AddAccountViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddAccountViewController.swift; sourceTree = "<group>"; };
 		5183CCCF226E1E880010922C /* NonIntrinsicLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NonIntrinsicLabel.swift; sourceTree = "<group>"; };
 		5183CCD9226E31A50010922C /* NonIntrinsicImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NonIntrinsicImageView.swift; sourceTree = "<group>"; };
 		519B8D322143397200FA689C /* SharingServiceDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharingServiceDelegate.swift; sourceTree = "<group>"; };
@@ -976,7 +974,6 @@
 				51C452842265093600C03939 /* AddFeedViewController.swift */,
 				51C452812265093600C03939 /* AddFeedFolderPickerData.swift */,
 				51C4528B2265095F00C03939 /* AddFolderViewController.swift */,
-				517D906B2266392900323654 /* AddAccountViewController.swift */,
 			);
 			path = Add;
 			sourceTree = "<group>";
@@ -2162,7 +2159,6 @@
 				51C45294226509C800C03939 /* SearchFeedDelegate.swift in Sources */,
 				512E09352268B25900BDCFDD /* UISplitViewController-Extensions.swift in Sources */,
 				51C452A022650A1900C03939 /* FeedIconDownloader.swift in Sources */,
-				517D9075226639F500323654 /* AddAccountViewController.swift in Sources */,
 				51C4529E22650A1900C03939 /* ImageDownloader.swift in Sources */,
 				51C45292226509C800C03939 /* TodayFeedDelegate.swift in Sources */,
 				84F3EE1B20DEC97E003FADEB /* HTMLFeedFinder.swift in Sources */,

iOS/Add/Add.storyboard

@@ -172,11 +172,13 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="1Ce-E7-rG2">
-                                <rect key="frame" x="90.666666666666686" y="108" width="194" height="29"/>
+                                <rect key="frame" x="112.66666666666669" y="108" width="150" height="29"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="150" id="IEO-pf-4PB"/>
+                                </constraints>
                                 <segments>
                                     <segment title="Feed"/>
                                     <segment title="Folder"/>
-                                    <segment title="Account"/>
                                 </segments>
                                 <connections>
                                     <action selector="typeSelectorChanged:" destination="G8j-dh-7Ji" eventType="valueChanged" id="evz-dY-V8G"/>
@@ -341,50 +343,5 @@
             </objects>
             <point key="canvasLocation" x="-954.39999999999998" y="89.408866995073893"/>
         </scene>
-        <!--Add Account View Controller-->
-        <scene sceneID="Wy0-Z6-lrg">
-            <objects>
-                <tableViewController storyboardIdentifier="AddAccountViewController" id="L9h-bF-xeh" customClass="AddAccountViewController" customModule="NetNewsWire" customModuleProvider="target" sceneMemberID="viewController">
-                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="1" sectionFooterHeight="5" id="YtA-U7-Ox4">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
-                        <sections>
-                            <tableViewSection id="D3p-uk-AI8">
-                                <cells>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="jst-2Y-7Br">
-                                        <rect key="frame" x="0.0" y="35" width="375" height="44"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="jst-2Y-7Br" id="j6d-MU-b7V">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43.666666666666664"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Coming soon..." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6AT-sI-3DG">
-                                                    <rect key="frame" x="130" y="11" width="115" height="22"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                            </subviews>
-                                            <constraints>
-                                                <constraint firstItem="6AT-sI-3DG" firstAttribute="top" secondItem="j6d-MU-b7V" secondAttribute="topMargin" id="AyG-c8-kOT"/>
-                                                <constraint firstItem="6AT-sI-3DG" firstAttribute="centerX" secondItem="j6d-MU-b7V" secondAttribute="centerX" id="Klf-co-7i2"/>
-                                                <constraint firstItem="6AT-sI-3DG" firstAttribute="bottom" secondItem="j6d-MU-b7V" secondAttribute="bottomMargin" id="UOG-ny-eea"/>
-                                            </constraints>
-                                        </tableViewCellContentView>
-                                    </tableViewCell>
-                                </cells>
-                            </tableViewSection>
-                        </sections>
-                        <connections>
-                            <outlet property="dataSource" destination="L9h-bF-xeh" id="9j2-Wv-4xJ"/>
-                            <outlet property="delegate" destination="L9h-bF-xeh" id="6fV-zk-qu3"/>
-                        </connections>
-                    </tableView>
-                </tableViewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="aqp-ki-yLv" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="-210" y="87"/>
-        </scene>
     </scenes>
 </document>

iOS/Add/AddAccountViewController.swift

@@ -1,30 +0,0 @@
-//
-//  AddAccountViewController.swift
-//  NetNewsWire
-//
-//  Created by Maurice Parker on 4/16/19.
-//  Copyright © 2019 Ranchero Software, LLC. All rights reserved.
-//
-
-import UIKit
-
-class AddAccountViewController: UITableViewController, AddContainerViewControllerChild {
-	var delegate: AddContainerViewControllerChildDelegate?
-	
-    override func viewDidLoad() {
-        super.viewDidLoad()
-
-		// I couldn't figure out the gap at the top of the UITableView, so I took a hammer to it.
-		tableView.contentInset = UIEdgeInsets(top: -28, left: 0, bottom: 0, right: 0)
-
-	}
-
-	func cancel() {
-		
-	}
-	
-	func add() {
-		
-	}
-	
-}

iOS/Add/AddContainerViewController.swift

@@ -45,10 +45,8 @@ class AddContainerViewController: UIViewController {
 		switch sender.selectedSegmentIndex {
 		case 0:
 			switchToFeed()
-		case 1:
-			switchToFolder()
 		default:
-			switchToAccount()
+			switchToFolder()
 		}
 		
 	}
@@ -110,15 +108,6 @@ private extension AddContainerViewController {
 		displayContentController(UIStoryboard.add.instantiateController(ofType: AddFolderViewController.self))
 	}
 	
-	func switchToAccount() {
-		guard !(currentViewController is AddAccountViewController) else {
-			return
-		}
-		resetUI()
-		hideCurrentController()
-		displayContentController(UIStoryboard.add.instantiateController(ofType: AddAccountViewController.self))
-	}
-	
 	func resetUI() {
 		addButton.isEnabled = false
 	}