FreshRSS/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire.git synced 2025-02-02 03:56:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix several deprecation warnings.

Browse Source
This commit is contained in:
Brent Simmons 2024-11-04 21:49:58 -08:00
parent 5109a69682
commit 4a162e1bcf
5 changed files with 45 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
iOS/Inspector/Inspector.storyboard
View File

@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/> <device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies> <dependencies>
<deployment identifier="iOS"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
<capability name="Named colors" minToolsVersion="9.0"/> <capability name="Named colors" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/> <capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@ -182,10 +181,10 @@
</objects> </objects>
<point key="canvasLocation" x="863.768115942029" y="-591.29464285714278"/> <point key="canvasLocation" x="863.768115942029" y="-591.29464285714278"/>
</scene> </scene>
<!--Web Feed Inspector View Controller--> <!--Feed Inspector View Controller-->
<scene sceneID="jnI-2I-AcU"> <scene sceneID="jnI-2I-AcU">
<objects> <objects>
<tableViewController storyboardIdentifier="FeedInspectorViewControllelr" id="lEH-bG-pQW" customClass="WebFeedInspectorViewController" customModule="NetNewsWire" customModuleProvider="target" sceneMemberID="viewController"> <tableViewController storyboardIdentifier="FeedInspectorViewControllelr" id="lEH-bG-pQW" customClass="FeedInspectorViewController" customModule="NetNewsWire" customModuleProvider="target" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="insetGrouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" id="26V-ZC-Q2R"> <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="insetGrouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" id="26V-ZC-Q2R">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/> <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@ -402,9 +401,6 @@
<point key="canvasLocation" x="157" y="-591"/> <point key="canvasLocation" x="157" y="-591"/>
</scene> </scene>
</scenes> </scenes>
<designables>
<designable name="rOV-XS-bNW"/>
</designables>
<resources> <resources>
<image name="safari" catalog="system" width="128" height="123"/> <image name="safari" catalog="system" width="128" height="123"/>
<image name="safari.fill" catalog="system" width="128" height="123"/> <image name="safari.fill" catalog="system" width="128" height="123"/>

15
iOS/Settings/ArticleThemesTableViewController.swift
View File

@ -7,8 +7,12 @@
// //
import Foundation import Foundation
import UIKit import UIKit
import UniformTypeIdentifiers
extension UTType {
static var netNewsWireTheme: UTType { UTType(importedAs: "com.ranchero.netnewswire.theme") }
}
class ArticleThemesTableViewController: UITableViewController { class ArticleThemesTableViewController: UITableViewController {
@ -27,10 +31,10 @@ class ArticleThemesTableViewController: UITableViewController {
} }
@objc func importTheme(_ sender: Any?) { @objc func importTheme(_ sender: Any?) {
let docPicker = UIDocumentPickerViewController(documentTypes: ["com.ranchero.netnewswire.theme"], in: .import) let documentPicker = UIDocumentPickerViewController(forOpeningContentTypes: [UTType.netNewsWireTheme])
docPicker.delegate = self documentPicker.delegate = self
docPicker.modalPresentationStyle = .formSheet documentPicker.modalPresentationStyle = .formSheet
self.present(docPicker, animated: true) self.present(documentPicker, animated: true)
} }
// MARK: - Table view data source // MARK: - Table view data source
@ -119,5 +123,4 @@ extension ArticleThemesTableViewController: UIDocumentPickerDelegate {
NotificationCenter.default.post(name: .didFailToImportThemeWithError, object: nil, userInfo: ["error": error]) NotificationCenter.default.post(name: .didFailToImportThemeWithError, object: nil, userInfo: ["error": error])
} }
} }
} }

6
iOS/Settings/SettingsViewController.swift
View File

@ -470,9 +470,9 @@ private extension SettingsViewController {
self.presentError(title: "OPML Export Error", message: error.localizedDescription) self.presentError(title: "OPML Export Error", message: error.localizedDescription)
} }
let docPicker = UIDocumentPickerViewController(url: tempFile, in: .exportToService) let documentPicker = UIDocumentPickerViewController(forExporting: [tempFile])
docPicker.modalPresentationStyle = .formSheet documentPicker.modalPresentationStyle = .formSheet
self.present(docPicker, animated: true) self.present(documentPicker, animated: true)
} }
func openURL(_ urlString: String) { func openURL(_ urlString: String) {

9
iOS/ShareExtension/ShareViewController.swift
View File

@ -12,6 +12,7 @@ import Account
import Social import Social
import RSCore import RSCore
import RSTree import RSTree
import UniformTypeIdentifiers
class ShareViewController: SLComposeServiceViewController, ShareFolderPickerControllerDelegate { class ShareViewController: SLComposeServiceViewController, ShareFolderPickerControllerDelegate {
@ -46,14 +47,14 @@ class ShareViewController: SLComposeServiceViewController, ShareFolderPickerCont
// Try to get any HTML that is maybe passed in // Try to get any HTML that is maybe passed in
for item in self.extensionContext!.inputItems as! [NSExtensionItem] { for item in self.extensionContext!.inputItems as! [NSExtensionItem] {
for itemProvider in item.attachments! { for itemProvider in item.attachments! {
if itemProvider.hasItemConformingToTypeIdentifier(kUTTypePropertyList as String) { if itemProvider.hasItemConformingToTypeIdentifier(UTType.propertyList.identifier) {
provider = itemProvider provider = itemProvider
} }
} }
} }
if provider != nil { if provider != nil {
provider!.loadItem(forTypeIdentifier: kUTTypePropertyList as String, options: nil, completionHandler: { [weak self] (pList, error) in provider!.loadItem(forTypeIdentifier: UTType.propertyList.identifier, options: nil, completionHandler: { [weak self] (pList, error) in
if error != nil { if error != nil {
return return
} }
@ -73,14 +74,14 @@ class ShareViewController: SLComposeServiceViewController, ShareFolderPickerCont
// Try to get the URL if it is passed in // Try to get the URL if it is passed in
for item in self.extensionContext!.inputItems as! [NSExtensionItem] { for item in self.extensionContext!.inputItems as! [NSExtensionItem] {
for itemProvider in item.attachments! { for itemProvider in item.attachments! {
if itemProvider.hasItemConformingToTypeIdentifier(kUTTypeURL as String) { if itemProvider.hasItemConformingToTypeIdentifier(UTType.url.identifier) {
provider = itemProvider provider = itemProvider
} }
} }
} }
if provider != nil { if provider != nil {
provider!.loadItem(forTypeIdentifier: kUTTypeURL as String, options: nil, completionHandler: { [weak self] (urlCoded, error) in provider!.loadItem(forTypeIdentifier: UTType.url.identifier, options: nil, completionHandler: { [weak self] (urlCoded, error) in
if error != nil { if error != nil {
return return
} }

35
iOS/UIKit Extensions/InteractiveLabel.swift
View File

@ -9,7 +9,7 @@
import UIKit import UIKit
@IBDesignable @IBDesignable
class InteractiveLabel: UILabel { class InteractiveLabel: UILabel, UIEditMenuInteractionDelegate {
override init(frame: CGRect) { override init(frame: CGRect) {
super.init(frame: frame) super.init(frame: frame)
@ -24,18 +24,23 @@ class InteractiveLabel: UILabel {
func commonInit() { func commonInit() {
let gestureRecognizer = UILongPressGestureRecognizer(target: self, action: #selector(handleLongPressGesture(_:))) let gestureRecognizer = UILongPressGestureRecognizer(target: self, action: #selector(handleLongPressGesture(_:)))
self.addGestureRecognizer(gestureRecognizer) self.addGestureRecognizer(gestureRecognizer)
let editMenuInteraction = UIEditMenuInteraction(delegate: self)
addInteraction(editMenuInteraction)
self.isUserInteractionEnabled = true self.isUserInteractionEnabled = true
} }
@objc func handleLongPressGesture(_ recognizer: UIGestureRecognizer) { @objc func handleLongPressGesture(_ recognizer: UIGestureRecognizer) {
guard recognizer.state == .began, guard recognizer.state == .began, let recognizerView = recognizer.view else {
let recognizerView = recognizer.view, return
let recognizerSuperView = recognizerView.superview, }
recognizerView.becomeFirstResponder() else {
return if let interaction = recognizerView.interactions.first(where: { $0 is UIEditMenuInteraction }) as? UIEditMenuInteraction {
let location = recognizer.location(in: recognizerView)
let editMenuConfiguration = UIEditMenuConfiguration(identifier: nil, sourcePoint: location)
interaction.presentEditMenu(with: editMenuConfiguration)
} }
UIMenuController.shared.showMenu(from: recognizerSuperView, rect: recognizerView.frame)
} }
override var canBecomeFirstResponder: Bool { override var canBecomeFirstResponder: Bool {
@ -44,11 +49,19 @@ class InteractiveLabel: UILabel {
override func canPerformAction(_ action: Selector, withSender sender: Any?) -> Bool { override func canPerformAction(_ action: Selector, withSender sender: Any?) -> Bool {
return (action == #selector(UIResponderStandardEditActions.copy(_:))) return (action == #selector(UIResponderStandardEditActions.copy(_:)))
} }
override func copy(_ sender: Any?) { override func copy(_ sender: Any?) {
UIPasteboard.general.string = text UIPasteboard.general.string = text
} }
// MARK: - UIEditMenuInteractionDelegate
func editMenuInteraction(_ interaction: UIEditMenuInteraction, menuFor configuration: UIEditMenuConfiguration, suggestedActions: [UIMenuElement]) -> UIMenu? {
let copyAction = UIAction(title: "Copy", image: nil) { [weak self] action in
self?.copy(nil)
}
return UIMenu(title: "", children: [copyAction])
}
} }