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

Finish migration away from AppAssets to AppImage and AppColor.

Browse Source
This commit is contained in:
Brent Simmons
2025-01-30 12:58:14 -08:00
parent 6db201f827
commit 0dfb284f67
37 changed files with 179 additions and 638 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Mac/MainWindow/MainWindowController.swift
View File

@@ -753,11 +753,11 @@ extension MainWindowController: NSToolbarDelegate {
case .refresh:
let title = NSLocalizedString("Refresh", comment: "Refresh")
return buildToolbarButton(.refresh, title, AppAssets.refreshImage, "refreshAll:")
return buildToolbarButton(.refresh, title, AppImage.refresh, "refreshAll:")
case .newSidebarItemMenu:
let toolbarItem = NSMenuToolbarItem(itemIdentifier: .newSidebarItemMenu)
toolbarItem.image = AppAssets.addNewSidebarItemImage
toolbarItem.image = AppImage.addNewSidebarItem
let description = NSLocalizedString("Add Item", comment: "Add Item")
toolbarItem.toolTip = description
toolbarItem.label = description
@@ -770,22 +770,22 @@ extension MainWindowController: NSToolbarDelegate {
case .toggleReadArticlesFilter:
let title = NSLocalizedString("Read Articles Filter", comment: "Read Articles Filter")
return buildToolbarButton(.toggleReadArticlesFilter, title, AppAssets.filterInactive, "toggleReadArticlesFilter:")
return buildToolbarButton(.toggleReadArticlesFilter, title, AppImage.filterInactive, "toggleReadArticlesFilter:")
case .timelineTrackingSeparator:
return NSTrackingSeparatorToolbarItem(identifier: .timelineTrackingSeparator, splitView: splitViewController!.splitView, dividerIndex: 1)
case .markRead:
let title = NSLocalizedString("Mark Read", comment: "Mark Read")
return buildToolbarButton(.markRead, title, AppAssets.readClosedImage, "toggleRead:")
return buildToolbarButton(.markRead, title, AppImage.readClosed, "toggleRead:")
case .markStar:
let title = NSLocalizedString("Star", comment: "Star")
return buildToolbarButton(.markStar, title, AppAssets.starOpenImage, "toggleStarred:")
return buildToolbarButton(.markStar, title, AppImage.starOpen, "toggleStarred:")
case .nextUnread:
let title = NSLocalizedString("Next Unread", comment: "Next Unread")
return buildToolbarButton(.nextUnread, title, AppAssets.nextUnreadImage, "nextUnread:")
return buildToolbarButton(.nextUnread, title, AppImage.nextUnread, "nextUnread:")
case .readerView:
let toolbarItem = RSToolbarItem(itemIdentifier: .readerView)
@@ -804,7 +804,7 @@ extension MainWindowController: NSToolbarDelegate {
case .openInBrowser:
let title = NSLocalizedString("Open in Browser", comment: "Open in Browser")
return buildToolbarButton(.openInBrowser, title, AppAssets.openInBrowserImage, "openArticleInBrowser:")
return buildToolbarButton(.openInBrowser, title, AppImage.openInBrowser, "openArticleInBrowser:")
case .articleThemeMenu:
articleThemeMenuToolbarItem.image = AppImage.articleTheme
@@ -1033,7 +1033,7 @@ private extension MainWindowController {
}
if let toolbarItem = item as? NSToolbarItem, let button = toolbarItem.view as? NSButton {
button.image = markingRead ? AppAssets.readClosedImage : AppAssets.readOpenImage
button.image = markingRead ? AppImage.readClosed : AppImage.readOpen
}
return result
@@ -1117,7 +1117,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 ? AppImage.starOpen : AppImage.starClosed
}
return result
@@ -1144,7 +1144,7 @@ private extension MainWindowController {
(item as? NSMenuItem)?.title = hideCommand
if let toolbarItem = item as? NSToolbarItem, let button = toolbarItem.view as? NSButton {
toolbarItem.toolTip = hideCommand
button.image = AppAssets.filterInactive
button.image = AppImage.filterInactive
}
return false
}
@@ -1153,13 +1153,13 @@ private extension MainWindowController {
(item as? NSMenuItem)?.title = showCommand
if let toolbarItem = item as? NSToolbarItem, let button = toolbarItem.view as? NSButton {
toolbarItem.toolTip = showCommand
button.image = AppAssets.filterActive
button.image = AppImage.filterActive
}
} else {
(item as? NSMenuItem)?.title = hideCommand
if let toolbarItem = item as? NSToolbarItem, let button = toolbarItem.view as? NSButton {
toolbarItem.toolTip = hideCommand
button.image = AppAssets.filterInactive
button.image = AppImage.filterInactive
}
}

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

@@ -20,7 +20,7 @@ final class TimelineTableCellView: NSTableCellView {
private lazy var iconView = IconView()
private var starView = TimelineTableCellView.imageView(with: AppAssets.timelineStarUnselected, scaling: .scaleNone)
private var starView = TimelineTableCellView.imageView(with: AppImage.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 = AppAssets.timelineStarSelected
starView.image = AppImage.timelineStarSelected
} else {
starView.image = AppAssets.timelineStarUnselected
starView.image = AppImage.timelineStarUnselected
}
showOrHideView(starView, !cellData.starred)
}

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

@@ -209,9 +209,9 @@ private extension TimelineContainerViewController {
readFilteredButton.isHidden = false
if isReadFiltered {
readFilteredButton.image = AppAssets.filterActive
readFilteredButton.image = AppImage.filterActive
} else {
readFilteredButton.image = AppAssets.filterInactive
readFilteredButton.image = AppImage.filterInactive
}
}

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

@@ -915,7 +915,7 @@ extension TimelineViewController: NSTableViewDelegate {
self.toggleArticleRead(article)
tableView.rowActionsVisible = false
}
action.image = article.status.read ? AppAssets.swipeMarkUnreadImage : AppAssets.swipeMarkReadImage
action.image = article.status.read ? AppImage.swipeMarkUnread : AppImage.swipeMarkRead
return [action]
case .trailing:
@@ -923,8 +923,8 @@ extension TimelineViewController: NSTableViewDelegate {
self.toggleArticleStarred(article)
tableView.rowActionsVisible = false
}
action.backgroundColor = AppAssets.starColor
action.image = article.status.starred ? AppAssets.swipeMarkUnstarredImage : AppAssets.swipeMarkStarredImage
action.backgroundColor = AppColor.star
action.image = article.status.starred ? AppImage.swipeMarkUnstarred: AppImage.swipeMarkStarred
return [action]
@unknown default: