FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reconcile with 6.1.6-ios branch.

Browse Source
This commit is contained in:
Brent Simmons 2025-01-02 22:25:04 -08:00
parent 226724c2d7
commit 89106ec434
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
iOS/Add/AddFeedViewController.swift
View File

@ -12,12 +12,8 @@ import RSCore
import RSTree import RSTree
import Parser import Parser
enum AddFeedType {
case web
}
class AddFeedViewController: UITableViewController { class AddFeedViewController: UITableViewController {
@IBOutlet weak var activityIndicator: UIActivityIndicatorView! @IBOutlet weak var activityIndicator: UIActivityIndicatorView!
@IBOutlet weak var addButton: UIBarButtonItem! @IBOutlet weak var addButton: UIBarButtonItem!
@IBOutlet weak var urlTextField: UITextField! @IBOutlet weak var urlTextField: UITextField!
@ -29,7 +25,6 @@ class AddFeedViewController: UITableViewController {
private var folderLabel = "" private var folderLabel = ""
private var userCancelled = false private var userCancelled = false
var addFeedType = AddFeedType.web
var initialFeed: String? var initialFeed: String?
var initialFeedName: String? var initialFeedName: String?
@ -37,7 +32,7 @@ class AddFeedViewController: UITableViewController {
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
activityIndicator.isHidden = true activityIndicator.isHidden = true
activityIndicator.color = .label activityIndicator.color = .label
@ -151,7 +146,6 @@ class AddFeedViewController: UITableViewController {
navController.modalPresentationStyle = .currentContext navController.modalPresentationStyle = .currentContext
let folderViewController = navController.topViewController as! AddFeedFolderViewController let folderViewController = navController.topViewController as! AddFeedFolderViewController
folderViewController.delegate = self folderViewController.delegate = self
folderViewController.addFeedType = addFeedType
folderViewController.initialContainer = container folderViewController.initialContainer = container
present(navController, animated: true) present(navController, animated: true)
} }