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

Rename AddWebFeed controller classes to AddFeed since they are now used for other feed types

Browse Source
This commit is contained in:
Maurice Parker
2020-08-11 17:04:11 -05:00
parent 9f9b12b6b3
commit 0cb0bc357a
12 changed files with 49 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
iOS/Add/Add.storyboard
View File

@@ -11,7 +11,7 @@
<!--Add Web Feed-->
<scene sceneID="2Tc-JN-edX">
<objects>
<tableViewController storyboardIdentifier="AddWebFeedViewController" id="7aE-6a-iP7" customClass="AddWebFeedViewController" customModule="NetNewsWire" customModuleProvider="target" sceneMemberID="viewController">
<tableViewController storyboardIdentifier="AddWebFeedViewController" id="7aE-6a-iP7" customClass="AddFeedViewController" customModule="NetNewsWire" customModuleProvider="target" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" scrollEnabled="NO" dataMode="static" style="insetGrouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" id="D0S-TM-mtm">
<rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -158,7 +158,7 @@
<!--Web Feed Folder-->
<scene sceneID="wnD-aY-W32">
<objects>
<tableViewController storyboardIdentifier="AddWebFeedFolderViewController" title="Web Feed Folder" id="acA-n7-ohN" customClass="AddWebFeedFolderViewController" customModule="NetNewsWire" customModuleProvider="target" sceneMemberID="viewController">
<tableViewController storyboardIdentifier="AddWebFeedFolderViewController" title="Web Feed Folder" id="acA-n7-ohN" customClass="AddFeedFolderViewController" customModule="NetNewsWire" customModuleProvider="target" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="new-nW-ba2">
<rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>

10
iOS/Add/AddWebFeedFolderViewController.swift → iOS/Add/AddFeedFolderViewController.swift
View File

@@ -1,5 +1,5 @@
//
// AddWebFeedFolderViewController.swift
// AddFeedFolderViewController.swift
// NetNewsWire-iOS
//
// Created by Maurice Parker on 11/16/19.
@@ -10,13 +10,13 @@ import UIKit
import RSCore
import Account
protocol AddWebFeedFolderViewControllerDelegate {
protocol AddFeedFolderViewControllerDelegate {
func didSelect(container: Container)
}
class AddWebFeedFolderViewController: UITableViewController {
class AddFeedFolderViewController: UITableViewController {
var delegate: AddWebFeedFolderViewControllerDelegate?
var delegate: AddFeedFolderViewControllerDelegate?
var initialContainer: Container?
var containers = [Container]()
@@ -90,7 +90,7 @@ class AddWebFeedFolderViewController: UITableViewController {
}
private extension AddWebFeedFolderViewController {
private extension AddFeedFolderViewController {
func dismiss() {
dismiss(animated: true)

4
iOS/Add/AddWebFeedSelectFolderTableViewCell.swift → iOS/Add/AddFeedSelectFolderTableViewCell.swift
View File

@@ -1,5 +1,5 @@
//
// AddWebFeedSelectFolderTableViewCell.swift
// AddFeedSelectFolderTableViewCell.swift
// NetNewsWire-iOS
//
// Created by Maurice Parker on 12/8/19.
@@ -8,7 +8,7 @@
import UIKit
class AddWebFeedSelectFolderTableViewCell: VibrantTableViewCell {
class AddFeedSelectFolderTableViewCell: VibrantTableViewCell {
@IBOutlet weak var folderLabel: UILabel!
@IBOutlet weak var detailLabel: UILabel!

13
iOS/Add/AddWebFeedSelectFolderTableViewCell.xib → iOS/Add/AddFeedSelectFolderTableViewCell.xib
View File

@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17147" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15509"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17120"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="iN0-l3-epB" customClass="AddWebFeedSelectFolderTableViewCell" customModule="NetNewsWire" customModuleProvider="target">
<view contentMode="scaleToFill" id="iN0-l3-epB" customClass="AddFeedSelectFolderTableViewCell" customModule="NetNewsWire" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="347" height="46"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
@@ -26,6 +27,7 @@
<nil key="highlightedColor"/>
</label>
</subviews>
<viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="xCU-fd-wms" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" id="KCG-KB-QVx"/>
@@ -37,10 +39,9 @@
<nil key="simulatedTopBarMetrics"/>
<nil key="simulatedBottomBarMetrics"/>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
<connections>
<outlet property="detailLabel" destination="jCz-VR-Elr" id="wsd-Pn-yBm"/>
<outlet property="folderLabel" destination="xCU-fd-wms" id="cae-UK-oeU"/>
<outlet property="detailLabel" destination="jCz-VR-Elr" id="glk-ta-9oJ"/>
<outlet property="folderLabel" destination="xCU-fd-wms" id="E0s-HB-ldr"/>
</connections>
<point key="canvasLocation" x="56" y="-164"/>
</view>

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

@@ -18,7 +18,7 @@ enum AddFeedType {
case twitter
}
class AddWebFeedViewController: UITableViewController {
class AddFeedViewController: UITableViewController {
@IBOutlet weak var activityIndicator: UIActivityIndicatorView!
@IBOutlet weak var addButton: UIBarButtonItem!
@@ -80,7 +80,7 @@ class AddWebFeedViewController: UITableViewController {
updateFolderLabel()
tableView.register(UINib(nibName: "AddWebFeedSelectFolderTableViewCell", bundle: nil), forCellReuseIdentifier: "AddWebFeedSelectFolderTableViewCell")
tableView.register(UINib(nibName: "AddFeedSelectFolderTableViewCell", bundle: nil), forCellReuseIdentifier: "AddFeedSelectFolderTableViewCell")
NotificationCenter.default.addObserver(self, selector: #selector(textDidChange(_:)), name: UITextField.textDidChangeNotification, object: urlTextField)
@@ -150,7 +150,7 @@ class AddWebFeedViewController: UITableViewController {
override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
if indexPath.row == 2 {
let cell = tableView.dequeueReusableCell(withIdentifier: "AddWebFeedSelectFolderTableViewCell", for: indexPath) as? AddWebFeedSelectFolderTableViewCell
let cell = tableView.dequeueReusableCell(withIdentifier: "AddFeedSelectFolderTableViewCell", for: indexPath) as? AddFeedSelectFolderTableViewCell
cell!.detailLabel.text = folderLabel
return cell!
} else {
@@ -162,7 +162,7 @@ class AddWebFeedViewController: UITableViewController {
if indexPath.row == 2 {
let navController = UIStoryboard.add.instantiateViewController(withIdentifier: "AddWebFeedFolderNavViewController") as! UINavigationController
navController.modalPresentationStyle = .currentContext
let folderViewController = navController.topViewController as! AddWebFeedFolderViewController
let folderViewController = navController.topViewController as! AddFeedFolderViewController
folderViewController.delegate = self
folderViewController.initialContainer = container
present(navController, animated: true)
@@ -173,7 +173,7 @@ class AddWebFeedViewController: UITableViewController {
// MARK: AddWebFeedFolderViewControllerDelegate
extension AddWebFeedViewController: AddWebFeedFolderViewControllerDelegate {
extension AddFeedViewController: AddFeedFolderViewControllerDelegate {
func didSelect(container: Container) {
self.container = container
updateFolderLabel()
@@ -183,7 +183,7 @@ extension AddWebFeedViewController: AddWebFeedFolderViewControllerDelegate {
// MARK: UITextFieldDelegate
extension AddWebFeedViewController: UITextFieldDelegate {
extension AddFeedViewController: UITextFieldDelegate {
func textFieldShouldReturn(_ textField: UITextField) -> Bool {
textField.resignFirstResponder()
@@ -194,7 +194,7 @@ extension AddWebFeedViewController: UITextFieldDelegate {
// MARK: Private
private extension AddWebFeedViewController {
private extension AddFeedViewController {
func updateUI() {
addButton.isEnabled = (urlTextField.text?.mayBeURL ?? false)

2
iOS/Add/Reddit/RedditSelectSortTableViewController.swift
View File

@@ -36,7 +36,7 @@ class RedditSelectSortTableViewController: UITableViewController {
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! AddWebFeedViewController
let addViewController = UIStoryboard.add.instantiateViewController(withIdentifier: "AddWebFeedViewController") as! AddFeedViewController
addViewController.addFeedType = .reddit
addViewController.initialFeed = url
navigationController?.pushViewController(addViewController, animated: true)

2
iOS/Add/Twitter/TwitterEnterDetailTableViewController.swift
View File

@@ -52,7 +52,7 @@ class TwitterEnterDetailTableViewController: UITableViewController {
url = TwitterFeedProvider.buildURL(twitterFeedType, username: nil, screenName: nil, searchField: text)?.absoluteString
}
let addViewController = UIStoryboard.add.instantiateViewController(withIdentifier: "AddWebFeedViewController") as! AddWebFeedViewController
let addViewController = UIStoryboard.add.instantiateViewController(withIdentifier: "AddWebFeedViewController") as! AddFeedViewController
addViewController.addFeedType = .twitter
addViewController.initialFeed = url
navigationController?.pushViewController(addViewController, animated: true)

2
iOS/Add/Twitter/TwitterSelectAccountTableViewController.swift
View File

@@ -36,7 +36,7 @@ class TwitterSelectAccountTableViewController: UITableViewController {
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! AddWebFeedViewController
let addViewController = UIStoryboard.add.instantiateViewController(withIdentifier: "AddWebFeedViewController") as! AddFeedViewController
addViewController.addFeedType = .twitter
addViewController.initialFeed = url
navigationController?.pushViewController(addViewController, animated: true)

2
iOS/Add/Twitter/TwitterSelectTypeTableViewController.swift
View File

@@ -68,7 +68,7 @@ class TwitterSelectTypeTableViewController: UITableViewController {
private extension TwitterSelectTypeTableViewController {
func pushAddFeedController(_ url: String?) {
let addViewController = UIStoryboard.add.instantiateViewController(withIdentifier: "AddWebFeedViewController") as! AddWebFeedViewController
let addViewController = UIStoryboard.add.instantiateViewController(withIdentifier: "AddWebFeedViewController") as! AddFeedViewController
addViewController.addFeedType = .twitter
addViewController.initialFeed = url
navigationController?.pushViewController(addViewController, animated: true)