renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Renamed Feed and related classes/instances to WebFeed

Browse Source
This commit is contained in:
Maurice Parker
2019-11-14 20:11:41 -06:00
parent f5cd5d7067
commit 06bd5b3a6f
85 changed files with 1106 additions and 1106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
iOS/Add/Add.storyboard
View File

@@ -10,7 +10,7 @@
<!--Add Feed-->
<scene sceneID="2Tc-JN-edX">
<objects>
<tableViewController storyboardIdentifier="AddFeedViewController" id="7aE-6a-iP7" customClass="AddFeedViewController" customModule="NetNewsWire" customModuleProvider="target" sceneMemberID="viewController">
<tableViewController storyboardIdentifier="AddWebFeedViewController" id="7aE-6a-iP7" customClass="AddWebFeedViewController" customModule="NetNewsWire" customModuleProvider="target" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" scrollEnabled="NO" dataMode="static" style="grouped" separatorStyle="default" allowsSelection="NO" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="1" sectionFooterHeight="5" id="D0S-TM-mtm">
<rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -78,7 +78,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vaV-kY-CaE">
<rect key="frame" x="313" y="11.999999999999998" width="42" height="20.333333333333329"/>
<rect key="frame" x="313" y="12" width="42" height="20"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
@@ -166,12 +166,12 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="1Ce-E7-rG2">
<rect key="frame" x="112.66666666666669" y="108" width="150" height="32"/>
<rect key="frame" x="97.666666666666686" y="108" width="180" height="32"/>
<constraints>
<constraint firstAttribute="width" constant="150" id="IEO-pf-4PB"/>
<constraint firstAttribute="width" constant="180" id="IEO-pf-4PB"/>
</constraints>
<segments>
<segment title="Feed"/>
<segment title="Web Feed"/>
<segment title="Folder"/>
</segments>
<connections>
@@ -282,7 +282,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mxj-Bw-Jfx">
<rect key="frame" x="313" y="11.999999999999998" width="42" height="20.333333333333329"/>
<rect key="frame" x="313" y="12" width="42" height="20"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>

6
iOS/Add/AddContainerViewController.swift
View File

@@ -105,15 +105,15 @@ private extension AddContainerViewController {
func switchToFeed() {
guard !(currentViewController is AddFeedViewController) else {
guard !(currentViewController is AddWebFeedViewController) else {
return
}
navigationItem.title = NSLocalizedString("Add Feed", comment: "Add Feed")
navigationItem.title = NSLocalizedString("Add Web Feed", comment: "Add Web Feed")
resetUI()
hideCurrentController()
let addFeedController = UIStoryboard.add.instantiateController(ofType: AddFeedViewController.self)
let addFeedController = UIStoryboard.add.instantiateController(ofType: AddWebFeedViewController.self)
addFeedController.initialFeed = initialFeed
addFeedController.initialFeedName = initialFeedName

12
iOS/Add/AddFeedViewController.swift → iOS/Add/AddWebFeedViewController.swift
View File

@@ -12,7 +12,7 @@ import RSCore
import RSTree
import RSParser
class AddFeedViewController: UITableViewController, AddContainerViewControllerChild {
class AddWebFeedViewController: UITableViewController, AddContainerViewControllerChild {
@IBOutlet private weak var urlTextField: UITextField!
@IBOutlet private weak var nameTextField: UITextField!
@@ -91,7 +91,7 @@ class AddFeedViewController: UITableViewController, AddContainerViewControllerCh
account = containerAccount
}
if account!.hasFeed(withURL: url.absoluteString) {
if account!.hasWebFeed(withURL: url.absoluteString) {
presentError(AccountError.createErrorAlreadySubscribed)
return
}
@@ -102,14 +102,14 @@ class AddFeedViewController: UITableViewController, AddContainerViewControllerCh
BatchUpdate.shared.start()
account!.createFeed(url: url.absoluteString, name: feedName, container: container) { result in
account!.createWebFeed(url: url.absoluteString, name: feedName, container: container) { result in
BatchUpdate.shared.end()
switch result {
case .success(let feed):
self.delegate?.processingDidEnd()
NotificationCenter.default.post(name: .UserDidAddFeed, object: self, userInfo: [UserInfoKey.feed: feed])
NotificationCenter.default.post(name: .UserDidAddFeed, object: self, userInfo: [UserInfoKey.webFeed: feed])
case .failure(let error):
self.presentError(error)
self.delegate?.processingDidCancel()
@@ -135,7 +135,7 @@ class AddFeedViewController: UITableViewController, AddContainerViewControllerCh
}
extension AddFeedViewController: UIPickerViewDataSource, UIPickerViewDelegate {
extension AddWebFeedViewController: UIPickerViewDataSource, UIPickerViewDelegate {
func numberOfComponents(in pickerView: UIPickerView) ->Int {
return 1
@@ -155,7 +155,7 @@ extension AddFeedViewController: UIPickerViewDataSource, UIPickerViewDelegate {
}
extension AddFeedViewController: UITextFieldDelegate {
extension AddWebFeedViewController: UITextFieldDelegate {
func textFieldShouldReturn(_ textField: UITextField) -> Bool {
textField.resignFirstResponder()