diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj index 9494fef97..e49f15856 100644 --- a/NetNewsWire.xcodeproj/project.pbxproj +++ b/NetNewsWire.xcodeproj/project.pbxproj @@ -420,7 +420,7 @@ 51C4527C2265091600C03939 /* MasterTimelineDefaultCellLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51C452752265091600C03939 /* MasterTimelineDefaultCellLayout.swift */; }; 51C4527F2265092C00C03939 /* ArticleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51C4527E2265092C00C03939 /* ArticleViewController.swift */; }; 51C452862265093600C03939 /* Add.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 51C452822265093600C03939 /* Add.storyboard */; }; - 51C452882265093600C03939 /* AddWebFeedViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51C452842265093600C03939 /* AddWebFeedViewController.swift */; }; + 51C452882265093600C03939 /* AddFeedViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51C452842265093600C03939 /* AddFeedViewController.swift */; }; 51C4528D2265095F00C03939 /* AddFolderViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51C4528B2265095F00C03939 /* AddFolderViewController.swift */; }; 51C4528E2265099C00C03939 /* SmartFeedsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84CC88171FE59CBF00644329 /* SmartFeedsController.swift */; }; 51C4528F226509BD00C03939 /* UnreadFeed.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84F2D5391FC2308B00998D64 /* UnreadFeed.swift */; }; @@ -470,11 +470,11 @@ 51DC37072402153E0095D371 /* UpdateSelectionOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51DC37062402153E0095D371 /* UpdateSelectionOperation.swift */; }; 51DC37092402F1470095D371 /* MasterFeedDataSourceOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51DC37082402F1470095D371 /* MasterFeedDataSourceOperation.swift */; }; 51DC370B2405BC9A0095D371 /* PreloadedWebView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51DC370A2405BC9A0095D371 /* PreloadedWebView.swift */; }; - 51E36E71239D6610006F47A5 /* AddWebFeedSelectFolderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51E36E70239D6610006F47A5 /* AddWebFeedSelectFolderTableViewCell.swift */; }; - 51E36E8C239D6765006F47A5 /* AddWebFeedSelectFolderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 51E36E8B239D6765006F47A5 /* AddWebFeedSelectFolderTableViewCell.xib */; }; + 51E36E71239D6610006F47A5 /* AddFeedSelectFolderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51E36E70239D6610006F47A5 /* AddFeedSelectFolderTableViewCell.swift */; }; + 51E36E8C239D6765006F47A5 /* AddFeedSelectFolderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 51E36E8B239D6765006F47A5 /* AddFeedSelectFolderTableViewCell.xib */; }; 51E3EB33229AB02C00645299 /* ErrorHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51E3EB32229AB02C00645299 /* ErrorHandler.swift */; }; 51E3EB3D229AB08300645299 /* ErrorHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51E3EB3C229AB08300645299 /* ErrorHandler.swift */; }; - 51E43962238037C400015C31 /* AddWebFeedFolderViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51E43961238037C400015C31 /* AddWebFeedFolderViewController.swift */; }; + 51E43962238037C400015C31 /* AddFeedFolderViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51E43961238037C400015C31 /* AddFeedFolderViewController.swift */; }; 51E4398023805EBC00015C31 /* AddComboTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51E4397F23805EBC00015C31 /* AddComboTableViewCell.swift */; }; 51E4989724A8065700B667CB /* CloudKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51E4989624A8065700B667CB /* CloudKit.framework */; }; 51E4989924A8067000B667CB /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51E4989824A8067000B667CB /* WebKit.framework */; }; @@ -1673,7 +1673,7 @@ 51C452752265091600C03939 /* MasterTimelineDefaultCellLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MasterTimelineDefaultCellLayout.swift; sourceTree = ""; }; 51C4527E2265092C00C03939 /* ArticleViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ArticleViewController.swift; sourceTree = ""; }; 51C452822265093600C03939 /* Add.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Add.storyboard; sourceTree = ""; }; - 51C452842265093600C03939 /* AddWebFeedViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddWebFeedViewController.swift; sourceTree = ""; }; + 51C452842265093600C03939 /* AddFeedViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddFeedViewController.swift; sourceTree = ""; }; 51C4528B2265095F00C03939 /* AddFolderViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddFolderViewController.swift; sourceTree = ""; }; 51C452B32265141B00C03939 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS12.2.sdk/System/Library/Frameworks/WebKit.framework; sourceTree = DEVELOPER_DIR; }; 51C452B72265178500C03939 /* styleSheet.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = styleSheet.css; sourceTree = ""; }; @@ -1692,11 +1692,11 @@ 51DC37062402153E0095D371 /* UpdateSelectionOperation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdateSelectionOperation.swift; sourceTree = ""; }; 51DC37082402F1470095D371 /* MasterFeedDataSourceOperation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MasterFeedDataSourceOperation.swift; sourceTree = ""; }; 51DC370A2405BC9A0095D371 /* PreloadedWebView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreloadedWebView.swift; sourceTree = ""; }; - 51E36E70239D6610006F47A5 /* AddWebFeedSelectFolderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddWebFeedSelectFolderTableViewCell.swift; sourceTree = ""; }; - 51E36E8B239D6765006F47A5 /* AddWebFeedSelectFolderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AddWebFeedSelectFolderTableViewCell.xib; sourceTree = ""; }; + 51E36E70239D6610006F47A5 /* AddFeedSelectFolderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddFeedSelectFolderTableViewCell.swift; sourceTree = ""; }; + 51E36E8B239D6765006F47A5 /* AddFeedSelectFolderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AddFeedSelectFolderTableViewCell.xib; sourceTree = ""; }; 51E3EB32229AB02C00645299 /* ErrorHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ErrorHandler.swift; sourceTree = ""; }; 51E3EB3C229AB08300645299 /* ErrorHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ErrorHandler.swift; sourceTree = ""; }; - 51E43961238037C400015C31 /* AddWebFeedFolderViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddWebFeedFolderViewController.swift; sourceTree = ""; }; + 51E43961238037C400015C31 /* AddFeedFolderViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddFeedFolderViewController.swift; sourceTree = ""; }; 51E4397F23805EBC00015C31 /* AddComboTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddComboTableViewCell.swift; sourceTree = ""; }; 51E4989624A8065700B667CB /* CloudKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CloudKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS14.0.sdk/System/Library/Frameworks/CloudKit.framework; sourceTree = DEVELOPER_DIR; }; 51E4989824A8067000B667CB /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS14.0.sdk/System/Library/Frameworks/WebKit.framework; sourceTree = DEVELOPER_DIR; }; @@ -2734,12 +2734,12 @@ children = ( 51C452822265093600C03939 /* Add.storyboard */, 51E4397F23805EBC00015C31 /* AddComboTableViewCell.swift */, + 51E43961238037C400015C31 /* AddFeedFolderViewController.swift */, + 51E36E70239D6610006F47A5 /* AddFeedSelectFolderTableViewCell.swift */, + 51C452842265093600C03939 /* AddFeedViewController.swift */, 51C4528B2265095F00C03939 /* AddFolderViewController.swift */, - 51E43961238037C400015C31 /* AddWebFeedFolderViewController.swift */, - 51E36E70239D6610006F47A5 /* AddWebFeedSelectFolderTableViewCell.swift */, - 51C452842265093600C03939 /* AddWebFeedViewController.swift */, 510289CC24519A1D00426DDF /* SelectComboTableViewCell.swift */, - 51E36E8B239D6765006F47A5 /* AddWebFeedSelectFolderTableViewCell.xib */, + 51E36E8B239D6765006F47A5 /* AddFeedSelectFolderTableViewCell.xib */, 516AE5DD246AF2DD00731738 /* Reddit */, 510289CE2451BA1E00426DDF /* Twitter */, ); @@ -4154,7 +4154,7 @@ 51CE1C0923621EDA005548FC /* RefreshProgressView.xib in Resources */, 84C9FC9D2262A1A900D921D6 /* Assets.xcassets in Resources */, 514219582353C28900E07E2C /* main_ios.js in Resources */, - 51E36E8C239D6765006F47A5 /* AddWebFeedSelectFolderTableViewCell.xib in Resources */, + 51E36E8C239D6765006F47A5 /* AddFeedSelectFolderTableViewCell.xib in Resources */, 51C452B82265178500C03939 /* styleSheet.css in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -4854,7 +4854,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 51E36E71239D6610006F47A5 /* AddWebFeedSelectFolderTableViewCell.swift in Sources */, + 51E36E71239D6610006F47A5 /* AddFeedSelectFolderTableViewCell.swift in Sources */, 512DD4C92430086400C17B1F /* CloudKitAccountViewController.swift in Sources */, 840D617F2029031C009BC708 /* AppDelegate.swift in Sources */, 51236339236915B100951F16 /* RoundedProgressView.swift in Sources */, @@ -4878,7 +4878,7 @@ 51C45269226508F600C03939 /* MasterFeedTableViewCell.swift in Sources */, 51F85BFD2275DCA800C787DC /* SingleLineUILabelSizer.swift in Sources */, 517630232336657E00E15FFF /* WebViewProvider.swift in Sources */, - 51E43962238037C400015C31 /* AddWebFeedFolderViewController.swift in Sources */, + 51E43962238037C400015C31 /* AddFeedFolderViewController.swift in Sources */, 519ED47A24482AEB007F8E94 /* EnableExtensionPointViewController.swift in Sources */, 51C4528F226509BD00C03939 /* UnreadFeed.swift in Sources */, 51FD413B2342BD0500880194 /* MasterTimelineUnreadCountView.swift in Sources */, @@ -4979,7 +4979,7 @@ 512392C224E33A3C00F11704 /* RedditEnterDetailTableViewController.swift in Sources */, 51C452762265091600C03939 /* MasterTimelineViewController.swift in Sources */, 5108F6D823763094001ABC45 /* TickMarkSlider.swift in Sources */, - 51C452882265093600C03939 /* AddWebFeedViewController.swift in Sources */, + 51C452882265093600C03939 /* AddFeedViewController.swift in Sources */, 51B5C8C023F3866C00032075 /* ExtensionFeedAddRequestFile.swift in Sources */, 51A169A0235E10D700EB091F /* FeedbinAccountViewController.swift in Sources */, 51934CCE2310792F006127BE /* ActivityManager.swift in Sources */, diff --git a/iOS/Add/Add.storyboard b/iOS/Add/Add.storyboard index ef9b03fad..3e86949aa 100644 --- a/iOS/Add/Add.storyboard +++ b/iOS/Add/Add.storyboard @@ -11,7 +11,7 @@ - + @@ -158,7 +158,7 @@ - + diff --git a/iOS/Add/AddWebFeedFolderViewController.swift b/iOS/Add/AddFeedFolderViewController.swift similarity index 90% rename from iOS/Add/AddWebFeedFolderViewController.swift rename to iOS/Add/AddFeedFolderViewController.swift index 9039bc782..367a85753 100644 --- a/iOS/Add/AddWebFeedFolderViewController.swift +++ b/iOS/Add/AddFeedFolderViewController.swift @@ -1,5 +1,5 @@ // -// AddWebFeedFolderViewController.swift +// AddFeedFolderViewController.swift // NetNewsWire-iOS // // Created by Maurice Parker on 11/16/19. @@ -10,13 +10,13 @@ import UIKit import RSCore import Account -protocol AddWebFeedFolderViewControllerDelegate { +protocol AddFeedFolderViewControllerDelegate { func didSelect(container: Container) } -class AddWebFeedFolderViewController: UITableViewController { +class AddFeedFolderViewController: UITableViewController { - var delegate: AddWebFeedFolderViewControllerDelegate? + var delegate: AddFeedFolderViewControllerDelegate? var initialContainer: Container? var containers = [Container]() @@ -90,7 +90,7 @@ class AddWebFeedFolderViewController: UITableViewController { } -private extension AddWebFeedFolderViewController { +private extension AddFeedFolderViewController { func dismiss() { dismiss(animated: true) diff --git a/iOS/Add/AddWebFeedSelectFolderTableViewCell.swift b/iOS/Add/AddFeedSelectFolderTableViewCell.swift similarity index 81% rename from iOS/Add/AddWebFeedSelectFolderTableViewCell.swift rename to iOS/Add/AddFeedSelectFolderTableViewCell.swift index 287d25807..2ce871397 100644 --- a/iOS/Add/AddWebFeedSelectFolderTableViewCell.swift +++ b/iOS/Add/AddFeedSelectFolderTableViewCell.swift @@ -1,5 +1,5 @@ // -// AddWebFeedSelectFolderTableViewCell.swift +// AddFeedSelectFolderTableViewCell.swift // NetNewsWire-iOS // // Created by Maurice Parker on 12/8/19. @@ -8,7 +8,7 @@ import UIKit -class AddWebFeedSelectFolderTableViewCell: VibrantTableViewCell { +class AddFeedSelectFolderTableViewCell: VibrantTableViewCell { @IBOutlet weak var folderLabel: UILabel! @IBOutlet weak var detailLabel: UILabel! diff --git a/iOS/Add/AddWebFeedSelectFolderTableViewCell.xib b/iOS/Add/AddFeedSelectFolderTableViewCell.xib similarity index 93% rename from iOS/Add/AddWebFeedSelectFolderTableViewCell.xib rename to iOS/Add/AddFeedSelectFolderTableViewCell.xib index 7b742defa..42b6281a0 100644 --- a/iOS/Add/AddWebFeedSelectFolderTableViewCell.xib +++ b/iOS/Add/AddFeedSelectFolderTableViewCell.xib @@ -1,15 +1,16 @@ - + - + + - + @@ -26,6 +27,7 @@ + @@ -37,10 +39,9 @@ - - - + + diff --git a/iOS/Add/AddWebFeedViewController.swift b/iOS/Add/AddFeedViewController.swift similarity index 91% rename from iOS/Add/AddWebFeedViewController.swift rename to iOS/Add/AddFeedViewController.swift index 48d5c5fde..e5e6e4e8e 100644 --- a/iOS/Add/AddWebFeedViewController.swift +++ b/iOS/Add/AddFeedViewController.swift @@ -18,7 +18,7 @@ enum AddFeedType { case twitter } -class AddWebFeedViewController: UITableViewController { +class AddFeedViewController: UITableViewController { @IBOutlet weak var activityIndicator: UIActivityIndicatorView! @IBOutlet weak var addButton: UIBarButtonItem! @@ -80,7 +80,7 @@ class AddWebFeedViewController: UITableViewController { updateFolderLabel() - tableView.register(UINib(nibName: "AddWebFeedSelectFolderTableViewCell", bundle: nil), forCellReuseIdentifier: "AddWebFeedSelectFolderTableViewCell") + tableView.register(UINib(nibName: "AddFeedSelectFolderTableViewCell", bundle: nil), forCellReuseIdentifier: "AddFeedSelectFolderTableViewCell") NotificationCenter.default.addObserver(self, selector: #selector(textDidChange(_:)), name: UITextField.textDidChangeNotification, object: urlTextField) @@ -150,7 +150,7 @@ class AddWebFeedViewController: UITableViewController { override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { if indexPath.row == 2 { - let cell = tableView.dequeueReusableCell(withIdentifier: "AddWebFeedSelectFolderTableViewCell", for: indexPath) as? AddWebFeedSelectFolderTableViewCell + let cell = tableView.dequeueReusableCell(withIdentifier: "AddFeedSelectFolderTableViewCell", for: indexPath) as? AddFeedSelectFolderTableViewCell cell!.detailLabel.text = folderLabel return cell! } else { @@ -162,7 +162,7 @@ class AddWebFeedViewController: UITableViewController { if indexPath.row == 2 { let navController = UIStoryboard.add.instantiateViewController(withIdentifier: "AddWebFeedFolderNavViewController") as! UINavigationController navController.modalPresentationStyle = .currentContext - let folderViewController = navController.topViewController as! AddWebFeedFolderViewController + let folderViewController = navController.topViewController as! AddFeedFolderViewController folderViewController.delegate = self folderViewController.initialContainer = container present(navController, animated: true) @@ -173,7 +173,7 @@ class AddWebFeedViewController: UITableViewController { // MARK: AddWebFeedFolderViewControllerDelegate -extension AddWebFeedViewController: AddWebFeedFolderViewControllerDelegate { +extension AddFeedViewController: AddFeedFolderViewControllerDelegate { func didSelect(container: Container) { self.container = container updateFolderLabel() @@ -183,7 +183,7 @@ extension AddWebFeedViewController: AddWebFeedFolderViewControllerDelegate { // MARK: UITextFieldDelegate -extension AddWebFeedViewController: UITextFieldDelegate { +extension AddFeedViewController: UITextFieldDelegate { func textFieldShouldReturn(_ textField: UITextField) -> Bool { textField.resignFirstResponder() @@ -194,7 +194,7 @@ extension AddWebFeedViewController: UITextFieldDelegate { // MARK: Private -private extension AddWebFeedViewController { +private extension AddFeedViewController { func updateUI() { addButton.isEnabled = (urlTextField.text?.mayBeURL ?? false) diff --git a/iOS/Add/Reddit/RedditSelectSortTableViewController.swift b/iOS/Add/Reddit/RedditSelectSortTableViewController.swift index c707a6031..6ea6321b4 100644 --- a/iOS/Add/Reddit/RedditSelectSortTableViewController.swift +++ b/iOS/Add/Reddit/RedditSelectSortTableViewController.swift @@ -36,7 +36,7 @@ class RedditSelectSortTableViewController: UITableViewController { guard let redditFeedType = redditFeedType else { return } let url = RedditFeedProvider.buildURL(redditFeedType, username: username, subreddit: subreddit, sort: sort)?.absoluteString - let addViewController = UIStoryboard.add.instantiateViewController(withIdentifier: "AddWebFeedViewController") as! AddWebFeedViewController + let addViewController = UIStoryboard.add.instantiateViewController(withIdentifier: "AddWebFeedViewController") as! AddFeedViewController addViewController.addFeedType = .reddit addViewController.initialFeed = url navigationController?.pushViewController(addViewController, animated: true) diff --git a/iOS/Add/Twitter/TwitterEnterDetailTableViewController.swift b/iOS/Add/Twitter/TwitterEnterDetailTableViewController.swift index 87043e9f6..91628260d 100644 --- a/iOS/Add/Twitter/TwitterEnterDetailTableViewController.swift +++ b/iOS/Add/Twitter/TwitterEnterDetailTableViewController.swift @@ -52,7 +52,7 @@ class TwitterEnterDetailTableViewController: UITableViewController { url = TwitterFeedProvider.buildURL(twitterFeedType, username: nil, screenName: nil, searchField: text)?.absoluteString } - let addViewController = UIStoryboard.add.instantiateViewController(withIdentifier: "AddWebFeedViewController") as! AddWebFeedViewController + let addViewController = UIStoryboard.add.instantiateViewController(withIdentifier: "AddWebFeedViewController") as! AddFeedViewController addViewController.addFeedType = .twitter addViewController.initialFeed = url navigationController?.pushViewController(addViewController, animated: true) diff --git a/iOS/Add/Twitter/TwitterSelectAccountTableViewController.swift b/iOS/Add/Twitter/TwitterSelectAccountTableViewController.swift index 502647eea..80e84be10 100644 --- a/iOS/Add/Twitter/TwitterSelectAccountTableViewController.swift +++ b/iOS/Add/Twitter/TwitterSelectAccountTableViewController.swift @@ -36,7 +36,7 @@ class TwitterSelectAccountTableViewController: UITableViewController { let username = twitterFeedProviders[indexPath.row].screenName let url = TwitterFeedProvider.buildURL(twitterFeedType, username: username, screenName: nil, searchField: nil)?.absoluteString - let addViewController = UIStoryboard.add.instantiateViewController(withIdentifier: "AddWebFeedViewController") as! AddWebFeedViewController + let addViewController = UIStoryboard.add.instantiateViewController(withIdentifier: "AddWebFeedViewController") as! AddFeedViewController addViewController.addFeedType = .twitter addViewController.initialFeed = url navigationController?.pushViewController(addViewController, animated: true) diff --git a/iOS/Add/Twitter/TwitterSelectTypeTableViewController.swift b/iOS/Add/Twitter/TwitterSelectTypeTableViewController.swift index 9258e5682..a469c2f04 100644 --- a/iOS/Add/Twitter/TwitterSelectTypeTableViewController.swift +++ b/iOS/Add/Twitter/TwitterSelectTypeTableViewController.swift @@ -68,7 +68,7 @@ class TwitterSelectTypeTableViewController: UITableViewController { private extension TwitterSelectTypeTableViewController { func pushAddFeedController(_ url: String?) { - let addViewController = UIStoryboard.add.instantiateViewController(withIdentifier: "AddWebFeedViewController") as! AddWebFeedViewController + let addViewController = UIStoryboard.add.instantiateViewController(withIdentifier: "AddWebFeedViewController") as! AddFeedViewController addViewController.addFeedType = .twitter addViewController.initialFeed = url navigationController?.pushViewController(addViewController, animated: true) diff --git a/iOS/SceneCoordinator.swift b/iOS/SceneCoordinator.swift index b8052f0e4..c0f692411 100644 --- a/iOS/SceneCoordinator.swift +++ b/iOS/SceneCoordinator.swift @@ -1174,26 +1174,26 @@ class SceneCoordinator: NSObject, UndoableCommandRunner, UnreadCountProvider { let addNavViewController = UIStoryboard.add.instantiateViewController(withIdentifier: "AddWebFeedViewControllerNav") as! UINavigationController - let addViewController = addNavViewController.topViewController as! AddWebFeedViewController + let addViewController = addNavViewController.topViewController as! AddFeedViewController addViewController.initialFeed = initialFeed addViewController.initialFeedName = initialFeedName addNavViewController.modalPresentationStyle = .formSheet - addNavViewController.preferredContentSize = AddWebFeedViewController.preferredContentSizeForFormSheetDisplay + addNavViewController.preferredContentSize = AddFeedViewController.preferredContentSizeForFormSheetDisplay masterFeedViewController.present(addNavViewController, animated: true) } func showAddRedditFeed() { let addNavViewController = UIStoryboard.redditAdd.instantiateInitialViewController() as! UINavigationController addNavViewController.modalPresentationStyle = .formSheet - addNavViewController.preferredContentSize = AddWebFeedViewController.preferredContentSizeForFormSheetDisplay + addNavViewController.preferredContentSize = AddFeedViewController.preferredContentSizeForFormSheetDisplay masterFeedViewController.present(addNavViewController, animated: true) } func showAddTwitterFeed() { let addNavViewController = UIStoryboard.twitterAdd.instantiateInitialViewController() as! UINavigationController addNavViewController.modalPresentationStyle = .formSheet - addNavViewController.preferredContentSize = AddWebFeedViewController.preferredContentSizeForFormSheetDisplay + addNavViewController.preferredContentSize = AddFeedViewController.preferredContentSizeForFormSheetDisplay masterFeedViewController.present(addNavViewController, animated: true) } diff --git a/iOS/Settings/SettingsViewController.swift b/iOS/Settings/SettingsViewController.swift index 13fc9330d..1c6cd5c11 100644 --- a/iOS/Settings/SettingsViewController.swift +++ b/iOS/Settings/SettingsViewController.swift @@ -373,11 +373,11 @@ private extension SettingsViewController { self.dismiss(animated: true) let addNavViewController = UIStoryboard.add.instantiateViewController(withIdentifier: "AddWebFeedViewControllerNav") as! UINavigationController - let addViewController = addNavViewController.topViewController as! AddWebFeedViewController + let addViewController = addNavViewController.topViewController as! AddFeedViewController addViewController.initialFeed = appNewsURLString addViewController.initialFeedName = NSLocalizedString("NetNewsWire News", comment: "NetNewsWire News") addNavViewController.modalPresentationStyle = .formSheet - addNavViewController.preferredContentSize = AddWebFeedViewController.preferredContentSizeForFormSheetDisplay + addNavViewController.preferredContentSize = AddFeedViewController.preferredContentSizeForFormSheetDisplay presentingParentController?.present(addNavViewController, animated: true) }