FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Continue converting AppAssets to AppAsset.

Browse Source
This commit is contained in:
Brent Simmons 2024-10-01 13:43:38 -07:00
parent f756b8f4ef
commit 8d5bd91c74
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Mac/AppAssets.swift
View File

@ -14,11 +14,6 @@ import Images
extension AppAsset { extension AppAsset {
struct Mac { struct Mac {
struct PreferencesToolbar {
static let accounts = RSImage.systemImage("at")
static let general = RSImage.systemImage("gearshape")
static let advanced = RSImage.systemImage("gearshape.2")
}
struct Timeline { struct Timeline {
static let swipeMarkRead = NSImage(systemSymbolName: "circle", accessibilityDescription: "Mark Read")! static let swipeMarkRead = NSImage(systemSymbolName: "circle", accessibilityDescription: "Mark Read")!

6
Mac/Preferences/PreferencesWindowController.swift
View File

@ -35,10 +35,10 @@ class PreferencesWindowController : NSWindowController, NSToolbarDelegate {
var specs = [PreferencesToolbarItemSpec]() var specs = [PreferencesToolbarItemSpec]()
specs += [PreferencesToolbarItemSpec(identifierRawValue: ToolbarItemIdentifier.General, specs += [PreferencesToolbarItemSpec(identifierRawValue: ToolbarItemIdentifier.General,
name: NSLocalizedString("General", comment: "Preferences"), name: NSLocalizedString("General", comment: "Preferences"),
image: AppAsset.Mac.PreferencesToolbar.general)] image: AppAsset.preferencesToolbarGeneralImage)]
specs += [PreferencesToolbarItemSpec(identifierRawValue: ToolbarItemIdentifier.Accounts, specs += [PreferencesToolbarItemSpec(identifierRawValue: ToolbarItemIdentifier.Accounts,
name: NSLocalizedString("Accounts", comment: "Preferences"), name: NSLocalizedString("Accounts", comment: "Preferences"),
image: AppAsset.Mac.PreferencesToolbar.accounts)] image: AppAsset.preferencesToolbarAccountsImage)]
// Omit the Advanced Preferences for now because the Software Update related functionality is // Omit the Advanced Preferences for now because the Software Update related functionality is
// forbidden/non-applicable, and we can rely upon Apple to some extent for crash reports. We // forbidden/non-applicable, and we can rely upon Apple to some extent for crash reports. We
@ -47,7 +47,7 @@ class PreferencesWindowController : NSWindowController, NSToolbarDelegate {
#if !MAC_APP_STORE #if !MAC_APP_STORE
specs += [PreferencesToolbarItemSpec(identifierRawValue: ToolbarItemIdentifier.Advanced, specs += [PreferencesToolbarItemSpec(identifierRawValue: ToolbarItemIdentifier.Advanced,
name: NSLocalizedString("Advanced", comment: "Preferences"), name: NSLocalizedString("Advanced", comment: "Preferences"),
image: AppAsset.Mac.PreferencesToolbar.advanced)] image: AppAsset.preferencesToolbarAdvancedImage)]
#endif #endif
return specs return specs
}() }()

6
Shared/AppAsset.swift
View File

@ -138,6 +138,12 @@ extension AppAsset {
static let toolbarReadClosedImage = RSImage.systemImage("largecircle.fill.circle") static let toolbarReadClosedImage = RSImage.systemImage("largecircle.fill.circle")
static let toolbarReadOpenImage = RSImage.systemImage("circle") static let toolbarReadOpenImage = RSImage.systemImage("circle")
static let toolbarShareImage = AppAsset.shareImage static let toolbarShareImage = AppAsset.shareImage
// MARK: - Mac Preferences Toolbar
static let preferencesToolbarAccountsImage = RSImage.systemImage("at")
static let preferencesToolbarGeneralImage = RSImage.systemImage("gearshape")
static let preferencesToolbarAdvancedImage = RSImage.systemImage("gearshape.2")
} }
#endif #endif