From 36822a77d00d4f5d03be84ad782bd693f76bb1be Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Fri, 3 Feb 2023 19:11:33 -0800 Subject: [PATCH] Remove Twitter integration. Fixes #3842 --- NetNewsWire.xcodeproj/project.pbxproj | 24 -- iOS/Add/AddFeedViewController.swift | 4 - iOS/Add/Twitter/TwitterAdd.storyboard | 247 ------------------ ...witterEnterDetailTableViewController.swift | 82 ------ ...tterSelectAccountTableViewController.swift | 45 ---- ...TwitterSelectTypeTableViewController.swift | 81 ------ iOS/AppAssets.swift | 12 - iOS/MasterFeed/MasterFeedViewController.swift | 18 +- .../contextMenuTwitter.imageset/Contents.json | 12 - .../twitterContextMenu.pdf | Bin 4835 -> 0 bytes .../Contents.json | 15 -- .../twitter.pdf | Bin 4237 -> 0 bytes .../twitterWhite.imageset/Contents.json | 12 - .../twitterWhite.imageset/twitter_white.png | Bin 7094 -> 0 bytes iOS/SceneCoordinator.swift | 7 - .../UIStoryboard-Extensions.swift | 4 - 16 files changed, 1 insertion(+), 562 deletions(-) delete mode 100644 iOS/Add/Twitter/TwitterAdd.storyboard delete mode 100644 iOS/Add/Twitter/TwitterEnterDetailTableViewController.swift delete mode 100644 iOS/Add/Twitter/TwitterSelectAccountTableViewController.swift delete mode 100644 iOS/Add/Twitter/TwitterSelectTypeTableViewController.swift delete mode 100644 iOS/Resources/Assets.xcassets/contextMenuTwitter.imageset/Contents.json delete mode 100644 iOS/Resources/Assets.xcassets/contextMenuTwitter.imageset/twitterContextMenu.pdf delete mode 100644 iOS/Resources/Assets.xcassets/extensionPointTwitter.imageset/Contents.json delete mode 100644 iOS/Resources/Assets.xcassets/extensionPointTwitter.imageset/twitter.pdf delete mode 100644 iOS/Resources/Assets.xcassets/twitterWhite.imageset/Contents.json delete mode 100644 iOS/Resources/Assets.xcassets/twitterWhite.imageset/twitter_white.png diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj index 034d736fd..fea51ec30 100644 --- a/NetNewsWire.xcodeproj/project.pbxproj +++ b/NetNewsWire.xcodeproj/project.pbxproj @@ -131,10 +131,6 @@ 512392C024E33A3C00F11704 /* RedditAdd.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 516AE5FF246AF34100731738 /* RedditAdd.storyboard */; }; 512392C124E33A3C00F11704 /* RedditSelectTypeTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 516AE601246AF36100731738 /* RedditSelectTypeTableViewController.swift */; }; 512392C224E33A3C00F11704 /* RedditEnterDetailTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 516AE605246AF3A900731738 /* RedditEnterDetailTableViewController.swift */; }; - 512392C324E3451400F11704 /* TwitterAdd.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 510289CF2451BA3A00426DDF /* TwitterAdd.storyboard */; }; - 512392C424E3451400F11704 /* TwitterSelectTypeTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 510289D12451BC1F00426DDF /* TwitterSelectTypeTableViewController.swift */; }; - 512392C524E3451400F11704 /* TwitterEnterDetailTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51BEB22C2451E8340066DEDD /* TwitterEnterDetailTableViewController.swift */; }; - 512392C624E3451400F11704 /* TwitterSelectAccountTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 510289D52451DDD100426DDF /* TwitterSelectAccountTableViewController.swift */; }; 5126EE97226CB48A00C22AFC /* SceneCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5126EE96226CB48A00C22AFC /* SceneCoordinator.swift */; }; 5127B238222B4849006D641D /* DetailKeyboardDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5127B236222B4849006D641D /* DetailKeyboardDelegate.swift */; }; 5127B23A222B4849006D641D /* DetailKeyboardShortcuts.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5127B237222B4849006D641D /* DetailKeyboardShortcuts.plist */; }; @@ -1151,9 +1147,6 @@ 3B826DCA2385C84800FC1ADB /* AccountsFeedWranglerWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountsFeedWranglerWindowController.swift; sourceTree = ""; }; 49F40DEF2335B71000552BF4 /* newsfoot.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = newsfoot.js; sourceTree = ""; }; 510289CC24519A1D00426DDF /* SelectComboTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectComboTableViewCell.swift; sourceTree = ""; }; - 510289CF2451BA3A00426DDF /* TwitterAdd.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = TwitterAdd.storyboard; sourceTree = ""; }; - 510289D12451BC1F00426DDF /* TwitterSelectTypeTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TwitterSelectTypeTableViewController.swift; sourceTree = ""; }; - 510289D52451DDD100426DDF /* TwitterSelectAccountTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TwitterSelectAccountTableViewController.swift; sourceTree = ""; }; 5103A9972421643300410853 /* blank.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = blank.html; sourceTree = ""; }; 5103A9B324216A4200410853 /* blank.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = blank.html; sourceTree = ""; }; 5103A9DA242258C600410853 /* AccountsAddCloudKit.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AccountsAddCloudKit.xib; sourceTree = ""; }; @@ -1298,7 +1291,6 @@ 51BB7C262335A8E5008E8144 /* ArticleActivityItemSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArticleActivityItemSource.swift; sourceTree = ""; }; 51BB7C302335ACDE008E8144 /* page.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = page.html; sourceTree = ""; }; 51BC4ADD247277DF000A6ED8 /* URL-Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "URL-Extensions.swift"; sourceTree = ""; }; - 51BEB22C2451E8340066DEDD /* TwitterEnterDetailTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TwitterEnterDetailTableViewController.swift; sourceTree = ""; }; 51C03080257D815A00609262 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Mac/Base.lproj/UnifiedWindow.storyboard; sourceTree = SOURCE_ROOT; }; 51C266E9238C334800F53014 /* ContextMenuPreviewViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContextMenuPreviewViewController.swift; sourceTree = ""; }; 51C4524E226506F400C03939 /* UIStoryboard-Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIStoryboard-Extensions.swift"; sourceTree = ""; }; @@ -1787,17 +1779,6 @@ path = Resources; sourceTree = ""; }; - 510289CE2451BA1E00426DDF /* Twitter */ = { - isa = PBXGroup; - children = ( - 510289CF2451BA3A00426DDF /* TwitterAdd.storyboard */, - 510289D12451BC1F00426DDF /* TwitterSelectTypeTableViewController.swift */, - 510289D52451DDD100426DDF /* TwitterSelectAccountTableViewController.swift */, - 51BEB22C2451E8340066DEDD /* TwitterEnterDetailTableViewController.swift */, - ); - path = Twitter; - sourceTree = ""; - }; 510C415D24E5CDE3008226FD /* ShareExtension */ = { isa = PBXGroup; children = ( @@ -2137,7 +2118,6 @@ 510289CC24519A1D00426DDF /* SelectComboTableViewCell.swift */, 51E36E8B239D6765006F47A5 /* AddFeedSelectFolderTableViewCell.xib */, 516AE5DD246AF2DD00731738 /* Reddit */, - 510289CE2451BA1E00426DDF /* Twitter */, ); path = Add; sourceTree = ""; @@ -3407,7 +3387,6 @@ 511D43D2231FA62C00FB1562 /* GlobalKeyboardShortcuts.plist in Resources */, 84C9FCA12262A1B300D921D6 /* Main.storyboard in Resources */, 51BB7C312335ACDE008E8144 /* page.html in Resources */, - 512392C324E3451400F11704 /* TwitterAdd.storyboard in Resources */, 516A093723609A3600EAE89B /* SettingsComboTableViewCell.xib in Resources */, 51F85BF32272531500C787DC /* Dedication.rtf in Resources */, 51077C5A27A86D16000C71DB /* Hyperlegible.nnwtheme in Resources */, @@ -4054,7 +4033,6 @@ 51C4529E22650A1900C03939 /* ImageDownloader.swift in Sources */, 51A66685238075AE00CB272D /* AddWebFeedDefaultContainer.swift in Sources */, 176813E92564BAE200D98635 /* WidgetDeepLinks.swift in Sources */, - 512392C424E3451400F11704 /* TwitterSelectTypeTableViewController.swift in Sources */, 51B5C87723F22B8200032075 /* ExtensionContainers.swift in Sources */, 51C45292226509C800C03939 /* TodayFeedDelegate.swift in Sources */, 51C452A222650A1900C03939 /* RSHTMLMetadata+Extension.swift in Sources */, @@ -4095,13 +4073,11 @@ 17D643B226F8A436008D4C05 /* ArticleThemeDownloader.swift in Sources */, 51E595A6228CC36500FCC42B /* ArticleStatusSyncTimer.swift in Sources */, 51F9F3F723DF6DB200A314FD /* ArticleIconSchemeHandler.swift in Sources */, - 512392C524E3451400F11704 /* TwitterEnterDetailTableViewController.swift in Sources */, 512AF9C2236ED52C0066F8BE /* ImageHeaderView.swift in Sources */, 512392C124E33A3C00F11704 /* RedditSelectTypeTableViewController.swift in Sources */, 515A5181243E90260089E588 /* ExtensionPointIdentifer.swift in Sources */, 51A1699F235E10D700EB091F /* AboutViewController.swift in Sources */, 51C45290226509C100C03939 /* PseudoFeed.swift in Sources */, - 512392C624E3451400F11704 /* TwitterSelectAccountTableViewController.swift in Sources */, 51C452A922650DC600C03939 /* ArticleRenderer.swift in Sources */, 51C45297226509E300C03939 /* DefaultFeedsImporter.swift in Sources */, 512E094D2268B8AB00BDCFDD /* DeleteCommand.swift in Sources */, diff --git a/iOS/Add/AddFeedViewController.swift b/iOS/Add/AddFeedViewController.swift index f3eb6cad2..98f473468 100644 --- a/iOS/Add/AddFeedViewController.swift +++ b/iOS/Add/AddFeedViewController.swift @@ -15,7 +15,6 @@ import RSParser enum AddFeedType { case web case reddit - case twitter } class AddFeedViewController: UITableViewController { @@ -44,9 +43,6 @@ class AddFeedViewController: UITableViewController { case .reddit: navigationItem.title = NSLocalizedString("Add Reddit Feed", comment: "Add Reddit Feed") navigationItem.leftBarButtonItem = nil - case .twitter: - navigationItem.title = NSLocalizedString("Add Twitter Feed", comment: "Add Twitter Feed") - navigationItem.leftBarButtonItem = nil default: break } diff --git a/iOS/Add/Twitter/TwitterAdd.storyboard b/iOS/Add/Twitter/TwitterAdd.storyboard deleted file mode 100644 index f6b2db210..000000000 --- a/iOS/Add/Twitter/TwitterAdd.storyboard +++ /dev/null @@ -1,247 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/iOS/Add/Twitter/TwitterEnterDetailTableViewController.swift b/iOS/Add/Twitter/TwitterEnterDetailTableViewController.swift deleted file mode 100644 index 91628260d..000000000 --- a/iOS/Add/Twitter/TwitterEnterDetailTableViewController.swift +++ /dev/null @@ -1,82 +0,0 @@ -// -// TwitterEnterDetailTableViewController.swift -// NetNewsWire-iOS -// -// Created by Maurice Parker on 4/23/20. -// Copyright © 2020 Ranchero Software. All rights reserved. -// - -import UIKit -import Account - -class TwitterEnterDetailTableViewController: UITableViewController { - - @IBOutlet weak var detailTextField: UITextField! - - var doneBarButtonItem = UIBarButtonItem() - var twitterFeedType: TwitterFeedType? - - override func viewDidLoad() { - super.viewDidLoad() - - doneBarButtonItem.title = NSLocalizedString("Next", comment: "Next") - doneBarButtonItem.style = .plain - doneBarButtonItem.target = self - doneBarButtonItem.action = #selector(done) - navigationItem.rightBarButtonItem = doneBarButtonItem - - if case .screenName = twitterFeedType { - navigationItem.title = NSLocalizedString("Enter Name", comment: "Enter Name") - detailTextField.placeholder = NSLocalizedString("Screen Name", comment: "Screen Name") - } else { - navigationItem.title = NSLocalizedString("Enter Search", comment: "Enter Search") - detailTextField.placeholder = NSLocalizedString("Search Term or #hashtag", comment: "Search Term") - } - - detailTextField.delegate = self - NotificationCenter.default.addObserver(self, selector: #selector(textDidChange(_:)), name: UITextField.textDidChangeNotification, object: detailTextField) - - updateUI() - } - - @objc func done() { - guard let twitterFeedType = twitterFeedType, var text = detailTextField.text?.collapsingWhitespace else { return } - - let url: String? - if twitterFeedType == .screenName { - if text.starts(with: "@") { - text = String(text[text.index(text.startIndex, offsetBy: 1).. Bool { - textField.resignFirstResponder() - return true - } - -} - -private extension TwitterEnterDetailTableViewController { - - func updateUI() { - doneBarButtonItem.isEnabled = !(detailTextField.text?.isEmpty ?? false) - } - -} diff --git a/iOS/Add/Twitter/TwitterSelectAccountTableViewController.swift b/iOS/Add/Twitter/TwitterSelectAccountTableViewController.swift deleted file mode 100644 index 80e84be10..000000000 --- a/iOS/Add/Twitter/TwitterSelectAccountTableViewController.swift +++ /dev/null @@ -1,45 +0,0 @@ -// -// TwitterSelectAccountTableViewController.swift -// NetNewsWire-iOS -// -// Created by Maurice Parker on 4/23/20. -// Copyright © 2020 Ranchero Software. All rights reserved. -// - -import UIKit -import Account - -class TwitterSelectAccountTableViewController: UITableViewController { - - private var twitterFeedProviders = [TwitterFeedProvider]() - - var twitterFeedType: TwitterFeedType? - - override func viewDidLoad() { - super.viewDidLoad() - twitterFeedProviders = ExtensionPointManager.shared.activeExtensionPoints.values.compactMap { $0 as? TwitterFeedProvider } - } - - override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { - return twitterFeedProviders.count - } - - override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { - let cell = tableView.dequeueReusableCell(withIdentifier: "Cell", for: indexPath) - cell.textLabel?.text = "@\(twitterFeedProviders[indexPath.row].screenName)" - return cell - } - - override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { - guard let twitterFeedType = twitterFeedType else { return } - - 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! 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 deleted file mode 100644 index e8bb2688b..000000000 --- a/iOS/Add/Twitter/TwitterSelectTypeTableViewController.swift +++ /dev/null @@ -1,81 +0,0 @@ -// -// TwitterSelectTypeTableViewController.swift -// NetNewsWire-iOS -// -// Created by Maurice Parker on 4/23/20. -// Copyright © 2020 Ranchero Software. All rights reserved. -// - -import UIKit -import Account - -class TwitterSelectTypeTableViewController: UITableViewController { - - private var twitterFeedProviders = [TwitterFeedProvider]() - - override func viewDidLoad() { - super.viewDidLoad() - twitterFeedProviders = ExtensionPointManager.shared.activeExtensionPoints.values.compactMap { $0 as? TwitterFeedProvider } - } - - @IBAction func cancel(_ sender: Any) { - dismiss(animated: true) - } - - override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { - let cell = super.tableView(tableView, cellForRowAt: indexPath) - if indexPath.row < 2 { - if twitterFeedProviders.count > 1 { - cell.accessoryType = .disclosureIndicator - } - } - return cell - } - - override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { - switch indexPath.row { - case 0: - if twitterFeedProviders.count == 1 { - let username = twitterFeedProviders.first!.screenName - let url = TwitterFeedProvider.buildURL(.homeTimeline, username: username, screenName: nil, searchField: nil)?.absoluteString - pushAddFeedController(url) - } else { - let selectAccount = UIStoryboard.twitterAdd.instantiateController(ofType: TwitterSelectAccountTableViewController.self) - selectAccount.twitterFeedType = .homeTimeline - navigationController?.pushViewController(selectAccount, animated: true) - } - case 1: - if twitterFeedProviders.count == 1 { - let username = twitterFeedProviders.first!.screenName - let url = TwitterFeedProvider.buildURL(.mentions, username: username, screenName: nil, searchField: nil)?.absoluteString - pushAddFeedController(url) - } else { - let selectAccount = UIStoryboard.twitterAdd.instantiateController(ofType: TwitterSelectAccountTableViewController.self) - selectAccount.twitterFeedType = .mentions - navigationController?.pushViewController(selectAccount, animated: true) - } - case 2: - let enterDetail = UIStoryboard.twitterAdd.instantiateController(ofType: TwitterEnterDetailTableViewController.self) - enterDetail.twitterFeedType = .screenName - navigationController?.pushViewController(enterDetail, animated: true) - case 3: - let enterDetail = UIStoryboard.twitterAdd.instantiateController(ofType: TwitterEnterDetailTableViewController.self) - enterDetail.twitterFeedType = .search - navigationController?.pushViewController(enterDetail, animated: true) - default: - fatalError() - } - } - -} - -private extension TwitterSelectTypeTableViewController { - - func pushAddFeedController(_ url: String?) { - let addViewController = UIStoryboard.add.instantiateViewController(withIdentifier: "AddWebFeedViewController") as! AddFeedViewController - addViewController.addFeedType = .twitter - addViewController.initialFeed = url - navigationController?.pushViewController(addViewController, animated: true) - } - -} diff --git a/iOS/AppAssets.swift b/iOS/AppAssets.swift index 2a5ed0659..54532faed 100644 --- a/iOS/AppAssets.swift +++ b/iOS/AppAssets.swift @@ -105,10 +105,6 @@ struct AppAssets { return UIImage(named: "contextMenuReddit")! }() - static var contextMenuTwitter: UIImage = { - return UIImage(named: "contextMenuTwitter")! - }() - static var copyImage: UIImage = { return UIImage(systemName: "doc.on.doc")! }() @@ -125,10 +121,6 @@ struct AppAssets { return RSImage(named: "extensionPointReddit")! }() - static var extensionPointTwitter: UIImage = { - return UIImage(named: "extensionPointTwitter")! - }() - static var faviconTemplateImage: RSImage = { return RSImage(named: "faviconTemplateImage")! }() @@ -264,10 +256,6 @@ struct AppAssets { return UIImage(systemName: "trash")! }() - static var twitterOriginal: UIImage = { - return UIImage(named: "twitterWhite")!.withRenderingMode(.alwaysOriginal).withTintColor(.secondaryLabel) - }() - static var unreadFeedImage: IconImage { let image = UIImage(systemName: "largecircle.fill.circle")! return IconImage(image, isSymbol: true, isBackgroundSupressed: true, preferredColor: AppAssets.secondaryAccentColor.cgColor) diff --git a/iOS/MasterFeed/MasterFeedViewController.swift b/iOS/MasterFeed/MasterFeedViewController.swift index 8dcaf04e0..f1d9fab78 100644 --- a/iOS/MasterFeed/MasterFeedViewController.swift +++ b/iOS/MasterFeed/MasterFeedViewController.swift @@ -450,11 +450,6 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner { self.coordinator.showAddRedditFeed() } - let addTwitterFeedActionTitle = NSLocalizedString("Add Twitter Feed", comment: "Add Twitter Feed") - let addTwitterFeedAction = UIAlertAction(title: addTwitterFeedActionTitle, style: .default) { _ in - self.coordinator.showAddTwitterFeed() - } - let addWebFolderdActionTitle = NSLocalizedString("Add Folder", comment: "Add Folder") let addWebFolderAction = UIAlertAction(title: addWebFolderdActionTitle, style: .default) { _ in self.coordinator.showAddFolder() @@ -466,9 +461,6 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner { if ExtensionPointManager.shared.isRedditEnabled { alertController.addAction(addRedditFeedAction) } - if ExtensionPointManager.shared.isTwitterEnabled { - alertController.addAction(addTwitterFeedAction) - } } alertController.addAction(addWebFolderAction) @@ -665,8 +657,7 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner { Context Menu Order: 1. Add Web Feed 2. Add Reddit Feed - 3. Add Twitter Feed - 4. Add Folder + 3. Add Folder */ var menuItems: [UIAction] = [] @@ -685,13 +676,6 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner { } menuItems.append(addRedditFeedAction) } - if ExtensionPointManager.shared.isTwitterEnabled { - let addTwitterFeedActionTitle = NSLocalizedString("Add Twitter Feed", comment: "Add Twitter Feed") - let addTwitterFeedAction = UIAction(title: addTwitterFeedActionTitle, image: AppAssets.contextMenuTwitter.tinted(color: .label)) { _ in - self.coordinator.showAddTwitterFeed() - } - menuItems.append(addTwitterFeedAction) - } } let addWebFolderActionTitle = NSLocalizedString("Add Folder", comment: "Add Folder") diff --git a/iOS/Resources/Assets.xcassets/contextMenuTwitter.imageset/Contents.json b/iOS/Resources/Assets.xcassets/contextMenuTwitter.imageset/Contents.json deleted file mode 100644 index 1cf455ca4..000000000 --- a/iOS/Resources/Assets.xcassets/contextMenuTwitter.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "filename" : "twitterContextMenu.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/iOS/Resources/Assets.xcassets/contextMenuTwitter.imageset/twitterContextMenu.pdf b/iOS/Resources/Assets.xcassets/contextMenuTwitter.imageset/twitterContextMenu.pdf deleted file mode 100644 index c7d5a5d74873444c0beeaeb63c2f7530a30204c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4835 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 Z!rD7?c8hrV{l7mmV|{bIdN?BS{{R$mYytoP diff --git a/iOS/SceneCoordinator.swift b/iOS/SceneCoordinator.swift index b26cdc5da..4130e7c99 100644 --- a/iOS/SceneCoordinator.swift +++ b/iOS/SceneCoordinator.swift @@ -1237,13 +1237,6 @@ class SceneCoordinator: NSObject, UndoableCommandRunner { masterFeedViewController.present(addNavViewController, animated: true) } - func showAddTwitterFeed() { - let addNavViewController = UIStoryboard.twitterAdd.instantiateInitialViewController() as! UINavigationController - addNavViewController.modalPresentationStyle = .formSheet - addNavViewController.preferredContentSize = AddFeedViewController.preferredContentSizeForFormSheetDisplay - masterFeedViewController.present(addNavViewController, animated: true) - } - func showAddFolder() { let addNavViewController = UIStoryboard.add.instantiateViewController(withIdentifier: "AddFolderViewControllerNav") as! UINavigationController addNavViewController.modalPresentationStyle = .formSheet diff --git a/iOS/UIKit Extensions/UIStoryboard-Extensions.swift b/iOS/UIKit Extensions/UIStoryboard-Extensions.swift index 92caedf99..56fc2b195 100644 --- a/iOS/UIKit Extensions/UIStoryboard-Extensions.swift +++ b/iOS/UIKit Extensions/UIStoryboard-Extensions.swift @@ -24,10 +24,6 @@ extension UIStoryboard { return UIStoryboard(name: "RedditAdd", bundle: nil) } - static var twitterAdd: UIStoryboard { - return UIStoryboard(name: "TwitterAdd", bundle: nil) - } - static var settings: UIStoryboard { return UIStoryboard(name: "Settings", bundle: nil) }