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

Fix lint issues.

Browse Source
This commit is contained in:
Brent Simmons
2025-01-24 22:31:37 -08:00
parent f1640d8d09
commit cc4914a7ef
17 changed files with 47 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Mac/MainWindow/MainWindowController.swift
View File

@@ -272,9 +272,13 @@ class MainWindowController: NSWindowController, NSUserInterfaceValidations {
guard let detailViewController = detailViewController else {
return
}
detailViewController.canScrollDown { (canScroll) in
detailViewController.canScrollDown { canScroll in
NSCursor.setHiddenUntilMouseMoves(true)
canScroll ? detailViewController.scrollPageDown(sender) : self.nextUnread(sender)
if canScroll {
detailViewController.scrollPageDown(sender)
} else {
self.nextUnread(sender)
}
}
}

5
Mac/MainWindow/Sidebar/SidebarViewController.swift
View File

@@ -302,10 +302,7 @@ protocol SidebarDelegate: AnyObject {
// MARK: - Navigation
func canGoToNextUnread(wrappingToTop wrapping: Bool = false) -> Bool {
if let _ = nextSelectableRowWithUnreadArticle(wrappingToTop: wrapping) {
return true
}
return false
nextSelectableRowWithUnreadArticle(wrappingToTop: wrapping) != nil
}
func goToNextUnread(wrappingToTop wrapping: Bool = false) {

2
Mac/MainWindow/Timeline/ArticlePasteboardWriter.swift
View File

@@ -38,7 +38,7 @@ extension Article: @retroactive PasteboardWriterOwner {
func writableTypes(for pasteboard: NSPasteboard) -> [NSPasteboard.PasteboardType] {
var types = [ArticlePasteboardWriter.articleUTIType]
if let _ = article.preferredURL {
if article.preferredURL != nil {
types += [.URL]
}
types += [.string, .html, ArticlePasteboardWriter.articleUTIInternalType]

2
Mac/MainWindow/Timeline/Cell/TimelineCellAppearance.swift
View File

@@ -65,7 +65,7 @@ struct TimelineCellAppearance: Equatable {
extension NSEdgeInsets: @retroactive Equatable {
public static func ==(lhs: NSEdgeInsets, rhs: NSEdgeInsets) -> Bool {
public static func == (lhs: NSEdgeInsets, rhs: NSEdgeInsets) -> Bool {
return lhs.left == rhs.left && lhs.top == rhs.top && lhs.right == rhs.right && lhs.bottom == rhs.bottom
}
}

6
Mac/MainWindow/Timeline/Cell/TimelineTableCellView.swift
View File

@@ -299,7 +299,11 @@ private extension TimelineTableCellView {
}
func showOrHideView(_ view: NSView, _ shouldHide: Bool) {
shouldHide ? hideView(view) : showView(view)
if shouldHide {
hideView(view)
} else {
showView(view)
}
}
func updateSubviews() {

2
Mac/MainWindow/Timeline/TimelineContainerViewController.swift
View File

@@ -107,7 +107,7 @@ final class TimelineContainerViewController: NSViewController {
return false
}
for object in representedObjects {
guard let _ = currentObjects.firstIndex(where: { $0 === object }) else {
guard currentObjects.firstIndex(where: { $0 === object }) != nil else {
return false
}
}

39
Mac/MainWindow/Timeline/TimelineViewController.swift
View File

@@ -557,10 +557,7 @@ final class TimelineViewController: NSViewController, UndoableCommandRunner, Unr
}
func canGoToNextUnread(wrappingToTop wrapping: Bool = false) -> Bool {
guard let _ = indexOfNextUnreadArticle(wrappingToTop: wrapping) else {
return false
}
return true
indexOfNextUnreadArticle(wrappingToTop: wrapping) != nil
}
func indexOfNextUnreadArticle(wrappingToTop wrapping: Bool = false) -> Int? {
@@ -913,25 +910,25 @@ extension TimelineViewController: NSTableViewDelegate {
}
switch edge {
case .leading:
let action = NSTableViewRowAction(style: .regular, title: article.status.read ? "Unread" : "Read") { (_, _) in
self.toggleArticleRead(article)
tableView.rowActionsVisible = false
}
action.image = article.status.read ? AppAssets.swipeMarkUnreadImage : AppAssets.swipeMarkReadImage
return [action]
case .leading:
let action = NSTableViewRowAction(style: .regular, title: article.status.read ? "Unread" : "Read") { (_, _) in
self.toggleArticleRead(article)
tableView.rowActionsVisible = false
}
action.image = article.status.read ? AppAssets.swipeMarkUnreadImage : AppAssets.swipeMarkReadImage
return [action]
case .trailing:
let action = NSTableViewRowAction(style: .regular, title: article.status.starred ? "Unstar" : "Star") { (_, _) in
self.toggleArticleStarred(article)
tableView.rowActionsVisible = false
}
action.backgroundColor = AppAssets.starColor
action.image = article.status.starred ? AppAssets.swipeMarkUnstarredImage : AppAssets.swipeMarkStarredImage
return [action]
case .trailing:
let action = NSTableViewRowAction(style: .regular, title: article.status.starred ? "Unstar" : "Star") { (_, _) in
self.toggleArticleStarred(article)
tableView.rowActionsVisible = false
}
action.backgroundColor = AppAssets.starColor
action.image = article.status.starred ? AppAssets.swipeMarkUnstarredImage : AppAssets.swipeMarkStarredImage
return [action]
@unknown default:
os_log(.error, "Unknown table row edge: %ld", edge.rawValue)
@unknown default:
os_log(.error, "Unknown table row edge: %ld", edge.rawValue)
}
return []