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

Continue moving from AppAssets to AppAsset.

Browse Source
This commit is contained in:
Brent Simmons
2024-07-09 21:08:34 -07:00
parent ba44b94220
commit 030d101634
10 changed files with 39 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Mac/AppAssets.swift
View File

@@ -15,9 +15,18 @@ extension AppAsset {
struct Mac {
static let iconLightBackgroundColor = NSColor(named: NSColor.Name("iconLightBackgroundColor"))!
static let iconDarkBackgroundColor = NSColor(named: NSColor.Name("iconDarkBackgroundColor"))!
static let marsEditIcon = RSImage.appImage("MarsEditIcon")
static let microblogIcon = RSImage.appImage("MicroblogIcon")
struct Toolbar {
static let addNewSidebarItem = RSImage.systemImage("plus")
static let sidebarToggle = RSImage.systemImage("sidebar.left")
static let refresh = RSImage.systemImage("arrow.clockwise")
static let articleTheme = RSImage.systemImage("doc.richtext")
static let cleanUpImage = RSImage.systemImage("wind")
}
}
}
@@ -25,23 +34,7 @@ extension AppAsset {
struct AppAssets {
static let articleTheme = NSImage(systemSymbolName: "doc.richtext", accessibilityDescription: nil)!
static let cleanUpImage = NSImage(systemSymbolName: "wind", accessibilityDescription: nil)!
static let marsEditIcon = NSImage(named: "MarsEditIcon")!
static let microblogIcon = NSImage(named: "MicroblogIcon")!
static let faviconTemplateImage = NSImage(named: "faviconTemplateImage")!
static let filterActive = NSImage(systemSymbolName: "line.horizontal.3.decrease.circle.fill", accessibilityDescription: nil)!
static let filterInactive = NSImage(systemSymbolName: "line.horizontal.3.decrease.circle", accessibilityDescription: nil)!
static let iconLightBackgroundColor = NSColor(named: NSColor.Name("iconLightBackgroundColor"))!
static let iconDarkBackgroundColor = NSColor(named: NSColor.Name("iconDarkBackgroundColor"))!
static let legacyArticleExtractor = NSImage(named: "legacyArticleExtractor")!
@@ -67,8 +60,6 @@ struct AppAssets {
return IconImage(coloredImage, isSymbol: true, isBackgroundSupressed: true, preferredColor: preferredColor.cgColor)
}()
static let markAllAsReadImage = NSImage(named: "markAllAsRead")!
static let nextUnreadImage = NSImage(systemSymbolName: "chevron.down.circle", accessibilityDescription: nil)!
static let openInBrowserImage = NSImage(systemSymbolName: "safari", accessibilityDescription: nil)!
@@ -83,7 +74,6 @@ struct AppAssets {
static let readOpenImage = NSImage(systemSymbolName: "circle", accessibilityDescription: nil)!
static let refreshImage = NSImage(systemSymbolName: "arrow.clockwise", accessibilityDescription: nil)!
@MainActor
static let searchFeedImage: IconImage = {
@@ -92,8 +82,6 @@ struct AppAssets {
static let shareImage = NSImage(systemSymbolName: "square.and.arrow.up", accessibilityDescription: nil)!
static let sidebarToggleImage = NSImage(systemSymbolName: "sidebar.left", accessibilityDescription: nil)!
static let starClosedImage = NSImage(systemSymbolName: "star.fill", accessibilityDescription: nil)!
static let starOpenImage = NSImage(systemSymbolName: "star", accessibilityDescription: nil)!

2
Mac/AppDelegate.swift
View File

@@ -164,7 +164,7 @@ import Sparkle
os_log(.debug, "Is first run.")
}
FaviconGenerator.faviconTemplateImage = AppAssets.faviconTemplateImage
FaviconGenerator.faviconTemplateImage = AppAsset.faviconTemplate
importFeedsIfNeeded()
updateSortMenuItems()

18
Mac/MainWindow/MainWindowController.swift
View File

@@ -796,11 +796,11 @@ extension MainWindowController: NSToolbarDelegate {
case .sidebarToggle:
let title = NSLocalizedString("Toggle Sidebar", comment: "Toggle Sidebar")
return buildToolbarButton(.toggleSidebar, title, AppAssets.sidebarToggleImage, "toggleTheSidebar:")
return buildToolbarButton(.toggleSidebar, title, AppAsset.Mac.Toolbar.sidebarToggle, "toggleTheSidebar:")
case .refresh:
let title = NSLocalizedString("Refresh", comment: "Refresh")
return buildToolbarButton(.refresh, title, AppAssets.refreshImage, "refreshAll:")
return buildToolbarButton(.refresh, title, AppAsset.Mac.Toolbar.refresh, "refreshAll:")
case .newSidebarItemMenu:
let toolbarItem = NSMenuToolbarItem(itemIdentifier: .newSidebarItemMenu)
@@ -813,11 +813,11 @@ extension MainWindowController: NSToolbarDelegate {
case .markAllAsRead:
let title = NSLocalizedString("Mark All as Read", comment: "Mark All as Read")
return buildToolbarButton(.markAllAsRead, title, AppAssets.markAllAsReadImage, "markAllAsRead:")
return buildToolbarButton(.markAllAsRead, title, AppAsset.markAllAsRead, "markAllAsRead:")
case .toggleReadArticlesFilter:
let title = NSLocalizedString("Read Articles Filter", comment: "Read Articles Filter")
return buildToolbarButton(.toggleReadArticlesFilter, title, AppAssets.filterInactive, "toggleReadArticlesFilter:")
return buildToolbarButton(.toggleReadArticlesFilter, title, AppAsset.filterInactive, "toggleReadArticlesFilter:")
case .timelineTrackingSeparator:
return NSTrackingSeparatorToolbarItem(identifier: .timelineTrackingSeparator, splitView: splitViewController!.splitView, dividerIndex: 1)
@@ -854,7 +854,7 @@ extension MainWindowController: NSToolbarDelegate {
return buildToolbarButton(.openInBrowser, title, AppAssets.openInBrowserImage, "openArticleInBrowser:")
case .articleThemeMenu:
articleThemeMenuToolbarItem.image = AppAssets.articleTheme
articleThemeMenuToolbarItem.image = AppAsset.Mac.Toolbar.articleTheme
let description = NSLocalizedString("Article Theme", comment: "Article Theme")
articleThemeMenuToolbarItem.toolTip = description
articleThemeMenuToolbarItem.label = description
@@ -869,7 +869,7 @@ extension MainWindowController: NSToolbarDelegate {
case .cleanUp:
let title = NSLocalizedString("Clean Up", comment: "Clean Up")
return buildToolbarButton(.cleanUp, title, AppAssets.cleanUpImage, "cleanUp:")
return buildToolbarButton(.cleanUp, title, AppAsset.Mac.Toolbar.cleanUpImage, "cleanUp:")
default:
break
@@ -1190,7 +1190,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 = AppAsset.filterInactive
}
return false
}
@@ -1199,13 +1199,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 = AppAsset.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 = AppAsset.filterInactive
}
}

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

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