mirror of
https://github.com/Ranchero-Software/NetNewsWire
synced 2025-08-12 06:26:36 +00:00
Fix lint issues.
This commit is contained in:
@@ -9,7 +9,7 @@
|
||||
import UIKit
|
||||
|
||||
class ShareFolderPickerCell: UITableViewCell {
|
||||
|
||||
|
||||
@IBOutlet weak var icon: UIImageView!
|
||||
@IBOutlet weak var label: UILabel!
|
||||
}
|
||||
|
||||
@@ -20,13 +20,13 @@ class ShareFolderPickerController: UITableViewController {
|
||||
var selectedContainerID: ContainerIdentifier?
|
||||
|
||||
weak var delegate: ShareFolderPickerControllerDelegate?
|
||||
|
||||
|
||||
override func viewDidLoad() {
|
||||
tableView.register(UINib(nibName: "ShareFolderPickerAccountCell", bundle: Bundle.main), forCellReuseIdentifier: "AccountCell")
|
||||
tableView.register(UINib(nibName: "ShareFolderPickerFolderCell", bundle: Bundle.main), forCellReuseIdentifier: "FolderCell")
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
override func numberOfSections(in tableView: UITableView) -> Int {
|
||||
return 1
|
||||
}
|
||||
@@ -34,7 +34,7 @@ class ShareFolderPickerController: UITableViewController {
|
||||
override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
|
||||
return containers?.count ?? 0
|
||||
}
|
||||
|
||||
|
||||
override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
|
||||
let container = containers?[indexPath.row]
|
||||
let cell: ShareFolderPickerCell = {
|
||||
@@ -44,7 +44,7 @@ class ShareFolderPickerController: UITableViewController {
|
||||
return tableView.dequeueReusableCell(withIdentifier: "FolderCell", for: indexPath) as! ShareFolderPickerCell
|
||||
}
|
||||
}()
|
||||
|
||||
|
||||
if let account = container as? ExtensionAccount {
|
||||
cell.icon.image = AppAssets.image(for: account.type)
|
||||
} else {
|
||||
@@ -58,13 +58,13 @@ class ShareFolderPickerController: UITableViewController {
|
||||
} else {
|
||||
cell.accessoryType = .none
|
||||
}
|
||||
|
||||
|
||||
return cell
|
||||
}
|
||||
|
||||
|
||||
override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
|
||||
guard let container = containers?[indexPath.row] else { return }
|
||||
|
||||
|
||||
if let account = container as? ExtensionAccount, account.disallowFeedInRootFolder {
|
||||
tableView.selectRow(at: nil, animated: false, scrollPosition: .none)
|
||||
} else {
|
||||
@@ -73,5 +73,5 @@ class ShareFolderPickerController: UITableViewController {
|
||||
delegate?.shareFolderPickerDidSelect(container)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -15,15 +15,15 @@ import RSTree
|
||||
import UniformTypeIdentifiers
|
||||
|
||||
class ShareViewController: SLComposeServiceViewController, ShareFolderPickerControllerDelegate {
|
||||
|
||||
|
||||
private var url: URL?
|
||||
private var extensionContainers: ExtensionContainers?
|
||||
private var flattenedContainers: [ExtensionContainer]!
|
||||
private var selectedContainer: ExtensionContainer?
|
||||
private var folderItem: SLComposeSheetConfigurationItem!
|
||||
|
||||
|
||||
override func viewDidLoad() {
|
||||
|
||||
|
||||
extensionContainers = ExtensionContainersFile.read()
|
||||
flattenedContainers = extensionContainers?.flattened ?? [ExtensionContainer]()
|
||||
if let extensionContainers = extensionContainers {
|
||||
@@ -42,7 +42,7 @@ class ShareViewController: SLComposeServiceViewController, ShareFolderPickerCont
|
||||
tableView.rowHeight = 38
|
||||
}
|
||||
|
||||
var provider: NSItemProvider? = nil
|
||||
var provider: NSItemProvider?
|
||||
|
||||
// Try to get any HTML that is maybe passed in
|
||||
for item in self.extensionContext!.inputItems as! [NSExtensionItem] {
|
||||
@@ -53,7 +53,7 @@ class ShareViewController: SLComposeServiceViewController, ShareFolderPickerCont
|
||||
}
|
||||
}
|
||||
|
||||
if provider != nil {
|
||||
if provider != nil {
|
||||
provider!.loadItem(forTypeIdentifier: UTType.propertyList.identifier, options: nil, completionHandler: { [weak self] (pList, error) in
|
||||
if error != nil {
|
||||
return
|
||||
@@ -80,7 +80,7 @@ class ShareViewController: SLComposeServiceViewController, ShareFolderPickerCont
|
||||
}
|
||||
}
|
||||
|
||||
if provider != nil {
|
||||
if provider != nil {
|
||||
provider!.loadItem(forTypeIdentifier: UTType.url.identifier, options: nil, completionHandler: { [weak self] (urlCoded, error) in
|
||||
if error != nil {
|
||||
return
|
||||
@@ -92,32 +92,32 @@ class ShareViewController: SLComposeServiceViewController, ShareFolderPickerCont
|
||||
return
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
// Reddit in particular doesn't pass the URL correctly and instead puts it in the contentText
|
||||
url = URL(string: contentText)
|
||||
}
|
||||
|
||||
|
||||
override func isContentValid() -> Bool {
|
||||
return url != nil && selectedContainer != nil
|
||||
}
|
||||
|
||||
|
||||
override func didSelectPost() {
|
||||
guard let url = url, let selectedContainer = selectedContainer, let containerID = selectedContainer.containerID else {
|
||||
self.extensionContext!.completeRequest(returningItems: [], completionHandler: nil)
|
||||
return
|
||||
}
|
||||
|
||||
var name: String? = nil
|
||||
var name: String?
|
||||
if !contentText.mayBeURL {
|
||||
name = contentText.isEmpty ? nil : contentText
|
||||
}
|
||||
|
||||
|
||||
let request = ExtensionFeedAddRequest(name: name, feedURL: url, destinationContainerID: containerID)
|
||||
ExtensionFeedAddRequestFile.save(request)
|
||||
|
||||
|
||||
self.extensionContext!.completeRequest(returningItems: [], completionHandler: nil)
|
||||
}
|
||||
|
||||
|
||||
func shareFolderPickerDidSelect(_ container: ExtensionContainer) {
|
||||
ShareDefaultContainer.saveDefaultContainer(container)
|
||||
self.selectedContainer = container
|
||||
@@ -126,37 +126,37 @@ class ShareViewController: SLComposeServiceViewController, ShareFolderPickerCont
|
||||
}
|
||||
|
||||
override func configurationItems() -> [Any]! {
|
||||
|
||||
|
||||
// To add configuration options via table cells at the bottom of the sheet, return an array of SLComposeSheetConfigurationItem here.
|
||||
guard let urlItem = SLComposeSheetConfigurationItem() else { return nil }
|
||||
urlItem.title = "URL"
|
||||
urlItem.value = url?.absoluteString ?? ""
|
||||
|
||||
|
||||
folderItem = SLComposeSheetConfigurationItem()
|
||||
folderItem.title = "Folder"
|
||||
updateFolderItemValue()
|
||||
|
||||
|
||||
folderItem.tapHandler = {
|
||||
|
||||
|
||||
let folderPickerController = ShareFolderPickerController()
|
||||
|
||||
|
||||
folderPickerController.navigationController?.title = NSLocalizedString("Folder", comment: "Folder")
|
||||
folderPickerController.delegate = self
|
||||
folderPickerController.containers = self.flattenedContainers
|
||||
folderPickerController.selectedContainerID = self.selectedContainer?.containerID
|
||||
|
||||
|
||||
self.pushConfigurationViewController(folderPickerController)
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
return [folderItem!, urlItem]
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
private extension ShareViewController {
|
||||
|
||||
|
||||
func updateFolderItemValue() {
|
||||
if let account = selectedContainer as? ExtensionAccount {
|
||||
self.folderItem.value = account.name
|
||||
@@ -164,5 +164,5 @@ private extension ShareViewController {
|
||||
self.folderItem.value = "\(folder.accountName) / \(folder.name)"
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user