diff --git a/Account/Sources/Account/AccountManager.swift b/Account/Sources/Account/AccountManager.swift index 64a9f0e00..351a3479e 100644 --- a/Account/Sources/Account/AccountManager.swift +++ b/Account/Sources/Account/AccountManager.swift @@ -351,54 +351,6 @@ public final class AccountManager: UnreadCountProvider { return false } - public func anyLocalOriCloudAccountHasAtLeastOneTwitterFeed() -> Bool { - // We removed our Twitter code, and the ability to read feeds from Twitter, - // when Twitter announced the end of the free tier for the Twitter API. - // We are cheering on Twitter’s increasing irrelevancy. - - for account in accounts { - if account.type == .cloudKit || account.type == .onMyMac { - for webfeed in account.flattenedWebFeeds() { - if let components = URLComponents(string: webfeed.url), let host = components.host { - if host == "twitter.com" { // Allow, for instance, blog.twitter.com, which might have an actual RSS feed - return true - } - } - } - } - } - - return false - } - - public func anyLocalOriCloudAccountHasAtLeastOneRedditAPIFeed() -> Bool { - // We removed our Reddit code, and the ability to read feeds from Reddit, - // when Reddit announced the end of the free tier for the Reddit API. - // We are cheering on Reddit’s increasing irrelevancy. - - for account in accounts { - if account.type == .cloudKit || account.type == .onMyMac { - for webfeed in account.flattenedWebFeeds() { - if feedRequiresRedditAPI(webfeed) { - return true - } - } - } - } - - return false - } - - /// Return true if a feed is for reddit.com and the path doesn’t end with .rss. - /// - /// More info: [Pathogen-David's Guide to RSS and Reddit!](https://www.reddit.com/r/pathogendavid/comments/tv8m9/pathogendavids_guide_to_rss_and_reddit/) - private func feedRequiresRedditAPI(_ feed: WebFeed) -> Bool { - if let components = URLComponents(string: feed.url), let host = components.host { - return host.hasSuffix("reddit.com") && !components.path.hasSuffix(".rss") - } - return false - } - // MARK: - Fetching Articles // These fetch articles from active accounts and return a merged Set
. diff --git a/Account/Tests/AccountTests/Feedly/FeedlyTestSecrets.swift b/Account/Tests/AccountTests/Feedly/FeedlyTestSecrets.swift index d5f36d5a5..f55e71043 100644 --- a/Account/Tests/AccountTests/Feedly/FeedlyTestSecrets.swift +++ b/Account/Tests/AccountTests/Feedly/FeedlyTestSecrets.swift @@ -14,7 +14,6 @@ struct FeedlyTestSecrets: SecretsProvider { var mercuryClientSecret = "" var feedlyClientId = "" var feedlyClientSecret = "" - var redditConsumerKey = "" var inoreaderAppId = "" var inoreaderAppKey = "" } diff --git a/Mac/AppDefaults.swift b/Mac/AppDefaults.swift index 0b071f0b2..de6fcba22 100644 --- a/Mac/AppDefaults.swift +++ b/Mac/AppDefaults.swift @@ -41,8 +41,6 @@ final class AppDefaults { static let exportOPMLAccountID = "exportOPMLAccountID" static let defaultBrowserID = "defaultBrowserID" static let currentThemeName = "currentThemeName" - static let twitterDeprecationAlertShown = "twitterDeprecationAlertShown" - static let redditDeprecationAlertShown = "redditDeprecationAlertShown" // Hidden prefs static let showDebugMenu = "ShowDebugMenu" @@ -300,24 +298,6 @@ final class AppDefaults { UserDefaults.standard.set(newValue.rawValue, forKey: Key.refreshInterval) } } - - var twitterDeprecationAlertShown: Bool { - get { - return AppDefaults.bool(for: Key.twitterDeprecationAlertShown) - } - set { - AppDefaults.setBool(for: Key.twitterDeprecationAlertShown, newValue) - } - } - - var redditDeprecationAlertShown: Bool { - get { - return AppDefaults.bool(for: Key.redditDeprecationAlertShown) - } - set { - AppDefaults.setBool(for: Key.redditDeprecationAlertShown, newValue) - } - } func registerDefaults() { #if DEBUG diff --git a/Mac/AppDelegate.swift b/Mac/AppDelegate.swift index 633a713d7..7feee8182 100644 --- a/Mac/AppDelegate.swift +++ b/Mac/AppDelegate.swift @@ -131,13 +131,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations, NSWorkspace.shared.notificationCenter.addObserver(self, selector: #selector(didWakeNotification(_:)), name: NSWorkspace.didWakeNotification, object: nil) appDelegate = self - - if shouldShowTwitterDeprecationAlert() { - showTwitterDeprecationAlert() - } - else if shouldShowRedditDeprecationAlert() { - showRedditDeprecationAlert() - } } // MARK: - API @@ -944,60 +937,6 @@ internal extension AppDelegate { } } - private func shouldShowTwitterDeprecationAlert() -> Bool { - if AppDefaults.shared.twitterDeprecationAlertShown { return false } - - let expiryDate = Date(timeIntervalSince1970: 1691539200) // August 9th 2023, 00:00 UTC - let currentDate = Date() - if currentDate > expiryDate { - return false // If after August 9th, don't show - } - - return AccountManager.shared.anyLocalOriCloudAccountHasAtLeastOneTwitterFeed() - } - - private func showTwitterDeprecationAlert() { - assert(shouldShowTwitterDeprecationAlert()) - - AppDefaults.shared.twitterDeprecationAlertShown = true - DispatchQueue.main.async { - let alert = NSAlert() - alert.alertStyle = .warning - alert.messageText = NSLocalizedString("Twitter Integration Removed", comment: "Twitter Integration Removed") - alert.informativeText = NSLocalizedString("Twitter has ended free access to the parts of the Twitter API that we need.\n\nSince Twitter does not provide RSS feeds, we’ve had to use the Twitter API. Without free access to that API, we can’t read feeds from Twitter.\n\nWe’ve left your Twitter feeds intact. If you have any starred items from those feeds, they will remain as long as you don’t delete those feeds.\n\nYou can still read whatever you have already downloaded. However, those feeds will no longer update.", comment: "Twitter deprecation informative text.") - alert.addButton(withTitle: NSLocalizedString("OK", comment: "OK")) - alert.buttons[0].keyEquivalent = "\r" - alert.runModal() - } - } - - private func shouldShowRedditDeprecationAlert() -> Bool { - if AppDefaults.shared.redditDeprecationAlertShown { return false } - - let expiryDate = Date(timeIntervalSince1970: 1701331200) // Thu Nov 30 2023 00:00:00 GMT-0800 (Pacific Standard Time) - let currentDate = Date() - if currentDate > expiryDate { - return false - } - - return AccountManager.shared.anyLocalOriCloudAccountHasAtLeastOneRedditAPIFeed() - } - - private func showRedditDeprecationAlert() { - assert(shouldShowRedditDeprecationAlert()) - AppDefaults.shared.redditDeprecationAlertShown = true - - DispatchQueue.main.async { - let alert = NSAlert() - alert.alertStyle = .warning - alert.messageText = NSLocalizedString("Reddit API Integration Removed", comment: "Reddit API Integration Removed") - alert.informativeText = NSLocalizedString("Reddit has ended free access to their API.\n\nThough Reddit does provide RSS feeds, we used the Reddit API to get more and better data. But, without free access to that API, we have had to stop using it.\n\nWe’ve left your Reddit feeds intact. If you have any starred items from those feeds, they will remain as long as you don’t delete those feeds.\n\nYou can still read whatever you have already downloaded.\n\nAlso, importantly — Reddit still provides RSS feeds, and you can follow Reddit activity through RSS.", comment: "Reddit deprecation message") - alert.addButton(withTitle: NSLocalizedString("OK", comment: "OK")) - alert.buttons[0].keyEquivalent = "\r" - alert.runModal() - } - } - @objc func openThemesFolder(_ sender: Any) { if themeImportPath == nil { let url = URL(fileURLWithPath: ArticleThemesManager.shared.folderPath) diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj index 7b1109b52..411d900da 100644 --- a/NetNewsWire.xcodeproj/project.pbxproj +++ b/NetNewsWire.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 52; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -121,15 +121,6 @@ 511D43EF231FBDE900FB1562 /* LaunchScreenPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 511D43ED231FBDE800FB1562 /* LaunchScreenPad.storyboard */; }; 511D4419231FC02D00FB1562 /* KeyboardManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 511D4410231FC02D00FB1562 /* KeyboardManager.swift */; }; 51236339236915B100951F16 /* RoundedProgressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 512363372369155100951F16 /* RoundedProgressView.swift */; }; - 512392BE24E33A3C00F11704 /* RedditSelectAccountTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 516AE603246AF37B00731738 /* RedditSelectAccountTableViewController.swift */; }; - 512392BF24E33A3C00F11704 /* RedditSelectSortTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 516AE607246AFC9900731738 /* RedditSelectSortTableViewController.swift */; }; - 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 */; }; @@ -1126,9 +1117,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 = ""; }; @@ -1206,11 +1194,6 @@ 516A093A2360A4A000EAE89B /* SettingsTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SettingsTableViewCell.xib; sourceTree = ""; }; 516A093F2361240900EAE89B /* Account.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Account.storyboard; sourceTree = ""; }; 516A09412361248000EAE89B /* Inspector.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Inspector.storyboard; sourceTree = ""; }; - 516AE5FF246AF34100731738 /* RedditAdd.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = RedditAdd.storyboard; sourceTree = ""; }; - 516AE601246AF36100731738 /* RedditSelectTypeTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RedditSelectTypeTableViewController.swift; sourceTree = ""; }; - 516AE603246AF37B00731738 /* RedditSelectAccountTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RedditSelectAccountTableViewController.swift; sourceTree = ""; }; - 516AE605246AF3A900731738 /* RedditEnterDetailTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RedditEnterDetailTableViewController.swift; sourceTree = ""; }; - 516AE607246AFC9900731738 /* RedditSelectSortTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RedditSelectSortTableViewController.swift; sourceTree = ""; }; 516AE9B22371C372007DEEAA /* MasterFeedTableViewSectionHeaderLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MasterFeedTableViewSectionHeaderLayout.swift; sourceTree = ""; }; 516AE9DE2372269A007DEEAA /* IconImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IconImage.swift; sourceTree = ""; }; 51707438232AA97100A461A3 /* ShareFolderPickerController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareFolderPickerController.swift; sourceTree = ""; }; @@ -1262,7 +1245,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 = ""; }; @@ -1760,17 +1742,6 @@ path = 1Password; 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 = ( @@ -1896,18 +1867,6 @@ path = Account; sourceTree = ""; }; - 516AE5DD246AF2DD00731738 /* Reddit */ = { - isa = PBXGroup; - children = ( - 516AE5FF246AF34100731738 /* RedditAdd.storyboard */, - 516AE601246AF36100731738 /* RedditSelectTypeTableViewController.swift */, - 516AE603246AF37B00731738 /* RedditSelectAccountTableViewController.swift */, - 516AE605246AF3A900731738 /* RedditEnterDetailTableViewController.swift */, - 516AE607246AFC9900731738 /* RedditSelectSortTableViewController.swift */, - ); - path = Reddit; - sourceTree = ""; - }; 5183CCEA226F70350010922C /* Timer */ = { isa = PBXGroup; children = ( @@ -2092,8 +2051,6 @@ 51C4528B2265095F00C03939 /* AddFolderViewController.swift */, 510289CC24519A1D00426DDF /* SelectComboTableViewCell.swift */, 51E36E8B239D6765006F47A5 /* AddFeedSelectFolderTableViewCell.xib */, - 516AE5DD246AF2DD00731738 /* Reddit */, - 510289CE2451BA1E00426DDF /* Twitter */, ); path = Add; sourceTree = ""; @@ -3364,7 +3321,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 */, 51077C5627A86C9E000C71DB /* Hyperlegible.nnwtheme in Resources */, @@ -3385,7 +3341,6 @@ 511D43CF231FA62200FB1562 /* DetailKeyboardShortcuts.plist in Resources */, 51A1699A235E10D700EB091F /* Settings.storyboard in Resources */, 49F40DF92335B71000552BF4 /* newsfoot.js in Resources */, - 512392C024E33A3C00F11704 /* RedditAdd.storyboard in Resources */, 51F85BEF2272520B00C787DC /* Thanks.rtf in Resources */, 51CE1C0923621EDA005548FC /* RefreshProgressView.xib in Resources */, 84C9FC9D2262A1A900D921D6 /* Assets.xcassets in Resources */, @@ -4034,7 +3989,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 */, @@ -4069,17 +4023,13 @@ C5A6ED6D23C9B0C800AB6BE2 /* UIActivityViewController-Extensions.swift in Sources */, 5108F6D42375EEEF001ABC45 /* TimelinePreviewTableViewController.swift in Sources */, 84CAFCA522BC8C08007694F0 /* FetchRequestQueue.swift in Sources */, - 512392BE24E33A3C00F11704 /* RedditSelectAccountTableViewController.swift in Sources */, 51C4529C22650A1000C03939 /* SingleFaviconDownloader.swift in Sources */, 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 */, 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 */, @@ -4089,7 +4039,6 @@ 51EF0F7E2277A57D0050506E /* MasterTimelineAccessibilityCellLayout.swift in Sources */, 51A1699B235E10D700EB091F /* AccountInspectorViewController.swift in Sources */, 512D554423C804DE0023FFFA /* OpenInSafariActivity.swift in Sources */, - 512392C224E33A3C00F11704 /* RedditEnterDetailTableViewController.swift in Sources */, 51C452762265091600C03939 /* MasterTimelineViewController.swift in Sources */, 5195C1DC2720BD3000888867 /* MasterFeedRowIdentifier.swift in Sources */, 5108F6D823763094001ABC45 /* TickMarkSlider.swift in Sources */, @@ -4114,7 +4063,6 @@ 51C4529B22650A1000C03939 /* FaviconDownloader.swift in Sources */, 84DEE56622C32CA4005FC42C /* SmartFeedDelegate.swift in Sources */, 512E09012268907400BDCFDD /* MasterFeedTableViewSectionHeader.swift in Sources */, - 512392BF24E33A3C00F11704 /* RedditSelectSortTableViewController.swift in Sources */, 516AE9E02372269A007DEEAA /* IconImage.swift in Sources */, 519ED456244828C3007F8E94 /* AddExtensionPointViewController.swift in Sources */, 51C45268226508F600C03939 /* MasterFeedUnreadCountView.swift in Sources */, diff --git a/Technotes/HowToSupportNetNewsWire.markdown b/Technotes/HowToSupportNetNewsWire.markdown index 36fcc9da3..5b7879ed4 100644 --- a/Technotes/HowToSupportNetNewsWire.markdown +++ b/Technotes/HowToSupportNetNewsWire.markdown @@ -14,7 +14,7 @@ Supporting all these things takes *work*. In no particular order … -* Write a blog instead of posting to Twitter or Facebook. (You can always re-post to those places if you want to extend your reach.) [Micro.blog](https://micro.blog/) is one good place to get going, but it’s not the only one. +* Write a blog instead of posting to Threads or Facebook or any other corporate social media. (You can always re-post to those places if you want to extend your reach.) [Micro.blog](https://micro.blog/) is one good place to get going, but it’s not the only one. * Use an RSS reader even if it’s not NetNewsWire. (There are a bunch of good ones!) * Teach other people to use RSS readers. Blog about RSS readers. And about other open web technologies and apps. * Suggest apps for [macopenweb.com](https://macopenweb.com/). diff --git a/iOS/Add/AddFeedViewController.swift b/iOS/Add/AddFeedViewController.swift index f3eb6cad2..f5a38a1ca 100644 --- a/iOS/Add/AddFeedViewController.swift +++ b/iOS/Add/AddFeedViewController.swift @@ -14,8 +14,6 @@ import RSParser enum AddFeedType { case web - case reddit - case twitter } class AddFeedViewController: UITableViewController { @@ -41,12 +39,6 @@ class AddFeedViewController: UITableViewController { super.viewDidLoad() switch addFeedType { - 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/Reddit/RedditAdd.storyboard b/iOS/Add/Reddit/RedditAdd.storyboard deleted file mode 100644 index 738c51e87..000000000 --- a/iOS/Add/Reddit/RedditAdd.storyboard +++ /dev/null @@ -1,392 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/iOS/Add/Reddit/RedditEnterDetailTableViewController.swift b/iOS/Add/Reddit/RedditEnterDetailTableViewController.swift deleted file mode 100644 index be1e75073..000000000 --- a/iOS/Add/Reddit/RedditEnterDetailTableViewController.swift +++ /dev/null @@ -1,64 +0,0 @@ -// -// RedditEnterDetailTableViewController.swift -// NetNewsWire-iOS -// -// Created by Maurice Parker on 5/12/20. -// Copyright © 2020 Ranchero Software. All rights reserved. -// - -import Foundation - -import UIKit -import Account - -class RedditEnterDetailTableViewController: UITableViewController { - - @IBOutlet weak var detailTextField: UITextField! - - var nextBarButtonItem = UIBarButtonItem() - var redditFeedType: RedditFeedType? - - override func viewDidLoad() { - super.viewDidLoad() - - nextBarButtonItem.title = NSLocalizedString("Next", comment: "Next") - nextBarButtonItem.style = .plain - nextBarButtonItem.target = self - nextBarButtonItem.action = #selector(nextScene) - navigationItem.rightBarButtonItem = nextBarButtonItem - - detailTextField.delegate = self - NotificationCenter.default.addObserver(self, selector: #selector(textDidChange(_:)), name: UITextField.textDidChangeNotification, object: detailTextField) - - updateUI() - } - - @objc func nextScene() { - let selectSort = UIStoryboard.redditAdd.instantiateController(ofType: RedditSelectSortTableViewController.self) - selectSort.redditFeedType = redditFeedType - selectSort.subreddit = detailTextField.text?.collapsingWhitespace - navigationController?.pushViewController(selectSort, animated: true) - } - - @objc func textDidChange(_ note: Notification) { - updateUI() - } - -} - -extension RedditEnterDetailTableViewController: UITextFieldDelegate { - - func textFieldShouldReturn(_ textField: UITextField) -> Bool { - textField.resignFirstResponder() - return true - } - -} - -private extension RedditEnterDetailTableViewController { - - func updateUI() { - nextBarButtonItem.isEnabled = !(detailTextField.text?.isEmpty ?? false) - } - -} diff --git a/iOS/Add/Reddit/RedditSelectAccountTableViewController.swift b/iOS/Add/Reddit/RedditSelectAccountTableViewController.swift deleted file mode 100644 index 98ba818d2..000000000 --- a/iOS/Add/Reddit/RedditSelectAccountTableViewController.swift +++ /dev/null @@ -1,42 +0,0 @@ -// -// RedditSelectAccountTableViewController.swift -// NetNewsWire-iOS -// -// Created by Maurice Parker on 5/12/20. -// Copyright © 2020 Ranchero Software. All rights reserved. -// - -import Foundation - -import UIKit -import Account - -class RedditSelectAccountTableViewController: UITableViewController { - - private var redditFeedProviders = [RedditFeedProvider]() - - var redditFeedType: RedditFeedType? - - override func viewDidLoad() { - super.viewDidLoad() - redditFeedProviders = ExtensionPointManager.shared.activeExtensionPoints.values.compactMap { $0 as? RedditFeedProvider } - } - - override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { - return redditFeedProviders.count - } - - override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { - let cell = tableView.dequeueReusableCell(withIdentifier: "Cell", for: indexPath) - cell.textLabel?.text = redditFeedProviders[indexPath.row].title - return cell - } - - override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { - let selectSort = UIStoryboard.redditAdd.instantiateController(ofType: RedditSelectSortTableViewController.self) - selectSort.redditFeedType = redditFeedType - selectSort.username = redditFeedProviders[indexPath.row].username - navigationController?.pushViewController(selectSort, animated: true) - } - -} diff --git a/iOS/Add/Reddit/RedditSelectSortTableViewController.swift b/iOS/Add/Reddit/RedditSelectSortTableViewController.swift deleted file mode 100644 index 6ea6321b4..000000000 --- a/iOS/Add/Reddit/RedditSelectSortTableViewController.swift +++ /dev/null @@ -1,46 +0,0 @@ -// -// RedditSelectSortTableViewController.swift -// NetNewsWire-iOS -// -// Created by Maurice Parker on 5/12/20. -// Copyright © 2020 Ranchero Software. All rights reserved. -// - -import UIKit -import Account - -class RedditSelectSortTableViewController: UITableViewController { - - var redditFeedType: RedditFeedType? - var username: String? - var subreddit: String? - - override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { - - let sort: RedditSort - switch indexPath.row { - case 0: - sort = .best - case 1: - sort = .hot - case 2: - sort = .new - case 3: - sort = .top - case 4: - sort = .rising - default: - fatalError() - } - - 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! AddFeedViewController - addViewController.addFeedType = .reddit - addViewController.initialFeed = url - navigationController?.pushViewController(addViewController, animated: true) - - } - -} diff --git a/iOS/Add/Reddit/RedditSelectTypeTableViewController.swift b/iOS/Add/Reddit/RedditSelectTypeTableViewController.swift deleted file mode 100644 index 1f8e2a0a7..000000000 --- a/iOS/Add/Reddit/RedditSelectTypeTableViewController.swift +++ /dev/null @@ -1,49 +0,0 @@ -// -// RedditSelectTypeTableViewController.swift -// NetNewsWire-iOS -// -// Created by Maurice Parker on 5/12/20. -// Copyright © 2020 Ranchero Software. All rights reserved. -// - -import UIKit -import Account - -class RedditSelectTypeTableViewController: UITableViewController { - - @IBAction func cancel(_ sender: Any) { - dismiss(animated: true) - } - - override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { - switch indexPath.row { - case 0: - let redditFeedProviders = ExtensionPointManager.shared.activeExtensionPoints.values.compactMap { $0 as? RedditFeedProvider } - if redditFeedProviders.count == 1 { - let selectSort = UIStoryboard.redditAdd.instantiateController(ofType: RedditSelectSortTableViewController.self) - selectSort.redditFeedType = .home - selectSort.username = redditFeedProviders.first!.username - navigationController?.pushViewController(selectSort, animated: true) - } else { - let selectAccount = UIStoryboard.redditAdd.instantiateController(ofType: RedditSelectAccountTableViewController.self) - selectAccount.redditFeedType = .home - navigationController?.pushViewController(selectAccount, animated: true) - } - case 1: - let selectSort = UIStoryboard.redditAdd.instantiateController(ofType: RedditSelectSortTableViewController.self) - selectSort.redditFeedType = .popular - navigationController?.pushViewController(selectSort, animated: true) - case 2: - let selectSort = UIStoryboard.redditAdd.instantiateController(ofType: RedditSelectSortTableViewController.self) - selectSort.redditFeedType = .all - navigationController?.pushViewController(selectSort, animated: true) - case 3: - let enterDetail = UIStoryboard.redditAdd.instantiateController(ofType: RedditEnterDetailTableViewController.self) - enterDetail.redditFeedType = .subreddit - navigationController?.pushViewController(enterDetail, animated: true) - default: - fatalError() - } - } - -} 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..b74aaa043 100644 --- a/iOS/AppAssets.swift +++ b/iOS/AppAssets.swift @@ -101,14 +101,6 @@ struct AppAssets { return UIImage(named: "disclosure")! }() - static var contextMenuReddit: UIImage = { - return UIImage(named: "contextMenuReddit")! - }() - - static var contextMenuTwitter: UIImage = { - return UIImage(named: "contextMenuTwitter")! - }() - static var copyImage: UIImage = { return UIImage(systemName: "doc.on.doc")! }() @@ -121,14 +113,6 @@ struct AppAssets { UIImage(systemName: "square.and.pencil")! }() - static var extensionPointReddit: RSImage = { - return RSImage(named: "extensionPointReddit")! - }() - - static var extensionPointTwitter: UIImage = { - return UIImage(named: "extensionPointTwitter")! - }() - static var faviconTemplateImage: RSImage = { return RSImage(named: "faviconTemplateImage")! }() @@ -201,10 +185,6 @@ struct AppAssets { return UIColor(named: "primaryAccentColor")! } - static var redditOriginal: UIImage = { - return UIImage(named: "redditWhite")!.withRenderingMode(.alwaysOriginal).withTintColor(.secondaryLabel) - }() - static var safariImage: UIImage = { return UIImage(systemName: "safari")! }() @@ -264,10 +244,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 6e2964c2d..23c545780 100644 --- a/iOS/MasterFeed/MasterFeedViewController.swift +++ b/iOS/MasterFeed/MasterFeedViewController.swift @@ -445,16 +445,6 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner { self.coordinator.showAddWebFeed() } - let addRedditFeedActionTitle = NSLocalizedString("Add Reddit Feed", comment: "Add Reddit Feed") - let addRedditFeedAction = UIAlertAction(title: addRedditFeedActionTitle, style: .default) { _ in - 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() @@ -462,15 +452,6 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner { alertController.addAction(addWebFeedAction) - if AccountManager.shared.activeAccounts.contains(where: { $0.type == .onMyMac || $0.type == .cloudKit }) { - if ExtensionPointManager.shared.isRedditEnabled { - alertController.addAction(addRedditFeedAction) - } - if ExtensionPointManager.shared.isTwitterEnabled { - alertController.addAction(addTwitterFeedAction) - } - } - alertController.addAction(addWebFolderAction) alertController.addAction(cancelAction) @@ -649,9 +630,7 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner { /* Context Menu Order: 1. Add Web Feed - 2. Add Reddit Feed - 3. Add Twitter Feed - 4. Add Folder + 2. Add Folder */ var menuItems: [UIAction] = [] @@ -662,23 +641,6 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner { } menuItems.append(addWebFeedAction) - if AccountManager.shared.activeAccounts.contains(where: { $0.type == .onMyMac || $0.type == .cloudKit }) { - if ExtensionPointManager.shared.isRedditEnabled { - let addRedditFeedActionTitle = NSLocalizedString("Add Reddit Feed", comment: "Add Reddit Feed") - let addRedditFeedAction = UIAction(title: addRedditFeedActionTitle, image: AppAssets.contextMenuReddit.tinted(color: .label)) { _ in - self.coordinator.showAddRedditFeed() - } - 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") let addWebFolderAction = UIAction(title: addWebFolderActionTitle, image: AppAssets.folderOutlinePlus) { _ in self.coordinator.showAddFolder() diff --git a/iOS/Resources/Assets.xcassets/contextMenuReddit.imageset/Contents.json b/iOS/Resources/Assets.xcassets/contextMenuReddit.imageset/Contents.json deleted file mode 100644 index 21dcfdf56..000000000 --- a/iOS/Resources/Assets.xcassets/contextMenuReddit.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "filename" : "redditContextMenu.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/iOS/Resources/Assets.xcassets/contextMenuReddit.imageset/redditContextMenu.pdf b/iOS/Resources/Assets.xcassets/contextMenuReddit.imageset/redditContextMenu.pdf deleted file mode 100644 index aac84d620..000000000 Binary files a/iOS/Resources/Assets.xcassets/contextMenuReddit.imageset/redditContextMenu.pdf and /dev/null differ 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 c7d5a5d74..000000000 Binary files a/iOS/Resources/Assets.xcassets/contextMenuTwitter.imageset/twitterContextMenu.pdf and /dev/null differ diff --git a/iOS/Resources/Assets.xcassets/extensionPointReddit.imageset/Contents.json b/iOS/Resources/Assets.xcassets/extensionPointReddit.imageset/Contents.json deleted file mode 100644 index 237cc2c56..000000000 --- a/iOS/Resources/Assets.xcassets/extensionPointReddit.imageset/Contents.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "images" : [ - { - "filename" : "reddit_logo.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "template-rendering-intent" : "original" - } -} diff --git a/iOS/Resources/Assets.xcassets/extensionPointReddit.imageset/reddit_logo.pdf b/iOS/Resources/Assets.xcassets/extensionPointReddit.imageset/reddit_logo.pdf deleted file mode 100644 index 2d16b9786..000000000 Binary files a/iOS/Resources/Assets.xcassets/extensionPointReddit.imageset/reddit_logo.pdf and /dev/null differ diff --git a/iOS/Resources/Assets.xcassets/extensionPointTwitter.imageset/Contents.json b/iOS/Resources/Assets.xcassets/extensionPointTwitter.imageset/Contents.json deleted file mode 100644 index 46fecf23a..000000000 --- a/iOS/Resources/Assets.xcassets/extensionPointTwitter.imageset/Contents.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "images" : [ - { - "filename" : "twitter.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "template-rendering-intent" : "original" - } -} diff --git a/iOS/Resources/Assets.xcassets/extensionPointTwitter.imageset/twitter.pdf b/iOS/Resources/Assets.xcassets/extensionPointTwitter.imageset/twitter.pdf deleted file mode 100644 index e50de4443..000000000 Binary files a/iOS/Resources/Assets.xcassets/extensionPointTwitter.imageset/twitter.pdf and /dev/null differ diff --git a/iOS/Resources/Assets.xcassets/redditWhite.imageset/Contents.json b/iOS/Resources/Assets.xcassets/redditWhite.imageset/Contents.json deleted file mode 100644 index fc545ce7c..000000000 --- a/iOS/Resources/Assets.xcassets/redditWhite.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "filename" : "redditWhite.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/iOS/Resources/Assets.xcassets/redditWhite.imageset/redditWhite.pdf b/iOS/Resources/Assets.xcassets/redditWhite.imageset/redditWhite.pdf deleted file mode 100644 index 4d66907a9..000000000 Binary files a/iOS/Resources/Assets.xcassets/redditWhite.imageset/redditWhite.pdf and /dev/null differ diff --git a/iOS/Resources/Assets.xcassets/twitterWhite.imageset/Contents.json b/iOS/Resources/Assets.xcassets/twitterWhite.imageset/Contents.json deleted file mode 100644 index bca634d24..000000000 --- a/iOS/Resources/Assets.xcassets/twitterWhite.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "filename" : "twitter_white.png", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/iOS/Resources/Assets.xcassets/twitterWhite.imageset/twitter_white.png b/iOS/Resources/Assets.xcassets/twitterWhite.imageset/twitter_white.png deleted file mode 100644 index a857fb029..000000000 Binary files a/iOS/Resources/Assets.xcassets/twitterWhite.imageset/twitter_white.png and /dev/null differ diff --git a/iOS/SceneCoordinator.swift b/iOS/SceneCoordinator.swift index 0d9b3a6fb..526eb7703 100644 --- a/iOS/SceneCoordinator.swift +++ b/iOS/SceneCoordinator.swift @@ -1211,20 +1211,6 @@ class SceneCoordinator: NSObject, UndoableCommandRunner { masterFeedViewController.present(addNavViewController, animated: true) } - func showAddRedditFeed() { - let addNavViewController = UIStoryboard.redditAdd.instantiateInitialViewController() as! UINavigationController - addNavViewController.modalPresentationStyle = .formSheet - addNavViewController.preferredContentSize = AddFeedViewController.preferredContentSizeForFormSheetDisplay - 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..ef48e061d 100644 --- a/iOS/UIKit Extensions/UIStoryboard-Extensions.swift +++ b/iOS/UIKit Extensions/UIStoryboard-Extensions.swift @@ -20,14 +20,6 @@ extension UIStoryboard { return UIStoryboard(name: "Add", bundle: nil) } - static var redditAdd: 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) }