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

Complete switch on Mac from AppAssets to AppAsset.

Browse Source
This commit is contained in:
Brent Simmons
2024-10-30 21:28:31 -07:00
parent 9bffd090f3
commit c3fbdbc4e1
15 changed files with 151 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Mac/MainWindow/MainWindowController.swift
View File

@@ -799,7 +799,7 @@ extension MainWindowController: NSToolbarDelegate {
case .markStar:
let title = NSLocalizedString("Star", comment: "Star")
return buildToolbarButton(.markStar, title, AppAssets.starOpenImage, "toggleStarred:")
return buildToolbarButton(.markStar, title, AppAsset.starOpenImage, "toggleStarred:")
case .nextUnread:
let title = NSLocalizedString("Next Unread", comment: "Next Unread")
@@ -1135,7 +1135,7 @@ private extension MainWindowController {
}
if let toolbarItem = item as? NSToolbarItem, let button = toolbarItem.view as? NSButton {
button.image = starring ? AppAssets.starOpenImage : AppAssets.starClosedImage
button.image = starring ? AppAsset.starOpenImage : AppAsset.starClosedImage
}
return result

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

@@ -19,7 +19,7 @@ final class TimelineTableCellView: NSTableCellView {
private lazy var iconView = IconView()
private var starView = TimelineTableCellView.imageView(with: AppAsset.Mac.Timeline.starUnselected, scaling: .scaleNone)
private var starView = TimelineTableCellView.imageView(with: AppAsset.timelineStarUnselected, scaling: .scaleNone)
private lazy var textFields = {
return [self.dateView, self.feedNameView, self.titleView, self.summaryView, self.textView]
@@ -258,9 +258,9 @@ private extension TimelineTableCellView {
func updateStarView() {
if isSelected && isEmphasized {
starView.image = AppAsset.Mac.Timeline.starSelected
starView.image = AppAsset.timelineStarSelected
} else {
starView.image = AppAsset.Mac.Timeline.starUnselected
starView.image = AppAsset.timelineStarUnselected
}
showOrHideView(starView, !cellData.starred)
}

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

@@ -59,7 +59,7 @@ class TimelineTableRowView : NSTableRowView {
separator = NSView()
separator!.translatesAutoresizingMaskIntoConstraints = false
separator!.wantsLayer = true
separator!.layer?.backgroundColor = AppAsset.Mac.Timeline.separatorColor.cgColor
separator!.layer?.backgroundColor = AppAsset.timelineSeparatorColor.cgColor
addSubview(separator!)

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

@@ -945,7 +945,7 @@ extension TimelineViewController: NSTableViewDelegate {
self.toggleArticleRead(article);
tableView.rowActionsVisible = false
}
action.image = article.status.read ? AppAsset.Mac.Timeline.swipeMarkUnread : AppAsset.Mac.Timeline.swipeMarkRead
action.image = article.status.read ? AppAsset.timelineSwipeMarkUnread : AppAsset.timelineSwipeMarkRead
return [action]
case .trailing:
@@ -954,7 +954,7 @@ extension TimelineViewController: NSTableViewDelegate {
tableView.rowActionsVisible = false
}
action.backgroundColor = AppAsset.starColor
action.image = article.status.starred ? AppAsset.Mac.Timeline.swipeMarkUnstarred : AppAsset.Mac.Timeline.swipeMarkStarred
action.image = article.status.starred ? AppAsset.timelineSwipeMarkUnstarred : AppAsset.timelineSwipeMarkStarred
return [action]
@unknown default: