diff --git a/Mac/Base.lproj/AddRedditFeedSheet.xib b/Mac/Base.lproj/AddRedditFeedSheet.xib deleted file mode 100644 index a481f38af..000000000 --- a/Mac/Base.lproj/AddRedditFeedSheet.xib +++ /dev/null @@ -1,248 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Mac/MainWindow/AddFeed/AddFeedController.swift b/Mac/MainWindow/AddFeed/AddFeedController.swift index 824687187..4850f369d 100644 --- a/Mac/MainWindow/AddFeed/AddFeedController.swift +++ b/Mac/MainWindow/AddFeed/AddFeedController.swift @@ -45,9 +45,6 @@ import RSParser folder: folder, folderTreeController: folderTreeController, delegate: self) - case .redditFeed: - addFeedWindowController = AddRedditFeedWindowController(folderTreeController: folderTreeController, - delegate: self) } addFeedWindowController!.runSheetOnWindow(hostWindow) diff --git a/Mac/MainWindow/AddFeed/AddFeedWIndowController.swift b/Mac/MainWindow/AddFeed/AddFeedWIndowController.swift index 50ad03701..1935cbc0d 100644 --- a/Mac/MainWindow/AddFeed/AddFeedWIndowController.swift +++ b/Mac/MainWindow/AddFeed/AddFeedWIndowController.swift @@ -11,7 +11,6 @@ import Account enum AddFeedWindowControllerType { case webFeed - case redditFeed } @MainActor protocol AddFeedWindowControllerDelegate: AnyObject { diff --git a/Mac/MainWindow/AddRedditFeedWindowController.swift b/Mac/MainWindow/AddRedditFeedWindowController.swift deleted file mode 100644 index fc744d96f..000000000 --- a/Mac/MainWindow/AddRedditFeedWindowController.swift +++ /dev/null @@ -1,213 +0,0 @@ -// -// AddRedditFeedWindowController.swift -// NetNewsWire -// -// Created by Maurice Parker on 5/10/20. -// Copyright © 2020 Ranchero Software. All rights reserved. -// - -import AppKit -import RSCore -import RSTree -import Articles -import Account - -@MainActor final class AddRedditFeedWindowController : NSWindowController, AddFeedWindowController { - - @IBOutlet weak var typePopupButton: NSPopUpButton! - @IBOutlet weak var typeDescriptionLabel: NSTextField! - - @IBOutlet weak var accountLabel: NSTextField! - @IBOutlet weak var accountPopupButton: NSPopUpButton! - @IBOutlet weak var subredditTextField: NSTextField! - - @IBOutlet weak var typeToSortLayoutConstraint: NSLayoutConstraint! - - @IBOutlet weak var sortPopupButton: NSPopUpButton! - - @IBOutlet var nameTextField: NSTextField! - @IBOutlet var addButton: NSButton! - @IBOutlet var folderPopupButton: NSPopUpButton! - - private weak var delegate: AddFeedWindowControllerDelegate? - private var folderTreeController: TreeController! - - private var userSelectedSort: RedditSort { - switch sortPopupButton.selectedItem?.tag ?? 0 { - case 0: - return .best - case 1: - return .hot - case 2: - return .new - case 3: - return .top - default: - return .rising - } - } - - private var userEnteredSubreddit: String? { - var s = subredditTextField.stringValue - s = s.collapsingWhitespace - if s.isEmpty { - return nil - } - return s - } - - private var userEnteredTitle: String? { - var s = nameTextField.stringValue - s = s.collapsingWhitespace - if s.isEmpty { - return nil - } - return s - } - - var hostWindow: NSWindow! - - convenience init(folderTreeController: TreeController, delegate: AddFeedWindowControllerDelegate?) { - self.init(windowNibName: NSNib.Name("AddRedditFeedSheet")) - self.folderTreeController = folderTreeController - self.delegate = delegate - } - - func runSheetOnWindow(_ hostWindow: NSWindow) { - hostWindow.beginSheet(window!) { (returnCode: NSApplication.ModalResponse) -> Void in - } - } - - override func windowDidLoad() { - - let accountMenu = NSMenu() - for feedProvider in ExtensionPointManager.shared.activeFeedProviders { - if let redditFeedProvider = feedProvider as? RedditFeedProvider { - let accountMenuItem = NSMenuItem() - accountMenuItem.title = redditFeedProvider.title - accountMenu.addItem(accountMenuItem) - } - } - accountPopupButton.menu = accountMenu - - folderPopupButton.menu = FolderTreeMenu.createFolderPopupMenu(with: folderTreeController.rootNode, restrictToSpecialAccounts: true) - - if let container = AddWebFeedDefaultContainer.defaultContainer { - if let folder = container as? Folder, let account = folder.account { - FolderTreeMenu.select(account: account, folder: folder, in: folderPopupButton) - } else { - if let account = container as? Account { - FolderTreeMenu.select(account: account, folder: nil, in: folderPopupButton) - } - } - } - - updateUI() - } - - // MARK: Actions - - @IBAction func selectedType(_ sender: Any) { - subredditTextField.stringValue = "" - updateUI() - } - - @IBAction func cancel(_ sender: Any?) { - cancelSheet() - } - - @IBAction func addFeed(_ sender: Any?) { - guard let type = RedditFeedType(rawValue: typePopupButton.selectedItem?.tag ?? 0), - let atUsername = accountPopupButton.selectedItem?.title else { return } - - let username = String(atUsername[atUsername.index(atUsername.startIndex, offsetBy: 2).. Void)? = nil) { - let constant: CGFloat = collapsed ? 8 : 39 - - NSAnimationContext.beginGrouping() - NSAnimationContext.current.duration = 0.2 - NSAnimationContext.current.completionHandler = completion - typeToSortLayoutConstraint.animator().constant = constant - NSAnimationContext.endGrouping() - } - - func cancelSheet() { - delegate?.addFeedWindowControllerUserDidCancel(self) - } - - func selectedContainer() -> Container? { - return folderPopupButton.selectedItem?.representedObject as? Container - } -} diff --git a/Mac/Resources/en-GB.lproj/Localizable.strings b/Mac/Resources/en-GB.lproj/Localizable.strings index 53d9af2e4..be0165e27 100644 --- a/Mac/Resources/en-GB.lproj/Localizable.strings +++ b/Mac/Resources/en-GB.lproj/Localizable.strings @@ -348,14 +348,8 @@ New Folder... */ "button.title.new-folder" = "New Folder"; -/* New Reddit Feed... */ -"button.title.new-reddit-feed" = "New Reddit Feed..."; - -/* New Twitter Feed... */ -"button.title.new-twitter-feed" = "New Twitter Feed..."; - /* New Web Feed... */ -"button.title.new-web-feed" = "New Web Feed..."; +"button.title.new-web-feed" = "New Feed..."; /* Next Unread */ "button.title.next-read" = "Next Unread"; @@ -535,9 +529,6 @@ /* (No Text) */ "label.text.no-text" = "(No Text)"; -/* Posts from r/%@ */ -"label.text.posts-from-subreddit.%@" = "Posts from r/%@"; - /* Privacy Policy */ "label.text.privacy-policy" = "Privacy Policy"; @@ -547,15 +538,6 @@ /* Reader View */ "label.text.reader-view" = "Reader View"; -/* The most active posts */ -"label.text.reddit-active-posts" = "The most active posts"; - -/* The best posts on Reddit for you */ -"label.text.reddit-best-posts" = "The best posts on Reddit for you"; - -/* Your personal Reddit frontpage */ -"label.text.reddit-front-page" = "Your personal Reddit frontpage"; - /* Select an account or add a new account by clicking the + button. */ "label.text.select-or-add-account-explainer" = "Select an account or add a new account by clicking the + button."; @@ -595,9 +577,6 @@ /* Small */ "label.text.small" = "Small"; -/* Subreddit */ -"label.text.subreddit" = "Subreddit"; - /* Thanks */ "label.text.thanks" = "Thanks"; diff --git a/Mac/Resources/en.lproj/Localizable.strings b/Mac/Resources/en.lproj/Localizable.strings index c769a332f..9efcafdaa 100644 --- a/Mac/Resources/en.lproj/Localizable.strings +++ b/Mac/Resources/en.lproj/Localizable.strings @@ -344,9 +344,6 @@ New Folder... */ "button.title.new-folder" = "New Folder"; -/* New Reddit Feed... */ -"button.title.new-reddit-feed" = "New Reddit Feed..."; - /* New Twitter Feed... */ "button.title.new-twitter-feed" = "New Twitter Feed..."; @@ -528,9 +525,6 @@ /* (No Text) */ "label.text.no-text" = "(No Text)"; -/* Posts from r/%@ */ -"label.text.posts-from-subreddit.%@" = "Posts from r/%@"; - /* Privacy Policy */ "label.text.privacy-policy" = "Privacy Policy"; @@ -540,15 +534,6 @@ /* Reader View */ "label.text.reader-view" = "Reader View"; -/* The most active posts */ -"label.text.reddit-active-posts" = "The most active posts"; - -/* The best posts on Reddit for you */ -"label.text.reddit-best-posts" = "The best posts on Reddit for you"; - -/* Your personal Reddit frontpage */ -"label.text.reddit-front-page" = "Your personal Reddit frontpage"; - /* Select an account or add a new account by clicking the + button. */ "label.text.select-or-add-account-explainer" = "Select an account or add a new account by clicking the + button."; @@ -588,9 +573,6 @@ /* Small */ "label.text.small" = "Small"; -/* Subreddit */ -"label.text.subreddit" = "Subreddit"; - /* Thanks */ "label.text.thanks" = "Thanks"; diff --git a/Mac/Resources/zh-Hans.lproj/Localizable.strings b/Mac/Resources/zh-Hans.lproj/Localizable.strings index 7a52cb36b..8db3efc4a 100644 --- a/Mac/Resources/zh-Hans.lproj/Localizable.strings +++ b/Mac/Resources/zh-Hans.lproj/Localizable.strings @@ -347,14 +347,8 @@ New Folder... */ "button.title.new-folder" = "新建文件夹"; -/* New Reddit Feed... */ -"button.title.new-reddit-feed" = "添加 Reddit 订阅..."; - -/* New Twitter Feed... */ -"button.title.new-twitter-feed" = "添加 Twitter 订阅..."; - /* New Web Feed... */ -"button.title.new-web-feed" = "添加 Web 订阅..."; +"button.title.new-web-feed" = "添加 订阅..."; /* Next Unread */ "button.title.next-read" = "下一个未读"; @@ -531,9 +525,6 @@ /* (No Text) */ "label.text.no-text" = "（无文本）"; -/* Posts from r/%@ */ -"label.text.posts-from-subreddit.%@" = "来自 r/%@ 的帖子"; - /* Primary Contributors */ "label.text.primary-contributors" = "主要贡献者"; @@ -546,15 +537,6 @@ /* Reader View */ "label.text.reader-view" = "阅读器视图"; -/* The most active posts */ -"label.text.reddit-active-posts" = "最活跃的帖子"; - -/* The best posts on Reddit for you */ -"label.text.reddit-best-posts" = "为你提供的 Reddit 最佳帖子"; - -/* Your personal Reddit frontpage */ -"label.text.reddit-front-page" = "你的个人 Reddit 主页"; - /* Select an account or add a new account by clicking the + button. */ "label.text.select-or-add-account-explainer" = "选择一个账户或通过点击 + 添加新账户。"; @@ -594,9 +576,6 @@ /* Small */ "label.text.small" = "小"; -/* Subreddit */ -"label.text.subreddit" = "Subreddit"; - /* Thanks */ "label.text.thanks" = "鸣谢"; diff --git a/Mac/en-GB.lproj/AddRedditFeedSheet.strings b/Mac/en-GB.lproj/AddRedditFeedSheet.strings deleted file mode 100644 index cfce0c88a..000000000 --- a/Mac/en-GB.lproj/AddRedditFeedSheet.strings +++ /dev/null @@ -1,78 +0,0 @@ -/* Class = "NSMenuItem"; title = "Subreddit"; ObjectID = "0gG-oY-8yR"; */ -"0gG-oY-8yR.title" = "Subreddit"; - -/* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "5AA-um-oEb"; */ -"5AA-um-oEb.title" = "Label"; - -/* Class = "NSButtonCell"; title = "Add"; ObjectID = "6NK-Ql-drk"; */ -"6NK-Ql-drk.title" = "Add"; - -/* Class = "NSTextFieldCell"; title = "Name:"; ObjectID = "8ca-Qp-BkT"; */ -"8ca-Qp-BkT.title" = "Name:"; - -/* Class = "NSMenuItem"; title = "Popular"; ObjectID = "177-F8-Esj"; */ -"177-F8-Esj.title" = "Popular"; - -/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "APc-af-7Um"; */ -"APc-af-7Um.title" = "Item 2"; - -/* Class = "NSMenuItem"; title = "Best"; ObjectID = "aub-jN-9Gq"; */ -"aub-jN-9Gq.title" = "Best"; - -/* Class = "NSTextFieldCell"; title = "Sort:"; ObjectID = "cxl-iF-EB5"; */ -"cxl-iF-EB5.title" = "Sort:"; - -/* Class = "NSMenuItem"; title = "All"; ObjectID = "DBZ-RV-FfV"; */ -"DBZ-RV-FfV.title" = "All"; - -/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Dop-HC-6Q9"; */ -"Dop-HC-6Q9.title" = "Cancel"; - -/* Class = "NSMenuItem"; title = "Top"; ObjectID = "fuh-g6-Ro7"; */ -"fuh-g6-Ro7.title" = "Top"; - -/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "fza-9c-2en"; */ -"fza-9c-2en.title" = "Item 3"; - -/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "j09-9b-bGs"; */ -"j09-9b-bGs.title" = "Item 3"; - -/* Class = "NSMenuItem"; title = "Hot"; ObjectID = "KA5-sN-dho"; */ -"KA5-sN-dho.title" = "Hot"; - -/* Class = "NSMenuItem"; title = "New"; ObjectID = "kUE-J5-iAE"; */ -"kUE-J5-iAE.title" = "New"; - -/* Class = "NSTextFieldCell"; title = "Folder:"; ObjectID = "Kwx-7B-CIu"; */ -"Kwx-7B-CIu.title" = "Folder:"; - -/* Class = "NSTextFieldCell"; title = "Account:"; ObjectID = "LFf-JL-Ahl"; */ -"LFf-JL-Ahl.title" = "Account:"; - -/* Class = "NSTextFieldCell"; placeholderString = "Optional"; ObjectID = "pLP-pL-5R5"; */ -"pLP-pL-5R5.placeholderString" = "Optional"; - -/* Class = "NSTextFieldCell"; title = "Type:"; ObjectID = "qto-IO-a1j"; */ -"qto-IO-a1j.title" = "Type:"; - -/* Class = "NSWindow"; title = "Add Reddit Feed"; ObjectID = "QvC-M9-y7g"; */ -"QvC-M9-y7g.title" = "Add Reddit Feed"; - -/* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "s6D-9M-HpZ"; */ -"s6D-9M-HpZ.title" = "Item 1"; - -/* Class = "NSMenuItem"; title = "u/username"; ObjectID = "Tfk-aQ-RKg"; */ -"Tfk-aQ-RKg.title" = "u/username"; - -/* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "tLJ-zY-CcZ"; */ -"tLJ-zY-CcZ.title" = "Item 1"; - -/* Class = "NSMenuItem"; title = "Home"; ObjectID = "uE6-1a-w5g"; */ -"uE6-1a-w5g.title" = "Home"; - -/* Class = "NSMenuItem"; title = "Rising"; ObjectID = "XIL-2V-O3A"; */ -"XIL-2V-O3A.title" = "Rising"; - -/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "xTm-Qr-PIp"; */ -"xTm-Qr-PIp.title" = "Item 2"; - diff --git a/Mac/zh-Hans.lproj/AddRedditFeedSheet.strings b/Mac/zh-Hans.lproj/AddRedditFeedSheet.strings deleted file mode 100644 index 2a79e28c7..000000000 --- a/Mac/zh-Hans.lproj/AddRedditFeedSheet.strings +++ /dev/null @@ -1,78 +0,0 @@ -/* Class = "NSMenuItem"; title = "Subreddit"; ObjectID = "0gG-oY-8yR"; */ -"0gG-oY-8yR.title" = "Subreddit"; - -/* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "5AA-um-oEb"; */ -"5AA-um-oEb.title" = "描述"; - -/* Class = "NSButtonCell"; title = "Add"; ObjectID = "6NK-Ql-drk"; */ -"6NK-Ql-drk.title" = "添加"; - -/* Class = "NSTextFieldCell"; title = "Name:"; ObjectID = "8ca-Qp-BkT"; */ -"8ca-Qp-BkT.title" = "名称："; - -/* Class = "NSMenuItem"; title = "Popular"; ObjectID = "177-F8-Esj"; */ -"177-F8-Esj.title" = "Popular"; - -/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "APc-af-7Um"; */ -"APc-af-7Um.title" = "Item 2"; - -/* Class = "NSMenuItem"; title = "Best"; ObjectID = "aub-jN-9Gq"; */ -"aub-jN-9Gq.title" = "Best"; - -/* Class = "NSTextFieldCell"; title = "Sort:"; ObjectID = "cxl-iF-EB5"; */ -"cxl-iF-EB5.title" = "分类："; - -/* Class = "NSMenuItem"; title = "All"; ObjectID = "DBZ-RV-FfV"; */ -"DBZ-RV-FfV.title" = "All"; - -/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Dop-HC-6Q9"; */ -"Dop-HC-6Q9.title" = "取消"; - -/* Class = "NSMenuItem"; title = "Top"; ObjectID = "fuh-g6-Ro7"; */ -"fuh-g6-Ro7.title" = "Top"; - -/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "fza-9c-2en"; */ -"fza-9c-2en.title" = "Item 3"; - -/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "j09-9b-bGs"; */ -"j09-9b-bGs.title" = "Item 3"; - -/* Class = "NSMenuItem"; title = "Hot"; ObjectID = "KA5-sN-dho"; */ -"KA5-sN-dho.title" = "Hot"; - -/* Class = "NSMenuItem"; title = "New"; ObjectID = "kUE-J5-iAE"; */ -"kUE-J5-iAE.title" = "New"; - -/* Class = "NSTextFieldCell"; title = "Folder:"; ObjectID = "Kwx-7B-CIu"; */ -"Kwx-7B-CIu.title" = "文件夹："; - -/* Class = "NSTextFieldCell"; title = "Account:"; ObjectID = "LFf-JL-Ahl"; */ -"LFf-JL-Ahl.title" = "账户："; - -/* Class = "NSTextFieldCell"; placeholderString = "Optional"; ObjectID = "pLP-pL-5R5"; */ -"pLP-pL-5R5.placeholderString" = "可选"; - -/* Class = "NSTextFieldCell"; title = "Type:"; ObjectID = "qto-IO-a1j"; */ -"qto-IO-a1j.title" = "类型："; - -/* Class = "NSWindow"; title = "Add Reddit Feed"; ObjectID = "QvC-M9-y7g"; */ -"QvC-M9-y7g.title" = "添加 Reddit 订阅"; - -/* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "s6D-9M-HpZ"; */ -"s6D-9M-HpZ.title" = "Item 1"; - -/* Class = "NSMenuItem"; title = "u/username"; ObjectID = "Tfk-aQ-RKg"; */ -"Tfk-aQ-RKg.title" = "u/username"; - -/* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "tLJ-zY-CcZ"; */ -"tLJ-zY-CcZ.title" = "Item 1"; - -/* Class = "NSMenuItem"; title = "Home"; ObjectID = "uE6-1a-w5g"; */ -"uE6-1a-w5g.title" = "Home"; - -/* Class = "NSMenuItem"; title = "Rising"; ObjectID = "XIL-2V-O3A"; */ -"XIL-2V-O3A.title" = "Rising"; - -/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "xTm-Qr-PIp"; */ -"xTm-Qr-PIp.title" = "Item 2"; - diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj index 523eb8e97..d380115cf 100644 --- a/NetNewsWire.xcodeproj/project.pbxproj +++ b/NetNewsWire.xcodeproj/project.pbxproj @@ -138,10 +138,6 @@ 513277662590FC780064F1E7 /* Secrets in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 51C4CFF524D37DD500AF9874 /* Secrets */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 5132778C2590FF1E0064F1E7 /* RSCore in Frameworks */ = {isa = PBXBuildFile; productRef = 5132778B2590FF1E0064F1E7 /* RSCore */; }; 5132779F2591034D0064F1E7 /* icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 5132779E2591034D0064F1E7 /* icon.icns */; }; - 51333D1624685D2E00EB5C91 /* AddRedditFeedWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51333D1524685D2E00EB5C91 /* AddRedditFeedWindowController.swift */; }; - 51333D1724685D2E00EB5C91 /* AddRedditFeedWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51333D1524685D2E00EB5C91 /* AddRedditFeedWindowController.swift */; }; - 51333D3B2468615D00EB5C91 /* AddRedditFeedSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 51333D392468615D00EB5C91 /* AddRedditFeedSheet.xib */; }; - 51333D3C2468615D00EB5C91 /* AddRedditFeedSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 51333D392468615D00EB5C91 /* AddRedditFeedSheet.xib */; }; 5137C2E426F3F52D009EFEDB /* Sepia.nnwtheme in Resources */ = {isa = PBXBuildFile; fileRef = 5137C2E326F3F52D009EFEDB /* Sepia.nnwtheme */; }; 5137C2E526F3F52D009EFEDB /* Sepia.nnwtheme in Resources */ = {isa = PBXBuildFile; fileRef = 5137C2E326F3F52D009EFEDB /* Sepia.nnwtheme */; }; 5137C2E626F3F52D009EFEDB /* Sepia.nnwtheme in Resources */ = {isa = PBXBuildFile; fileRef = 5137C2E326F3F52D009EFEDB /* Sepia.nnwtheme */; }; @@ -1210,8 +1206,6 @@ 51314706235C41FC00387FDC /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.intentdefinition; name = Base; path = Base.lproj/Intents.intentdefinition; sourceTree = ""; }; 51314714235C420900387FDC /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Intents.strings; sourceTree = ""; }; 5132779E2591034D0064F1E7 /* icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = icon.icns; sourceTree = ""; }; - 51333D1524685D2E00EB5C91 /* AddRedditFeedWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddRedditFeedWindowController.swift; sourceTree = ""; }; - 51333D3A2468615D00EB5C91 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Mac/Base.lproj/AddRedditFeedSheet.xib; sourceTree = SOURCE_ROOT; }; 5137C2E326F3F52D009EFEDB /* Sepia.nnwtheme */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Sepia.nnwtheme; sourceTree = ""; }; 5137C2E926F63AE6009EFEDB /* ArticleThemeImporter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArticleThemeImporter.swift; sourceTree = ""; }; 51386A8D25673276005F3762 /* AccountCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountCell.swift; sourceTree = ""; }; @@ -1536,7 +1530,6 @@ C47370262A232A0100E77890 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Main.strings"; sourceTree = ""; }; C47370272A232A0100E77890 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "../zh-Hans.lproj/MainWindow.strings"; sourceTree = ""; }; C47370282A232A0100E77890 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "../../../zh-Hans.lproj/RenameSheet.strings"; sourceTree = ""; }; - C47370292A232A0200E77890 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "../zh-Hans.lproj/AddRedditFeedSheet.strings"; sourceTree = ""; }; C473702A2A232A0200E77890 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "../zh-Hans.lproj/AddWebFeedSheet.strings"; sourceTree = ""; }; C473702B2A232A0200E77890 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "../../zh-Hans.lproj/AddFolderSheet.strings"; sourceTree = ""; }; C473702C2A232A0200E77890 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "../zh-Hans.lproj/Preferences.strings"; sourceTree = ""; }; @@ -1675,7 +1668,6 @@ DFB616AE29653A0600A359AB /* en-GB */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "en-GB"; path = "en-GB.lproj/Main.strings"; sourceTree = ""; }; DFB616AF29653A0600A359AB /* en-GB */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "en-GB"; path = "../en-GB.lproj/MainWindow.strings"; sourceTree = ""; }; DFB616B029653A0600A359AB /* en-GB */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "en-GB"; path = "../../../en-GB.lproj/RenameSheet.strings"; sourceTree = ""; }; - DFB616B129653A0600A359AB /* en-GB */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "en-GB"; path = "../en-GB.lproj/AddRedditFeedSheet.strings"; sourceTree = ""; }; DFB616B329653A0600A359AB /* en-GB */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "en-GB"; path = "../en-GB.lproj/AddWebFeedSheet.strings"; sourceTree = ""; }; DFB616B429653A0600A359AB /* en-GB */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "en-GB"; path = "../../en-GB.lproj/AddFolderSheet.strings"; sourceTree = ""; }; DFB616B529653A0600A359AB /* en-GB */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "en-GB"; path = "../en-GB.lproj/Preferences.strings"; sourceTree = ""; }; @@ -2457,8 +2449,6 @@ children = ( 849A97511ED9EAC0007D329B /* AddFeedController.swift */, 51A052CD244FB9D6006C2024 /* AddFeedWIndowController.swift */, - 51333D392468615D00EB5C91 /* AddRedditFeedSheet.xib */, - 51333D1524685D2E00EB5C91 /* AddRedditFeedWindowController.swift */, 848363002262A3BC00DA1D35 /* AddWebFeedSheet.xib */, 849A97521ED9EAC0007D329B /* AddWebFeedWindowController.swift */, 51EC114B2149FE3300B296E3 /* FolderTreeMenu.swift */, @@ -3582,7 +3572,6 @@ DDF9E1D828EDF2FC000BC355 /* notificationSoundBlip.mp3 in Resources */, DF5124D42A230FE400BBAB1F /* AccountsAddCloudKit.xib in Resources */, 65ED405E235DEF6C0081F399 /* DefaultFeeds.opml in Resources */, - 51333D3C2468615D00EB5C91 /* AddRedditFeedSheet.xib in Resources */, 65ED405F235DEF6C0081F399 /* Preferences.storyboard in Resources */, 65ED4061235DEF6C0081F399 /* Assets.xcassets in Resources */, 65ED4063235DEF6C0081F399 /* RenameSheet.xib in Resources */, @@ -3700,7 +3689,6 @@ 8483630E2262A3FE00DA1D35 /* MainWindow.storyboard in Resources */, DF5124F12A2310A100BBAB1F /* AccountsReaderAPI.xib in Resources */, 49F40DF82335B71000552BF4 /* newsfoot.js in Resources */, - 51333D3B2468615D00EB5C91 /* AddRedditFeedSheet.xib in Resources */, DF5124EB2A23109900BBAB1F /* AccountsNewsBlur.xib in Resources */, 5103A9982421643300410853 /* blank.html in Resources */, DF93DB2B296A319000586C0E /* Localizable.stringsdict in Resources */, @@ -4047,7 +4035,6 @@ 65ED3FD4235DEF6C0081F399 /* Article+Scriptability.swift in Sources */, 515A5172243E802B0089E588 /* ExtensionPointDetailViewController.swift in Sources */, 65ED3FD5235DEF6C0081F399 /* SmartFeed.swift in Sources */, - 51333D1724685D2E00EB5C91 /* AddRedditFeedWindowController.swift in Sources */, 65ED3FD6235DEF6C0081F399 /* MarkStatusCommand.swift in Sources */, DFBB4EAD2951BC0200639228 /* NNWThemeDocument.swift in Sources */, 5183CFB0254C78C8006B83A5 /* EnableExtensionPointView.swift in Sources */, @@ -4542,7 +4529,6 @@ 178A9F9D2549449F00AB7E9D /* AddAccountsView.swift in Sources */, 51C4CFF024D37D1F00AF9874 /* Secrets.swift in Sources */, 849A976D1ED9EBC8007D329B /* TimelineTableView.swift in Sources */, - 51333D1624685D2E00EB5C91 /* AddRedditFeedWindowController.swift in Sources */, 84D52E951FE588BB00D14F5B /* DetailStatusBarView.swift in Sources */, D5E4CC64202C1AC1009B4FFC /* MainWindowController+Scriptability.swift in Sources */, 51A052CE244FB9D7006C2024 /* AddFeedWIndowController.swift in Sources */, @@ -4693,16 +4679,6 @@ name = Intents.intentdefinition; sourceTree = ""; }; - 51333D392468615D00EB5C91 /* AddRedditFeedSheet.xib */ = { - isa = PBXVariantGroup; - children = ( - 51333D3A2468615D00EB5C91 /* Base */, - DFB616B129653A0600A359AB /* en-GB */, - C47370292A232A0200E77890 /* zh-Hans */, - ); - name = AddRedditFeedSheet.xib; - sourceTree = ""; - }; 513C5CEA232571C2003D4054 /* MainInterface.storyboard */ = { isa = PBXVariantGroup; children = ( diff --git a/iOS/AppAssets.swift b/iOS/AppAssets.swift index 1a120467d..34bbfda93 100644 --- a/iOS/AppAssets.swift +++ b/iOS/AppAssets.swift @@ -109,10 +109,6 @@ struct AppAssets { return UIImage(systemName: "chevron.right", withConfiguration: UIImage.SymbolConfiguration(pointSize: size, weight: weight))! } - static var contextMenuReddit: UIImage = { - return UIImage(named: "contextMenuReddit")! - }() - static var copyImage: UIImage = { return UIImage(systemName: "doc.on.doc")! }() @@ -201,10 +197,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")! }() diff --git a/iOS/MasterFeed/MasterFeedViewController.swift b/iOS/MasterFeed/MasterFeedViewController.swift index a515d79b6..0d2d0d088 100644 --- a/iOS/MasterFeed/MasterFeedViewController.swift +++ b/iOS/MasterFeed/MasterFeedViewController.swift @@ -627,29 +627,18 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner, Ma func configureContextMenu(_: Any? = nil) { /* Context Menu Order: - 1. Add Web Feed - 2. Add Reddit Feed + 1. Add Feed 3. Add Folder */ var menuItems: [UIAction] = [] - let addWebFeedActionTitle = NSLocalizedString("button.title.add-web-feed", comment: "Add Web Feed") + let addWebFeedActionTitle = NSLocalizedString("button.title.add-web-feed", comment: "Add Feed") let addWebFeedAction = UIAction(title: addWebFeedActionTitle, image: AppAssets.plus) { _ in self.coordinator.showAddWebFeed() } menuItems.append(addWebFeedAction) - if AccountManager.shared.activeAccounts.contains(where: { $0.type == .onMyMac || $0.type == .cloudKit }) { - if ExtensionPointManager.shared.isRedditEnabled { - let addRedditFeedActionTitle = NSLocalizedString("button.title.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) - } - } - let addWebFolderActionTitle = NSLocalizedString("button.title.add-folder", comment: "Add Folder") let addWebFolderAction = UIAction(title: addWebFolderActionTitle, image: AppAssets.folderOutlinePlus) { _ in self.coordinator.showAddFolder() diff --git a/iOS/SceneCoordinator.swift b/iOS/SceneCoordinator.swift index 0ecab2b4f..d1dc4f625 100644 --- a/iOS/SceneCoordinator.swift +++ b/iOS/SceneCoordinator.swift @@ -1215,13 +1215,6 @@ final class SceneCoordinator: NSObject, UndoableCommandRunner, Logging { 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 showAddFolder() { let addNavViewController = UIStoryboard.add.instantiateViewController(withIdentifier: "AddFolderViewControllerNav") as! UINavigationController addNavViewController.modalPresentationStyle = .formSheet