diff --git a/Account/Tests/AccountTests/Feedly/FeedlyTestSecrets.swift b/Account/Tests/AccountTests/Feedly/FeedlyTestSecrets.swift index 490772d2e..9b92c02af 100644 --- a/Account/Tests/AccountTests/Feedly/FeedlyTestSecrets.swift +++ b/Account/Tests/AccountTests/Feedly/FeedlyTestSecrets.swift @@ -13,7 +13,6 @@ struct FeedlyTestSecrets: SecretsProvider { var mercuryClientSecret = "" var feedlyClientId = "" var feedlyClientSecret = "" - var redditConsumerKey = "" var inoreaderAppId = "" var inoreaderAppKey = "" } diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj index d380115cf..2e2f8fbac 100644 --- a/NetNewsWire.xcodeproj/project.pbxproj +++ b/NetNewsWire.xcodeproj/project.pbxproj @@ -108,11 +108,6 @@ 511D43D2231FA62C00FB1562 /* GlobalKeyboardShortcuts.plist in Resources */ = {isa = PBXBuildFile; fileRef = 844B5B641FEA11F200C7C76A /* GlobalKeyboardShortcuts.plist */; }; 511D43EF231FBDE900FB1562 /* LaunchScreenPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 511D43ED231FBDE800FB1562 /* LaunchScreenPad.storyboard */; }; 511D4419231FC02D00FB1562 /* KeyboardManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 511D4410231FC02D00FB1562 /* KeyboardManager.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 */; }; 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 */; }; @@ -1232,11 +1227,6 @@ 51627A6623861DA3007B3B4B /* MasterFeedViewController+Drag.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MasterFeedViewController+Drag.swift"; sourceTree = ""; }; 51627A6823861DED007B3B4B /* MasterFeedViewController+Drop.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MasterFeedViewController+Drop.swift"; sourceTree = ""; }; 51627A92238A3836007B3B4B /* CroppingPreviewParameters.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CroppingPreviewParameters.swift; 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 = ""; }; @@ -2047,18 +2037,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 = ( @@ -2229,7 +2207,6 @@ 51C4528B2265095F00C03939 /* AddFolderViewController.swift */, 510289CC24519A1D00426DDF /* SelectComboTableViewCell.swift */, DF51250F2A23119800BBAB1F /* AddFeedSelectFolderTableViewCell.xib */, - 516AE5DD246AF2DD00731738 /* Reddit */, ); path = Add; sourceTree = ""; @@ -3636,7 +3613,6 @@ B27EEBFB244D15F3000932E6 /* stylesheet.css in Resources */, 511D43CF231FA62200FB1562 /* DetailKeyboardShortcuts.plist in Resources */, 49F40DF92335B71000552BF4 /* newsfoot.js in Resources */, - 512392C024E33A3C00F11704 /* RedditAdd.storyboard in Resources */, 5177C21327B07CFE00643901 /* NewsFax.nnwtheme in Resources */, 84C9FC9D2262A1A900D921D6 /* Assets.xcassets in Resources */, 514219582353C28900E07E2C /* main_ios.js in Resources */, @@ -4300,14 +4276,12 @@ 51102165233A7D6C0007A5F7 /* ArticleExtractorButton.swift in Sources */, C5A6ED6D23C9B0C800AB6BE2 /* UIActivityViewController-Extensions.swift in Sources */, 84CAFCA522BC8C08007694F0 /* FetchRequestQueue.swift in Sources */, - 512392BE24E33A3C00F11704 /* RedditSelectAccountTableViewController.swift in Sources */, 51C4529C22650A1000C03939 /* SingleFaviconDownloader.swift in Sources */, 17D643B226F8A436008D4C05 /* ArticleThemeDownloader.swift in Sources */, DFB34997294C4DCB00BC81AD /* LocalizedNetNewsWireError.swift in Sources */, 51E595A6228CC36500FCC42B /* ArticleStatusSyncTimer.swift in Sources */, 51F9F3F723DF6DB200A314FD /* ArticleIconSchemeHandler.swift in Sources */, 512AF9C2236ED52C0066F8BE /* ImageHeaderView.swift in Sources */, - 512392C124E33A3C00F11704 /* RedditSelectTypeTableViewController.swift in Sources */, DF766FED29377FD9006FBBE2 /* ExtensionsManagementView.swift in Sources */, 51C45290226509C100C03939 /* PseudoFeed.swift in Sources */, 51C452A922650DC600C03939 /* ArticleRenderer.swift in Sources */, @@ -4320,7 +4294,6 @@ 512D554423C804DE0023FFFA /* OpenInSafariActivity.swift in Sources */, DF47CDB2294803AB00FCD57E /* AddExtensionListView.swift in Sources */, DFB34994294C0E3900BC81AD /* ReaderAPIAddAccountView.swift in Sources */, - 512392C224E33A3C00F11704 /* RedditEnterDetailTableViewController.swift in Sources */, 51C452762265091600C03939 /* MasterTimelineViewController.swift in Sources */, 5195C1DC2720BD3000888867 /* MasterFeedRowIdentifier.swift in Sources */, 5108F6D823763094001ABC45 /* TickMarkSlider.swift in Sources */, @@ -4350,7 +4323,6 @@ DF28B44F294ED92F00C4D8CA /* NewsBlurAddAccountView.swift in Sources */, DF84E563295122BA0045C334 /* TimelineCustomizerView.swift in Sources */, 512E09012268907400BDCFDD /* MasterFeedTableViewSectionHeader.swift in Sources */, - 512392BF24E33A3C00F11704 /* RedditSelectSortTableViewController.swift in Sources */, 516AE9E02372269A007DEEAA /* IconImage.swift in Sources */, 51C45268226508F600C03939 /* MasterFeedUnreadCountView.swift in Sources */, DFB349A4294E914D00BC81AD /* AccountSectionHeader.swift in Sources */, diff --git a/Secrets/Sources/Secrets/SecretsProvider.swift b/Secrets/Sources/Secrets/SecretsProvider.swift index 09fd49e83..26ed84410 100644 --- a/Secrets/Sources/Secrets/SecretsProvider.swift +++ b/Secrets/Sources/Secrets/SecretsProvider.swift @@ -12,7 +12,6 @@ public protocol SecretsProvider { var mercuryClientSecret: String { get } var feedlyClientId: String { get } var feedlyClientSecret: String { get } - var redditConsumerKey: String { get } var inoreaderAppId: String { get } var inoreaderAppKey: String { get } } diff --git a/Shared/Secrets.swift.gyb b/Shared/Secrets.swift.gyb index 05b993a20..aa17c57e7 100644 --- a/Shared/Secrets.swift.gyb +++ b/Shared/Secrets.swift.gyb @@ -2,7 +2,7 @@ %{ import os -secrets = ['MERCURY_CLIENT_ID', 'MERCURY_CLIENT_SECRET', 'FEEDLY_CLIENT_ID', 'FEEDLY_CLIENT_SECRET', 'REDDIT_CONSUMER_KEY', 'INOREADER_APP_ID', 'INOREADER_APP_KEY'] +secrets = ['MERCURY_CLIENT_ID', 'MERCURY_CLIENT_SECRET', 'FEEDLY_CLIENT_ID', 'FEEDLY_CLIENT_SECRET', 'INOREADER_APP_ID', 'INOREADER_APP_KEY'] def chunks(seq, size): return (seq[i:(i + size)] for i in range(0, len(seq), size)) diff --git a/iOS/Add/AddFeedViewController.swift b/iOS/Add/AddFeedViewController.swift index b1cc09d70..58fec0fc1 100644 --- a/iOS/Add/AddFeedViewController.swift +++ b/iOS/Add/AddFeedViewController.swift @@ -14,7 +14,6 @@ import RSParser enum AddFeedType { case web - case reddit } class AddFeedViewController: UITableViewController { @@ -39,14 +38,6 @@ class AddFeedViewController: UITableViewController { override func viewDidLoad() { super.viewDidLoad() - switch addFeedType { - case .reddit: - navigationItem.title = NSLocalizedString("navigation.title.add-reddit-feed", comment: "Add Reddit Feed") - navigationItem.leftBarButtonItem = nil - default: - break - } - activityIndicator.isHidden = true activityIndicator.color = .label 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 d05b2eade..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("button.title.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/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/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/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/en-GB.lproj/Localizable.strings b/iOS/Resources/en-GB.lproj/Localizable.strings index 1eab7fdf5..ee6fbb6de 100644 --- a/iOS/Resources/en-GB.lproj/Localizable.strings +++ b/iOS/Resources/en-GB.lproj/Localizable.strings @@ -244,14 +244,8 @@ /* Add Item */ "button.title.add-item" = "Add Item"; -/* Add Reddit Feed */ -"button.title.add-reddit-feed" = "Add Reddit Feed"; - /* Add Web Feed */ -"button.title.add-web-feed" = "Add Web Feed"; - -/* Add Twitter Feed */ -"button.title.addtwitterfeed" = "Add Twitter Feed"; +"button.title.add-web-feed" = "Add Feed"; /* Button title: Always Use Reader View */ "button.title.always-use-reader-view" = "Always Use Reader View"; @@ -824,12 +818,6 @@ /* Add Extensions */ "navigation.title.add-extensions" = "Add Extensions"; -/* Add Reddit Feed */ -"navigation.title.add-reddit-feed" = "Add Reddit Feed"; - -/* Add Twitter Feed */ -"navigation.title.add-twitter-feed" = "Add Twitter Feed"; - /* Article Themes */ "navigation.title.article-themes" = "Article Themes"; diff --git a/iOS/Resources/en.lproj/Localizable.strings b/iOS/Resources/en.lproj/Localizable.strings index 489e41610..b3f0f7dab 100644 --- a/iOS/Resources/en.lproj/Localizable.strings +++ b/iOS/Resources/en.lproj/Localizable.strings @@ -238,14 +238,8 @@ /* Add Item */ "button.title.add-item" = "Add Item"; -/* Add Reddit Feed */ -"button.title.add-reddit-feed" = "Add Reddit Feed"; - /* Add Web Feed */ -"button.title.add-web-feed" = "Add Web Feed"; - -/* Add Twitter Feed */ -"button.title.addtwitterfeed" = "Add Twitter Feed"; +"button.title.add-web-feed" = "Add Feed"; /* Button title: Always Use Reader View */ "button.title.always-use-reader-view" = "Always Use Reader View"; @@ -806,12 +800,6 @@ /* Add Extensions */ "navigation.title.add-extensions" = "Add Extensions"; -/* Add Reddit Feed */ -"navigation.title.add-reddit-feed" = "Add Reddit Feed"; - -/* Add Twitter Feed */ -"navigation.title.add-twitter-feed" = "Add Twitter Feed"; - /* Article Themes */ "navigation.title.article-themes" = "Article Themes"; diff --git a/iOS/Resources/zh-Hans.lproj/Localizable.strings b/iOS/Resources/zh-Hans.lproj/Localizable.strings index 09d699b32..018c3e161 100644 --- a/iOS/Resources/zh-Hans.lproj/Localizable.strings +++ b/iOS/Resources/zh-Hans.lproj/Localizable.strings @@ -244,14 +244,8 @@ /* Add Item */ "button.title.add-item" = "添加项目"; -/* Add Reddit Feed */ -"button.title.add-reddit-feed" = "添加 Reddit 订阅"; - /* Add Web Feed */ -"button.title.add-web-feed" = "添加 Web 订阅"; - -/* Add Twitter Feed */ -"button.title.addtwitterfeed" = "添加 Twitter 订阅"; +"button.title.add-web-feed" = "添加 订阅"; /* Button title: Always Use Reader View */ "button.title.always-use-reader-view" = "总是使用阅读器视图"; @@ -825,12 +819,6 @@ /* Add Extensions */ "navigation.title.add-extensions" = "添加扩展"; -/* Add Reddit Feed */ -"navigation.title.add-reddit-feed" = "添加 Reddit 订阅"; - -/* Add Twitter Feed */ -"navigation.title.add-twitter-feed" = "添加 Twitter 订阅"; - /* Article Themes */ "navigation.title.article-themes" = "文章主题"; diff --git a/iOS/UIKit Extensions/UIStoryboard-Extensions.swift b/iOS/UIKit Extensions/UIStoryboard-Extensions.swift index 9d20ea374..270405ded 100644 --- a/iOS/UIKit Extensions/UIStoryboard-Extensions.swift +++ b/iOS/UIKit Extensions/UIStoryboard-Extensions.swift @@ -21,10 +21,6 @@ extension UIStoryboard: Logging { return UIStoryboard(name: "Add", bundle: nil) } - static var redditAdd: UIStoryboard { - return UIStoryboard(name: "RedditAdd", bundle: nil) - } - static var settings: UIStoryboard { return UIStoryboard(name: "Settings", bundle: nil) }