From b116c7b6e5c8e6b20848a9f06e073f8237d23f9d Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Sun, 26 Jan 2025 22:07:13 -0800 Subject: [PATCH] Rename AppAsset to AppImage. --- Mac/AppAssets.swift | 116 +++++++++--------- Mac/MainWindow/ArticleExtractorButton.swift | 14 +-- .../LegacyArticleExtractorButton.swift | 111 ----------------- Mac/MainWindow/MainWindowController.swift | 6 +- .../SharingServicePickerDelegate.swift | 3 +- .../AccountsReaderAPIWindowController.swift | 8 +- .../ArticleExtractor.png | Bin 206 -> 0 bytes .../ArticleExtractor@2x.png | Bin 253 -> 0 bytes .../Contents.json | 22 ---- .../ArticleExtractorError.pdf | Bin 3818 -> 0 bytes .../Contents.json | 12 -- .../ArticleExtractorInactiveDark.png | Bin 206 -> 0 bytes .../ArticleExtractorInactiveDark@2x.png | Bin 253 -> 0 bytes .../Contents.json | 22 ---- .../ArticleExtractorInactiveLight.png | Bin 206 -> 0 bytes .../ArticleExtractorInactiveLight@2x.png | Bin 253 -> 0 bytes .../Contents.json | 22 ---- .../ArticleExtractorProgress1.png | Bin 214 -> 0 bytes .../ArticleExtractorProgress1@2x.png | Bin 260 -> 0 bytes .../Contents.json | 22 ---- .../ArticleExtractorProgress2.png | Bin 216 -> 0 bytes .../ArticleExtractorProgress2@2x.png | Bin 262 -> 0 bytes .../Contents.json | 22 ---- .../ArticleExtractorProgress3.png | Bin 209 -> 0 bytes .../ArticleExtractorProgress3@2x.png | Bin 254 -> 0 bytes .../Contents.json | 22 ---- .../ArticleExtractorProgress4.png | Bin 217 -> 0 bytes .../ArticleExtractorProgress4@2x.png | Bin 263 -> 0 bytes .../Contents.json | 22 ---- .../RSCore/Sources/RSCore/SendToCommand.swift | 2 +- NetNewsWire.xcodeproj/project.pbxproj | 2 +- Shared/AppAsset.swift | 80 ------------ Shared/AppImage.swift | 103 ++++++++++++++++ .../SendToMarsEditCommand.swift | 2 +- .../SendToMicroBlogCommand.swift | 2 +- Shared/Extensions/RSImage-AppIcons.swift | 2 +- Shared/Extensions/SmallIconProvider.swift | 2 +- .../CloudKitAccountViewController.swift | 2 +- .../FeedbinAccountViewController.swift | 2 +- iOS/Account/LocalAccountViewController.swift | 2 +- .../NewsBlurAccountViewController.swift | 2 +- .../ReaderAPIAccountViewController.swift | 8 +- iOS/AppAssets.swift | 64 +++++----- iOS/Article/ArticleExtractorButton.swift | 12 +- iOS/Article/ArticleViewController.swift | 2 +- iOS/Article/WebViewController.swift | 2 +- .../AccountInspectorViewController.swift | 2 +- iOS/MainFeed/MainFeedViewController.swift | 4 +- iOS/MainTimeline/TimelineViewController.swift | 2 +- iOS/Settings/AddAccountViewController.swift | 8 +- iOS/Settings/SettingsViewController.swift | 2 +- .../ShareFolderPickerController.swift | 2 +- 52 files changed, 240 insertions(+), 495 deletions(-) delete mode 100644 Mac/MainWindow/LegacyArticleExtractorButton.swift delete mode 100644 Mac/Resources/Assets.xcassets/legacyArticleExtractor.imageset/ArticleExtractor.png delete mode 100644 Mac/Resources/Assets.xcassets/legacyArticleExtractor.imageset/ArticleExtractor@2x.png delete mode 100644 Mac/Resources/Assets.xcassets/legacyArticleExtractor.imageset/Contents.json delete mode 100644 Mac/Resources/Assets.xcassets/legacyArticleExtractorError.imageset/ArticleExtractorError.pdf delete mode 100644 Mac/Resources/Assets.xcassets/legacyArticleExtractorError.imageset/Contents.json delete mode 100644 Mac/Resources/Assets.xcassets/legacyArticleExtractorInactiveDark.imageset/ArticleExtractorInactiveDark.png delete mode 100644 Mac/Resources/Assets.xcassets/legacyArticleExtractorInactiveDark.imageset/ArticleExtractorInactiveDark@2x.png delete mode 100644 Mac/Resources/Assets.xcassets/legacyArticleExtractorInactiveDark.imageset/Contents.json delete mode 100644 Mac/Resources/Assets.xcassets/legacyArticleExtractorInactiveLight.imageset/ArticleExtractorInactiveLight.png delete mode 100644 Mac/Resources/Assets.xcassets/legacyArticleExtractorInactiveLight.imageset/ArticleExtractorInactiveLight@2x.png delete mode 100644 Mac/Resources/Assets.xcassets/legacyArticleExtractorInactiveLight.imageset/Contents.json delete mode 100644 Mac/Resources/Assets.xcassets/legacyArticleExtractorProgress1.imageset/ArticleExtractorProgress1.png delete mode 100644 Mac/Resources/Assets.xcassets/legacyArticleExtractorProgress1.imageset/ArticleExtractorProgress1@2x.png delete mode 100644 Mac/Resources/Assets.xcassets/legacyArticleExtractorProgress1.imageset/Contents.json delete mode 100644 Mac/Resources/Assets.xcassets/legacyArticleExtractorProgress2.imageset/ArticleExtractorProgress2.png delete mode 100644 Mac/Resources/Assets.xcassets/legacyArticleExtractorProgress2.imageset/ArticleExtractorProgress2@2x.png delete mode 100644 Mac/Resources/Assets.xcassets/legacyArticleExtractorProgress2.imageset/Contents.json delete mode 100644 Mac/Resources/Assets.xcassets/legacyArticleExtractorProgress3.imageset/ArticleExtractorProgress3.png delete mode 100644 Mac/Resources/Assets.xcassets/legacyArticleExtractorProgress3.imageset/ArticleExtractorProgress3@2x.png delete mode 100644 Mac/Resources/Assets.xcassets/legacyArticleExtractorProgress3.imageset/Contents.json delete mode 100644 Mac/Resources/Assets.xcassets/legacyArticleExtractorProgress4.imageset/ArticleExtractorProgress4.png delete mode 100644 Mac/Resources/Assets.xcassets/legacyArticleExtractorProgress4.imageset/ArticleExtractorProgress4@2x.png delete mode 100644 Mac/Resources/Assets.xcassets/legacyArticleExtractorProgress4.imageset/Contents.json delete mode 100644 Shared/AppAsset.swift create mode 100644 Shared/AppImage.swift diff --git a/Mac/AppAssets.swift b/Mac/AppAssets.swift index 86a5d7ac5..37f48f670 100644 --- a/Mac/AppAssets.swift +++ b/Mac/AppAssets.swift @@ -55,33 +55,33 @@ struct AppAssets { return NSImage(systemSymbolName: "plus", accessibilityDescription: nil)! }() - static var articleExtractorError: RSImage = { - return RSImage(named: "articleExtractorError")! - }() +// static var articleExtractorError: RSImage = { +// return RSImage(named: "articleExtractorError")! +// }() +// +// static var articleExtractorOff: RSImage = { +// return RSImage(named: "articleExtractorOff")! +// }() +// +// static var articleExtractorOn: RSImage = { +// return RSImage(named: "articleExtractorOn")! +// }() - static var articleExtractorOff: RSImage = { - return RSImage(named: "articleExtractorOff")! - }() +// static var articleTheme: RSImage = { +// return NSImage(systemSymbolName: "doc.richtext", accessibilityDescription: nil)! +// }() - static var articleExtractorOn: RSImage = { - return RSImage(named: "articleExtractorOn")! - }() +// static var cleanUpImage: RSImage = { +// return NSImage(systemSymbolName: "wind", accessibilityDescription: nil)! +// }() - static var articleTheme: RSImage = { - return NSImage(systemSymbolName: "doc.richtext", accessibilityDescription: nil)! - }() - - static var cleanUpImage: RSImage = { - return NSImage(systemSymbolName: "wind", accessibilityDescription: nil)! - }() - - static var marsEditIcon: RSImage = { - return RSImage(named: "MarsEditIcon")! - }() - - static var microblogIcon: RSImage = { - return RSImage(named: "MicroblogIcon")! - }() +// static var marsEditIcon: RSImage = { +// return RSImage(named: "MarsEditIcon")! +// }() +// +// static var microblogIcon: RSImage = { +// return RSImage(named: "MicroblogIcon")! +// }() static var faviconTemplateImage: RSImage = { return RSImage(named: "faviconTemplateImage")! @@ -103,37 +103,37 @@ struct AppAssets { return NSColor(named: NSColor.Name("iconDarkBackgroundColor"))! }() - static var legacyArticleExtractor: RSImage! = { - return RSImage(named: "legacyArticleExtractor") - }() - - static var legacyArticleExtractorError: RSImage! = { - return RSImage(named: "legacyArticleExtractorError") - }() - - static var legacyArticleExtractorInactiveDark: RSImage! = { - return RSImage(named: "legacyArticleExtractorInactiveDark") - }() - - static var legacyArticleExtractorInactiveLight: RSImage! = { - return RSImage(named: "legacyArticleExtractorInactiveLight") - }() - - static var legacyArticleExtractorProgress1: RSImage! = { - return RSImage(named: "legacyArticleExtractorProgress1") - }() - - static var legacyArticleExtractorProgress2: RSImage! = { - return RSImage(named: "legacyArticleExtractorProgress2") - }() - - static var legacyArticleExtractorProgress3: RSImage! = { - return RSImage(named: "legacyArticleExtractorProgress3") - }() - - static var legacyArticleExtractorProgress4: RSImage! = { - return RSImage(named: "legacyArticleExtractorProgress4") - }() +// static var legacyArticleExtractor: RSImage! = { +// return RSImage(named: "legacyArticleExtractor") +// }() +// +// static var legacyArticleExtractorError: RSImage! = { +// return RSImage(named: "legacyArticleExtractorError") +// }() +// +// static var legacyArticleExtractorInactiveDark: RSImage! = { +// return RSImage(named: "legacyArticleExtractorInactiveDark") +// }() +// +// static var legacyArticleExtractorInactiveLight: RSImage! = { +// return RSImage(named: "legacyArticleExtractorInactiveLight") +// }() +// +// static var legacyArticleExtractorProgress1: RSImage! = { +// return RSImage(named: "legacyArticleExtractorProgress1") +// }() +// +// static var legacyArticleExtractorProgress2: RSImage! = { +// return RSImage(named: "legacyArticleExtractorProgress2") +// }() +// +// static var legacyArticleExtractorProgress3: RSImage! = { +// return RSImage(named: "legacyArticleExtractorProgress3") +// }() +// +// static var legacyArticleExtractorProgress4: RSImage! = { +// return RSImage(named: "legacyArticleExtractorProgress4") +// }() static var folderImage: IconImage { let image = NSImage(systemSymbolName: "folder", accessibilityDescription: nil)! @@ -142,9 +142,9 @@ struct AppAssets { return IconImage(coloredImage, isSymbol: true, isBackgroundSuppressed: true, preferredColor: preferredColor.cgColor) } - static var markAllAsReadImage: RSImage = { - return RSImage(named: "markAllAsRead")! - }() +// static var markAllAsReadImage: RSImage = { +// return RSImage(named: "markAllAsRead")! +// }() static var nextUnreadImage: RSImage = { return NSImage(systemSymbolName: "chevron.down.circle", accessibilityDescription: nil)! diff --git a/Mac/MainWindow/ArticleExtractorButton.swift b/Mac/MainWindow/ArticleExtractorButton.swift index 28396f48f..842a03351 100644 --- a/Mac/MainWindow/ArticleExtractorButton.swift +++ b/Mac/MainWindow/ArticleExtractorButton.swift @@ -25,16 +25,16 @@ final class ArticleExtractorButton: NSButton { switch buttonState { case .error: stripAnimatedSublayer() - image = AppAssets.articleExtractorError + image = AppImage.articleExtractorError case .animated: image = nil needsLayout = true case .on: stripAnimatedSublayer() - image = AppAssets.articleExtractorOn + image = AppImage.articleExtractorOn case .off: stripAnimatedSublayer() - image = AppAssets.articleExtractorOff + image = AppImage.articleExtractorOff } } } @@ -66,7 +66,7 @@ final class ArticleExtractorButton: NSButton { private func commonInit() { wantsLayer = true bezelStyle = .texturedRounded - image = AppAssets.articleExtractorOff + image = AppImage.articleExtractorOff imageScaling = .scaleProportionallyDown widthAnchor.constraint(equalTo: heightAnchor).isActive = true } @@ -85,12 +85,12 @@ final class ArticleExtractorButton: NSButton { } private func addAnimatedSublayer(to hostedLayer: CALayer) { - let image1 = AppAssets.articleExtractorOff.tinted(with: NSColor.controlTextColor) - let image2 = AppAssets.articleExtractorOn.tinted(with: NSColor.controlTextColor) + let image1 = AppImage.articleExtractorOff.tinted(with: NSColor.controlTextColor) + let image2 = AppImage.articleExtractorOn.tinted(with: NSColor.controlTextColor) let images = [image1, image2, image1] animatedLayer = CALayer() - let imageSize = AppAssets.articleExtractorOff.size + let imageSize = AppImage.articleExtractorOff.size animatedLayer!.bounds = CGRect(x: 0, y: 0, width: imageSize.width, height: imageSize.height) animatedLayer!.position = CGPoint(x: bounds.midX, y: bounds.midY) diff --git a/Mac/MainWindow/LegacyArticleExtractorButton.swift b/Mac/MainWindow/LegacyArticleExtractorButton.swift deleted file mode 100644 index aa2bbdeba..000000000 --- a/Mac/MainWindow/LegacyArticleExtractorButton.swift +++ /dev/null @@ -1,111 +0,0 @@ -// -// ArticleExtractorButton.swift -// NetNewsWire -// -// Created by Maurice Parker on 9/18/19. -// Copyright © 2019 Ranchero Software. All rights reserved. -// - -import Foundation - -final class LegacyArticleExtractorButton: NSButton { - - var isError = false { - didSet { - if isError != oldValue { - needsDisplay = true - } - } - } - - var isInProgress = false { - didSet { - if isInProgress != oldValue { - needsDisplay = true - } - } - } - - override init(frame frameRect: NSRect) { - super.init(frame: frameRect) - wantsLayer = true - } - - required init?(coder: NSCoder) { - super.init(coder: coder) - wantsLayer = true - } - - override func draw(_ dirtyRect: NSRect) { - super.draw(dirtyRect) - - guard let hostedLayer = self.layer else { - return - } - - if let imageLayer = hostedLayer.sublayers?[0] { - if needsToDraw(imageLayer.bounds) { - imageLayer.removeFromSuperlayer() - } else { - return - } - } - - let opacity: Float = isEnabled ? 1.0 : 0.5 - - switch true { - case isError: - addImageSublayer(to: hostedLayer, image: AppAssets.legacyArticleExtractorError, opacity: opacity) - case isInProgress: - addAnimatedSublayer(to: hostedLayer) - default: - if NSApplication.shared.isActive { - addImageSublayer(to: hostedLayer, image: AppAssets.legacyArticleExtractor, opacity: opacity) - } else { - if NSApplication.shared.effectiveAppearance.isDarkMode { - addImageSublayer(to: hostedLayer, image: AppAssets.legacyArticleExtractorInactiveDark, opacity: opacity) - } else { - addImageSublayer(to: hostedLayer, image: AppAssets.legacyArticleExtractorInactiveLight, opacity: opacity) - } - } - } - } - - private func makeLayerForImage(_ image: NSImage) -> CALayer { - let imageLayer = CALayer() - imageLayer.bounds = CGRect(x: 0, y: 0, width: image.size.width, height: image.size.height) - imageLayer.position = CGPoint(x: bounds.midX, y: floor(bounds.midY)) - return imageLayer - } - - private func addImageSublayer(to hostedLayer: CALayer, image: NSImage, opacity: Float = 1.0) { - let imageLayer = makeLayerForImage(image) - imageLayer.contents = image - imageLayer.opacity = opacity - hostedLayer.addSublayer(imageLayer) - } - - private func addAnimatedSublayer(to hostedLayer: CALayer) { - let imageProgress1 = AppAssets.legacyArticleExtractorProgress1 - let imageProgress2 = AppAssets.legacyArticleExtractorProgress2 - let imageProgress3 = AppAssets.legacyArticleExtractorProgress3 - let imageProgress4 = AppAssets.legacyArticleExtractorProgress4 - let images = [imageProgress1, imageProgress2, imageProgress3, imageProgress4, imageProgress3, imageProgress2, imageProgress1] - - let imageLayer = CALayer() - imageLayer.bounds = CGRect(x: 0, y: 0, width: imageProgress1?.size.width ?? 0, height: imageProgress1?.size.height ?? 0) - imageLayer.position = CGPoint(x: bounds.midX, y: floor(bounds.midY)) - - hostedLayer.addSublayer(imageLayer) - - let animation = CAKeyframeAnimation(keyPath: "contents") - animation.calculationMode = CAAnimationCalculationMode.linear - animation.keyTimes = [0, 0.16, 0.32, 0.50, 0.66, 0.82, 1] - animation.duration = 2 - animation.values = images as [Any] - animation.repeatCount = HUGE - - imageLayer.add(animation, forKey: "contents") - } - -} diff --git a/Mac/MainWindow/MainWindowController.swift b/Mac/MainWindow/MainWindowController.swift index 41ed9290f..c7ff2b2f9 100644 --- a/Mac/MainWindow/MainWindowController.swift +++ b/Mac/MainWindow/MainWindowController.swift @@ -766,7 +766,7 @@ 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, AppImage.markAllAsRead, "markAllAsRead:") case .toggleReadArticlesFilter: let title = NSLocalizedString("Read Articles Filter", comment: "Read Articles Filter") @@ -807,7 +807,7 @@ extension MainWindowController: NSToolbarDelegate { return buildToolbarButton(.openInBrowser, title, AppAssets.openInBrowserImage, "openArticleInBrowser:") case .articleThemeMenu: - articleThemeMenuToolbarItem.image = AppAssets.articleTheme + articleThemeMenuToolbarItem.image = AppImage.articleTheme let description = NSLocalizedString("Article Theme", comment: "Article Theme") articleThemeMenuToolbarItem.toolTip = description articleThemeMenuToolbarItem.label = description @@ -822,7 +822,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, AppImage.cleanUp, "cleanUp:") default: break diff --git a/Mac/MainWindow/SharingServicePickerDelegate.swift b/Mac/MainWindow/SharingServicePickerDelegate.swift index 9a1d42e98..1b4cd482a 100644 --- a/Mac/MainWindow/SharingServicePickerDelegate.swift +++ b/Mac/MainWindow/SharingServicePickerDelegate.swift @@ -39,8 +39,7 @@ import RSCore return nil } - let image = sendToCommand.image ?? NSImage() - return NSSharingService(title: sendToCommand.title, image: image, alternateImage: nil) { + return NSSharingService(title: sendToCommand.title, image: sendToCommand.image, alternateImage: nil) { sendToCommand.sendObject(object, selectedText: nil) } } diff --git a/Mac/Preferences/Accounts/AccountsReaderAPIWindowController.swift b/Mac/Preferences/Accounts/AccountsReaderAPIWindowController.swift index 301a457dc..101b6b831 100644 --- a/Mac/Preferences/Accounts/AccountsReaderAPIWindowController.swift +++ b/Mac/Preferences/Accounts/AccountsReaderAPIWindowController.swift @@ -39,23 +39,23 @@ final class AccountsReaderAPIWindowController: NSWindowController { if let accountType = accountType { switch accountType { case .freshRSS: - titleImageView.image = AppAsset.image(accountType: .freshRSS) + titleImageView.image = AppImage.accountImage(.freshRSS) titleLabel.stringValue = NSLocalizedString("Sign in to your FreshRSS account.", comment: "FreshRSS") noAccountTextField.stringValue = NSLocalizedString("Don’t have a FreshRSS instance?", comment: "No FreshRSS") createAccountButton.title = NSLocalizedString("Find out more", comment: "No FreshRSS Button") apiURLTextField.placeholderString = NSLocalizedString("fresh.rss.net/api/greader.php", comment: "FreshRSS API Helper") case .inoreader: - titleImageView.image = AppAsset.image(accountType: .inoreader) + titleImageView.image = AppImage.accountImage(.inoreader) titleLabel.stringValue = NSLocalizedString("Sign in to your InoReader account.", comment: "InoReader") gridView.row(at: 2).isHidden = true noAccountTextField.stringValue = NSLocalizedString("Don’t have an InoReader account?", comment: "No InoReader") case .bazQux: - titleImageView.image = AppAsset.image(accountType: .bazQux) + titleImageView.image = AppImage.accountImage(.bazQux) titleLabel.stringValue = NSLocalizedString("Sign in to your BazQux account.", comment: "BazQux") gridView.row(at: 2).isHidden = true noAccountTextField.stringValue = NSLocalizedString("Don’t have a BazQux account?", comment: "No BazQux") case .theOldReader: - titleImageView.image = AppAsset.image(accountType: .theOldReader) + titleImageView.image = AppImage.accountImage(.theOldReader) titleLabel.stringValue = NSLocalizedString("Sign in to your The Old Reader account.", comment: "The Old Reader") gridView.row(at: 2).isHidden = true noAccountTextField.stringValue = NSLocalizedString("Don’t have a The Old Reader account?", comment: "No OldReader") diff --git a/Mac/Resources/Assets.xcassets/legacyArticleExtractor.imageset/ArticleExtractor.png b/Mac/Resources/Assets.xcassets/legacyArticleExtractor.imageset/ArticleExtractor.png deleted file mode 100644 index 9af1d10d464d52fc82e97f1bc9278241dbf9ea33..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|Tv8)E(|mmy zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uuz(rC1}QWNE&K$eEIeHtLo5W7 z6BY;<9LxXpalVl842_F67GECmG`H5t^eCtcaV>r*!*;~&VgWaE(qlOhJAgb6Mw<&;$Tp<0{Dj diff --git a/Mac/Resources/Assets.xcassets/legacyArticleExtractor.imageset/ArticleExtractor@2x.png b/Mac/Resources/Assets.xcassets/legacyArticleExtractor.imageset/ArticleExtractor@2x.png deleted file mode 100644 index fa4f44b82c4ccc8ef8356580ea1d06b07c9c6be7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 253 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 WUn|U9zce1?CI(MeKbLh*2~7ZR!!7&( diff --git a/Mac/Resources/Assets.xcassets/legacyArticleExtractorInactiveDark.imageset/ArticleExtractorInactiveDark@2x.png b/Mac/Resources/Assets.xcassets/legacyArticleExtractorInactiveDark.imageset/ArticleExtractorInactiveDark@2x.png deleted file mode 100644 index 2ae7def3fac08fed9f65ee430c53e72855936ec9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}E~ycoX}-P; zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz07Sip>6gA}f5OZp6?(mh=qLn1hn z6C_?XY}~Nn!+!@hrppdde4DDTFfz+BFaE|~!!aR-@5}e^#!A++FBPSjNb^;2D7Zh@ zs7`5PIQf)eYjfs-;)5%gSI911{ET<6z=24r*!*;~&VgWaE(qlOhJA6gA}f5OZp6?(mh=qLn1hn z6C_?Xe0+4Y`#-ypzznuaMHB8W=973KA+fdofpf!?B8T|+`GPlZPMM~>_-4TYX9i0v z_nXSbEFOC7D`b6`=W)BqI=t18HO+s~%5biz;nr6>os0`-WzV)T%Q0Bpm&YsPY&8E8t_EA6gA}f5OZp6?@;qG}Ln1hn z6C_?X1S+Nd{NKpKvaE57Ov?8a%xqR{Zg1s(2qg5}|I)mqC}E*IyYi;Zo>%+Vh#!$V z+r})%^divclzgS4Ly@J!TLq~PF$S*~vfN*;sC3q6DVWB5W!?8g$L73u8D=sc1R7k= ao>FVdQ&MBb@0JG{cH2?qr diff --git a/Mac/Resources/Assets.xcassets/legacyArticleExtractorProgress2.imageset/ArticleExtractorProgress2@2x.png b/Mac/Resources/Assets.xcassets/legacyArticleExtractorProgress2.imageset/ArticleExtractorProgress2@2x.png deleted file mode 100644 index f7883efeca1b4e29649ec4942de576d3ec2eddd1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}E~ycoX}-P; zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz07Sip>6gA}f5OZp6?3OrpLLn1hn z6C_?X7}j0x|IaMR;lrG1dE#9lJ5LEu&n^28iU%|VH_us8^x)_u54V)`$*bfe^*d~5 z@v_^nTv(hk#r~61!WLVD2R922$QpbK`n#h4qBBFf<%SFW%uDYr5Btw}_YUKE*2R1d d{=&-r{0v_>MBMkyoUsYy22WQ%mvv4FO#s8KNU{I` diff --git a/Mac/Resources/Assets.xcassets/legacyArticleExtractorProgress2.imageset/Contents.json b/Mac/Resources/Assets.xcassets/legacyArticleExtractorProgress2.imageset/Contents.json deleted file mode 100644 index 21de8a7fd..000000000 --- a/Mac/Resources/Assets.xcassets/legacyArticleExtractorProgress2.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "filename" : "ArticleExtractorProgress2.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "ArticleExtractorProgress2@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Mac/Resources/Assets.xcassets/legacyArticleExtractorProgress3.imageset/ArticleExtractorProgress3.png b/Mac/Resources/Assets.xcassets/legacyArticleExtractorProgress3.imageset/ArticleExtractorProgress3.png deleted file mode 100644 index ee2ef5db6c11acc8abaf9d23a9c43ca150f128e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|Tv8)E(|mmy zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uuz(rC1}QWNE&K$etUX;ELo5W7 z6BY;<9LxXpalVl842_F67GECmG`H5t^eCtcaV>r*z$RpP+Wj(PP@ICH ZW@PyKMZ|orHlH}iI8RqUmvv4FO#mY>E@}V( diff --git a/Mac/Resources/Assets.xcassets/legacyArticleExtractorProgress3.imageset/ArticleExtractorProgress3@2x.png b/Mac/Resources/Assets.xcassets/legacyArticleExtractorProgress3.imageset/ArticleExtractorProgress3@2x.png deleted file mode 100644 index 0a809afc7380922237f42322d9c7d09dbf2d2ac9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 254 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}E~ycoX}-P; zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz07Sip>6gA}f5OZp6?GCW-zLn1hn z6C_?X7}j0x|IaMR;lrG1dE#9lJ5LEu&n^28iVj7V8!q%W3*NjrWt#Hhn*|4)87!^b zZz>zJNT?=F>)*!CX7bMcbR#40zrfRuiVd4>9o|;Si`{wgjITmZqLe`=%T14$VaXK{ Ucm4zH)*!n*UHx3vIVCg!0Lr*!*;~&VgUzp=ZvQx_Iyb4RIzwB i@n}IStIyj5?Tie0eWI$yp4&mrWAJqKb6Mw<&;$S&5;Ri) diff --git a/Mac/Resources/Assets.xcassets/legacyArticleExtractorProgress4.imageset/ArticleExtractorProgress4@2x.png b/Mac/Resources/Assets.xcassets/legacyArticleExtractorProgress4.imageset/ArticleExtractorProgress4@2x.png deleted file mode 100644 index 2c9bad220a9204bd4938413ab45eac734b4e64fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}E~ycoX}-P; zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz07Sip>6gA}f5OZp6?3O!vMLn1hn z6C_?X7}j0x|IaMR;lrG1dE#9lJ5LEu&n^28iVj7V8!q%W3*NjrWt#Hhn*|4)87!^b zZz>zJc<8aOko94n$L%KT@K!_CH2*~_!(x{+MQi>xiF+#rzN(FRM*G{mehASE} ab*~t2@`#$gisUy2Il|M`&t;ucLK6USQ%52I diff --git a/Mac/Resources/Assets.xcassets/legacyArticleExtractorProgress4.imageset/Contents.json b/Mac/Resources/Assets.xcassets/legacyArticleExtractorProgress4.imageset/Contents.json deleted file mode 100644 index 7f2137461..000000000 --- a/Mac/Resources/Assets.xcassets/legacyArticleExtractorProgress4.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "filename" : "ArticleExtractorProgress4.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "ArticleExtractorProgress4@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Modules/RSCore/Sources/RSCore/SendToCommand.swift b/Modules/RSCore/Sources/RSCore/SendToCommand.swift index 1fec25632..c70d3dd2f 100644 --- a/Modules/RSCore/Sources/RSCore/SendToCommand.swift +++ b/Modules/RSCore/Sources/RSCore/SendToCommand.swift @@ -29,7 +29,7 @@ public protocol SendToCommand { /// The image for the command. /// /// Often the icon of the target application. - var image: RSImage? { get } + var image: RSImage { get } /// Determine whether an object can be sent to the target application. /// diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj index 7a2f39453..e1e092c08 100644 --- a/NetNewsWire.xcodeproj/project.pbxproj +++ b/NetNewsWire.xcodeproj/project.pbxproj @@ -421,7 +421,7 @@ 84C1ECED2CDFE49100C7456A /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = { isa = PBXFileSystemSynchronizedBuildFileExceptionSet; membershipExceptions = ( - AppAsset.swift, + AppImage.swift, Defaults/AppDefaults.swift, Defaults/ArticleTextSize.swift, Defaults/FontSize.swift, diff --git a/Shared/AppAsset.swift b/Shared/AppAsset.swift deleted file mode 100644 index 86f71e3d0..000000000 --- a/Shared/AppAsset.swift +++ /dev/null @@ -1,80 +0,0 @@ -// -// AppAsset.swift -// NetNewsWire -// -// Created by Brent Simmons on 1/26/25. -// Copyright © 2025 Ranchero Software. All rights reserved. -// - -#if os(macOS) -import AppKit -#elseif os(iOS) -import UIKit -#endif -import RSCore -import Account - -struct AppAsset { - - // MARK: - Account images - - static func image(accountType: AccountType) -> RSImage? { - switch accountType { - case .onMyMac: - AppAsset.accountLocalImage - case .cloudKit: - AppAsset.accountCloudKitImage - case .feedbin: - AppAsset.accountFeedbinImage - case .feedly: - AppAsset.accountFeedlyImage - case .freshRSS: - AppAsset.accountFreshRSSImage - case .newsBlur: - AppAsset.accountNewsBlurImage - case .inoreader: - AppAsset.accountInoreaderImage - case .bazQux: - AppAsset.accountBazQuxImage - case .theOldReader: - AppAsset.accountTheOldReaderImage - } - } - - // MARK: - Misc. - - static let nnwFeedIcon = RSImage(named: "nnwFeedIcon")! - - -} - -private extension AppAsset { - - static var accountBazQuxImage = RSImage(named: "accountBazQux")! - static var accountCloudKitImage = RSImage(named: "accountCloudKit")! - static var accountFeedbinImage = RSImage(named: "accountFeedbin")! - static var accountFeedlyImage = RSImage(named: "accountFeedly")! - static var accountFreshRSSImage = RSImage(named: "accountFreshRSS")! - static var accountInoreaderImage = RSImage(named: "accountInoreader")! - static var accountNewsBlurImage = RSImage(named: "accountNewsBlur")! - static var accountTheOldReaderImage = RSImage(named: "accountTheOldReader")! - -#if os(macOS) - static var accountLocalMacImage = RSImage(named: "accountLocal")! -#elseif os(iOS) - static var accountLocalPadImage = UIImage(named: "accountLocalPad")! - static var accountLocalPhoneImage = UIImage(named: "accountLocalPhone")! -#endif - - static var accountLocalImage: RSImage = { -#if os(macOS) - accountLocalMacImage -#elseif os(iOS) - if UIDevice.current.userInterfaceIdiom == .pad { - return accountLocalPadImage - } else { - return accountLocalPhoneImage - } -#endif - }() -} diff --git a/Shared/AppImage.swift b/Shared/AppImage.swift new file mode 100644 index 000000000..91f4870c3 --- /dev/null +++ b/Shared/AppImage.swift @@ -0,0 +1,103 @@ +// +// AppImage.swift +// NetNewsWire +// +// Created by Brent Simmons on 1/26/25. +// Copyright © 2025 Ranchero Software. All rights reserved. +// + +#if os(macOS) +import AppKit +#elseif os(iOS) +import UIKit +#endif +import RSCore +import Account + +struct AppImage { + + // MARK: - Account + + static func accountImage(_ accountType: AccountType) -> RSImage? { + switch accountType { + case .onMyMac: + AppImage.accountLocal + case .cloudKit: + AppImage.accountCloudKit + case .feedbin: + AppImage.accountFeedbin + case .feedly: + AppImage.accountFeedly + case .freshRSS: + AppImage.accountFreshRSS + case .newsBlur: + AppImage.accountNewsBlur + case .inoreader: + AppImage.accountInoreader + case .bazQux: + AppImage.accountBazQux + case .theOldReader: + AppImage.accountTheOldReader + } + } + + // MARK: - Article Extractor + + static var articleExtractorError = RSImage(named: "articleExtractorError")! + static var articleExtractorOff = RSImage(named: "articleExtractorOff")! + static var articleExtractorOn = RSImage(named: "articleExtractorOn")! + +#if os(iOS) + static var articleExtractorOffSF = UIImage(systemName: "doc.plaintext")! + static var articleExtractorOnSF = UIImage(named: "articleExtractorOnSF")! + static var articleExtractorOffTinted = articleExtractorOff.tinted(color: AppAssets.primaryAccentColor)! + static var articleExtractorOnTinted = articleExtractorOn.tinted(color: AppAssets.primaryAccentColor)! +#endif + + // MARK: - Actions + + static var markAllAsRead = RSImage(named: "markAllAsRead")! + + // MARK: - Misc. + + static let nnwFeedIcon = RSImage(named: "nnwFeedIcon")! + +#if os(macOS) + // MARK: - Mac-only images + + static var articleTheme = NSImage(systemSymbolName: "doc.richtext", accessibilityDescription: nil)! + static var cleanUp = NSImage(systemSymbolName: "wind", accessibilityDescription: nil)! + static var marsEditIcon = RSImage(named: "MarsEditIcon")! + static var microblogIcon = RSImage(named: "MicroblogIcon")! + +#endif + +#if os(iOS) + // MARK: - iOS-only images + + +#endif +} + + +// MARK: - Private + +private extension AppImage { + + static var accountBazQux = RSImage(named: "accountBazQux")! + static var accountCloudKit = RSImage(named: "accountCloudKit")! + static var accountFeedbin = RSImage(named: "accountFeedbin")! + static var accountFeedly = RSImage(named: "accountFeedly")! + static var accountFreshRSS = RSImage(named: "accountFreshRSS")! + static var accountInoreader = RSImage(named: "accountInoreader")! + static var accountNewsBlur = RSImage(named: "accountNewsBlur")! + static var accountTheOldReader = RSImage(named: "accountTheOldReader")! + +#if os(macOS) + static var accountLocal = RSImage(named: "accountLocal")! +#elseif os(iOS) + static var accountLocalPad = UIImage(named: "accountLocalPad")! + static var accountLocalPhone = UIImage(named: "accountLocalPhone")! + static var accountLocal = UIDevice.current.userInterfaceIdiom == .pad ? accountLocalPad : accountLocalPhone +#endif +} diff --git a/Shared/ExtensionPoints/SendToMarsEditCommand.swift b/Shared/ExtensionPoints/SendToMarsEditCommand.swift index d2d79fc74..295a41903 100644 --- a/Shared/ExtensionPoints/SendToMarsEditCommand.swift +++ b/Shared/ExtensionPoints/SendToMarsEditCommand.swift @@ -13,7 +13,7 @@ import Articles final class SendToMarsEditCommand: SendToCommand { let title = "MarsEdit" - let image: RSImage? = AppAssets.marsEditIcon + let image = AppImage.marsEditIcon private let marsEditApps = [UserApp(bundleID: "com.red-sweater.marsedit5"), UserApp(bundleID: "com.red-sweater.marsedit4"), UserApp(bundleID: "com.red-sweater.marsedit")] diff --git a/Shared/ExtensionPoints/SendToMicroBlogCommand.swift b/Shared/ExtensionPoints/SendToMicroBlogCommand.swift index 0b613b01a..6ada42731 100644 --- a/Shared/ExtensionPoints/SendToMicroBlogCommand.swift +++ b/Shared/ExtensionPoints/SendToMicroBlogCommand.swift @@ -15,7 +15,7 @@ import RSCore final class SendToMicroBlogCommand: SendToCommand { let title = "Micro.blog" - let image: RSImage? = AppAssets.microblogIcon + let image = AppImage.microblogIcon private let microBlogApp = UserApp(bundleID: "blog.micro.mac") diff --git a/Shared/Extensions/RSImage-AppIcons.swift b/Shared/Extensions/RSImage-AppIcons.swift index 860153731..6a6eae73c 100644 --- a/Shared/Extensions/RSImage-AppIcons.swift +++ b/Shared/Extensions/RSImage-AppIcons.swift @@ -34,5 +34,5 @@ extension IconImage { return nil }() - static let nnwFeedIcon = IconImage(AppAsset.nnwFeedIcon) + static let nnwFeedIcon = IconImage(AppImage.nnwFeedIcon) } diff --git a/Shared/Extensions/SmallIconProvider.swift b/Shared/Extensions/SmallIconProvider.swift index f08133ef5..42a07d3f7 100644 --- a/Shared/Extensions/SmallIconProvider.swift +++ b/Shared/Extensions/SmallIconProvider.swift @@ -18,7 +18,7 @@ protocol SmallIconProvider { extension Account: SmallIconProvider { var smallIcon: IconImage? { - if let image = AppAsset.image(accountType: type) { + if let image = AppImage.accountImage(type) { return IconImage(image) } return nil diff --git a/iOS/Account/CloudKitAccountViewController.swift b/iOS/Account/CloudKitAccountViewController.swift index cc60f5383..08b1aedf1 100644 --- a/iOS/Account/CloudKitAccountViewController.swift +++ b/iOS/Account/CloudKitAccountViewController.swift @@ -57,7 +57,7 @@ final class CloudKitAccountViewController: UITableViewController { override func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? { if section == 0 { let headerView = tableView.dequeueReusableHeaderFooterView(withIdentifier: "SectionHeader") as! ImageHeaderView - headerView.imageView.image = AppAsset.image(accountType: .cloudKit) + headerView.imageView.image = AppImage.accountImage(.cloudKit) return headerView } else { return super.tableView(tableView, viewForHeaderInSection: section) diff --git a/iOS/Account/FeedbinAccountViewController.swift b/iOS/Account/FeedbinAccountViewController.swift index 56a3d3719..7ddb9050c 100644 --- a/iOS/Account/FeedbinAccountViewController.swift +++ b/iOS/Account/FeedbinAccountViewController.swift @@ -59,7 +59,7 @@ final class FeedbinAccountViewController: UITableViewController { override func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? { if section == 0 { let headerView = tableView.dequeueReusableHeaderFooterView(withIdentifier: "SectionHeader") as! ImageHeaderView - headerView.imageView.image = AppAsset.image(accountType: .feedbin) + headerView.imageView.image = AppImage.accountImage(.feedbin) return headerView } else { return super.tableView(tableView, viewForHeaderInSection: section) diff --git a/iOS/Account/LocalAccountViewController.swift b/iOS/Account/LocalAccountViewController.swift index f7c188003..29fd1e74e 100644 --- a/iOS/Account/LocalAccountViewController.swift +++ b/iOS/Account/LocalAccountViewController.swift @@ -46,7 +46,7 @@ final class LocalAccountViewController: UITableViewController { override func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? { if section == 0 { let headerView = tableView.dequeueReusableHeaderFooterView(withIdentifier: "SectionHeader") as! ImageHeaderView - headerView.imageView.image = AppAsset.image(accountType: .onMyMac) + headerView.imageView.image = AppImage.accountImage(.onMyMac) return headerView } else { return super.tableView(tableView, viewForHeaderInSection: section) diff --git a/iOS/Account/NewsBlurAccountViewController.swift b/iOS/Account/NewsBlurAccountViewController.swift index c54074db6..f3972f776 100644 --- a/iOS/Account/NewsBlurAccountViewController.swift +++ b/iOS/Account/NewsBlurAccountViewController.swift @@ -58,7 +58,7 @@ final class NewsBlurAccountViewController: UITableViewController { override func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? { if section == 0 { let headerView = tableView.dequeueReusableHeaderFooterView(withIdentifier: "SectionHeader") as! ImageHeaderView - headerView.imageView.image = AppAsset.image(accountType: .newsBlur) + headerView.imageView.image = AppImage.accountImage(.newsBlur) return headerView } else { return super.tableView(tableView, viewForHeaderInSection: section) diff --git a/iOS/Account/ReaderAPIAccountViewController.swift b/iOS/Account/ReaderAPIAccountViewController.swift index 3e111f419..4329f1ed9 100644 --- a/iOS/Account/ReaderAPIAccountViewController.swift +++ b/iOS/Account/ReaderAPIAccountViewController.swift @@ -210,13 +210,13 @@ final class ReaderAPIAccountViewController: UITableViewController { if let accountType = accountType { switch accountType { case .bazQux: - return AppAsset.image(accountType: .bazQux) + return AppImage.accountImage(.bazQux) case .inoreader: - return AppAsset.image(accountType: .inoreader) + return AppImage.accountImage(.inoreader) case .theOldReader: - return AppAsset.image(accountType: .theOldReader) + return AppImage.accountImage(.theOldReader) case .freshRSS: - return AppAsset.image(accountType: .freshRSS) + return AppImage.accountImage(.freshRSS) default: return nil } diff --git a/iOS/AppAssets.swift b/iOS/AppAssets.swift index c9e6ddcbd..401dd2195 100644 --- a/iOS/AppAssets.swift +++ b/iOS/AppAssets.swift @@ -53,35 +53,35 @@ struct AppAssets { // static let nnwFeedIcon = RSImage(named: "nnwFeedIcon")! - static var articleExtractorError: UIImage = { - return UIImage(named: "articleExtractorError")! - }() - - static var articleExtractorOff: UIImage = { - return UIImage(named: "articleExtractorOff")! - }() - - static var articleExtractorOffSF: UIImage = { - return UIImage(systemName: "doc.plaintext")! - }() - - static var articleExtractorOffTinted: UIImage = { - let image = UIImage(named: "articleExtractorOff")! - return image.tinted(color: AppAssets.primaryAccentColor)! - }() - - static var articleExtractorOn: UIImage = { - return UIImage(named: "articleExtractorOn")! - }() - - static var articleExtractorOnSF: UIImage = { - return UIImage(named: "articleExtractorOnSF")! - }() - - static var articleExtractorOnTinted: UIImage = { - let image = UIImage(named: "articleExtractorOn")! - return image.tinted(color: AppAssets.primaryAccentColor)! - }() +// static var articleExtractorError: UIImage = { +// return UIImage(named: "articleExtractorError")! +// }() +// +// static var articleExtractorOff: UIImage = { +// return UIImage(named: "articleExtractorOff")! +// }() +// +// static var articleExtractorOffSF: UIImage = { +// return UIImage(systemName: "doc.plaintext")! +// }() +// +// static var articleExtractorOffTinted: UIImage = { +// let image = UIImage(named: "articleExtractorOff")! +// return image.tinted(color: AppAssets.primaryAccentColor)! +// }() +// +// static var articleExtractorOn: UIImage = { +// return UIImage(named: "articleExtractorOn")! +// }() +// +// static var articleExtractorOnSF: UIImage = { +// return UIImage(named: "articleExtractorOnSF")! +// }() +// +// static var articleExtractorOnTinted: UIImage = { +// let image = UIImage(named: "articleExtractorOn")! +// return image.tinted(color: AppAssets.primaryAccentColor)! +// }() static var iconBackgroundColor: UIColor = { return UIColor(named: "iconBackgroundColor")! @@ -135,9 +135,9 @@ struct AppAssets { UIImage(systemName: "info.circle")! }() - static var markAllAsReadImage: UIImage = { - return UIImage(named: "markAllAsRead")! - }() +// static var markAllAsReadImage: UIImage = { +// return UIImage(named: "markAllAsRead")! +// }() static var markBelowAsReadImage: UIImage = { return UIImage(systemName: "arrowtriangle.down.circle")! diff --git a/iOS/Article/ArticleExtractorButton.swift b/iOS/Article/ArticleExtractorButton.swift index 830eda31c..a3ae7d35f 100644 --- a/iOS/Article/ArticleExtractorButton.swift +++ b/iOS/Article/ArticleExtractorButton.swift @@ -25,16 +25,16 @@ final class ArticleExtractorButton: UIButton { switch buttonState { case .error: stripAnimatedSublayer() - setImage(AppAssets.articleExtractorError, for: .normal) + setImage(AppImage.articleExtractorError, for: .normal) case .animated: setImage(nil, for: .normal) setNeedsLayout() case .on: stripAnimatedSublayer() - setImage(AppAssets.articleExtractorOn, for: .normal) + setImage(AppImage.articleExtractorOn, for: .normal) case .off: stripAnimatedSublayer() - setImage(AppAssets.articleExtractorOff, for: .normal) + setImage(AppImage.articleExtractorOff, for: .normal) } } } @@ -72,12 +72,12 @@ final class ArticleExtractorButton: UIButton { } private func addAnimatedSublayer(to hostedLayer: CALayer) { - let image1 = AppAssets.articleExtractorOffTinted.cgImage! - let image2 = AppAssets.articleExtractorOnTinted.cgImage! + let image1 = AppImage.articleExtractorOffTinted.cgImage! + let image2 = AppImage.articleExtractorOnTinted.cgImage! let images = [image1, image2, image1] animatedLayer = CALayer() - let imageSize = AppAssets.articleExtractorOff.size + let imageSize = AppImage.articleExtractorOff.size animatedLayer!.bounds = CGRect(x: 0, y: 0, width: imageSize.width, height: imageSize.height) animatedLayer!.position = CGPoint(x: bounds.midX, y: bounds.midY) diff --git a/iOS/Article/ArticleViewController.swift b/iOS/Article/ArticleViewController.swift index 9e90f1157..0ab8a8486 100644 --- a/iOS/Article/ArticleViewController.swift +++ b/iOS/Article/ArticleViewController.swift @@ -41,7 +41,7 @@ final class ArticleViewController: UIViewController { private var articleExtractorButton: ArticleExtractorButton = { let button = ArticleExtractorButton(type: .system) button.frame = CGRect(x: 0, y: 0, width: 44.0, height: 44.0) - button.setImage(AppAssets.articleExtractorOff, for: .normal) + button.setImage(AppImage.articleExtractorOff, for: .normal) return button }() diff --git a/iOS/Article/WebViewController.swift b/iOS/Article/WebViewController.swift index 8b1ddba0d..f51d13416 100644 --- a/iOS/Article/WebViewController.swift +++ b/iOS/Article/WebViewController.swift @@ -768,7 +768,7 @@ private extension WebViewController { func toggleArticleExtractorAction() -> UIAction { let extracted = articleExtractorButtonState == .on let title = extracted ? NSLocalizedString("Show Feed Article", comment: "Show Feed Article") : NSLocalizedString("Show Reader View", comment: "Show Reader View") - let extractorImage = extracted ? AppAssets.articleExtractorOffSF : AppAssets.articleExtractorOnSF + let extractorImage = extracted ? AppImage.articleExtractorOffSF : AppImage.articleExtractorOnSF return UIAction(title: title, image: extractorImage) { [weak self] _ in self?.toggleArticleExtractor() } diff --git a/iOS/Inspector/AccountInspectorViewController.swift b/iOS/Inspector/AccountInspectorViewController.swift index 08ce1c3da..88f5f9a9d 100644 --- a/iOS/Inspector/AccountInspectorViewController.swift +++ b/iOS/Inspector/AccountInspectorViewController.swift @@ -169,7 +169,7 @@ extension AccountInspectorViewController { if section == 0 { let headerView = tableView.dequeueReusableHeaderFooterView(withIdentifier: "SectionHeader") as! ImageHeaderView - headerView.imageView.image = AppAsset.image(accountType: account.type) + headerView.imageView.image = AppImage.accountImage(account.type) return headerView } else { return super.tableView(tableView, viewForHeaderInSection: section) diff --git a/iOS/MainFeed/MainFeedViewController.swift b/iOS/MainFeed/MainFeedViewController.swift index c55b23968..b8f080d3a 100644 --- a/iOS/MainFeed/MainFeedViewController.swift +++ b/iOS/MainFeed/MainFeedViewController.swift @@ -1145,7 +1145,7 @@ private extension MainFeedViewController { let localizedMenuText = NSLocalizedString("Mark All as Read in “%@”", comment: "Command") let title = NSString.localizedStringWithFormat(localizedMenuText as NSString, feed.nameForDisplay) as String - let action = UIAction(title: title, image: AppAssets.markAllAsReadImage) { [weak self] _ in + let action = UIAction(title: title, image: AppImage.markAllAsRead) { [weak self] _ in MarkAsReadAlertController.confirm(self, coordinator: self?.coordinator, confirmTitle: title, sourceType: contentView) { [weak self] in if let articles = try? feed.fetchUnreadArticles() { self?.coordinator.markAllAsRead(Array(articles)) @@ -1163,7 +1163,7 @@ private extension MainFeedViewController { let localizedMenuText = NSLocalizedString("Mark All as Read in “%@”", comment: "Command") let title = NSString.localizedStringWithFormat(localizedMenuText as NSString, account.nameForDisplay) as String - let action = UIAction(title: title, image: AppAssets.markAllAsReadImage) { [weak self] _ in + let action = UIAction(title: title, image: AppImage.markAllAsRead) { [weak self] _ in MarkAsReadAlertController.confirm(self, coordinator: self?.coordinator, confirmTitle: title, sourceType: contentView) { [weak self] in // If you don't have this delay the screen flashes when it executes this code DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) { diff --git a/iOS/MainTimeline/TimelineViewController.swift b/iOS/MainTimeline/TimelineViewController.swift index dca1b4442..625395bd8 100644 --- a/iOS/MainTimeline/TimelineViewController.swift +++ b/iOS/MainTimeline/TimelineViewController.swift @@ -919,7 +919,7 @@ private extension TimelineViewController { let localizedMenuText = NSLocalizedString("Mark All as Read in “%@”", comment: "Command") let title = NSString.localizedStringWithFormat(localizedMenuText as NSString, feed.nameForDisplay) as String - let action = UIAction(title: title, image: AppAssets.markAllAsReadImage) { [weak self] _ in + let action = UIAction(title: title, image: AppImage.markAllAsRead) { [weak self] _ in MarkAsReadAlertController.confirm(self, coordinator: self?.coordinator, confirmTitle: title, sourceType: contentView) { [weak self] in self?.coordinator.markAllAsRead(articles) } diff --git a/iOS/Settings/AddAccountViewController.swift b/iOS/Settings/AddAccountViewController.swift index 33a98b9e4..8b080d201 100644 --- a/iOS/Settings/AddAccountViewController.swift +++ b/iOS/Settings/AddAccountViewController.swift @@ -127,17 +127,17 @@ final class AddAccountViewController: UITableViewController, AddAccountDismissDe switch indexPath.section { case AddAccountSections.local.rawValue: cell.comboNameLabel?.text = AddAccountSections.local.sectionContent[indexPath.row].localizedAccountName() - cell.comboImage?.image = AppAsset.image(accountType: .onMyMac) + cell.comboImage?.image = AppImage.accountImage(.onMyMac) case AddAccountSections.icloud.rawValue: cell.comboNameLabel?.text = AddAccountSections.icloud.sectionContent[indexPath.row].localizedAccountName() - cell.comboImage?.image = AppAsset.image(accountType: AddAccountSections.icloud.sectionContent[indexPath.row]) + cell.comboImage?.image = AppImage.accountImage(AddAccountSections.icloud.sectionContent[indexPath.row]) if AppDefaults.isDeveloperBuild || AccountManager.shared.accounts.contains(where: { $0.type == .cloudKit }) { cell.isUserInteractionEnabled = false cell.comboNameLabel?.isEnabled = false } case AddAccountSections.web.rawValue: cell.comboNameLabel?.text = AddAccountSections.web.sectionContent[indexPath.row].localizedAccountName() - cell.comboImage?.image = AppAsset.image(accountType: AddAccountSections.web.sectionContent[indexPath.row]) + cell.comboImage?.image = AppImage.accountImage(AddAccountSections.web.sectionContent[indexPath.row]) let type = AddAccountSections.web.sectionContent[indexPath.row] if (type == .feedly || type == .inoreader) && AppDefaults.isDeveloperBuild { cell.isUserInteractionEnabled = false @@ -145,7 +145,7 @@ final class AddAccountViewController: UITableViewController, AddAccountDismissDe } case AddAccountSections.selfhosted.rawValue: cell.comboNameLabel?.text = AddAccountSections.selfhosted.sectionContent[indexPath.row].localizedAccountName() - cell.comboImage?.image = AppAsset.image(accountType: AddAccountSections.selfhosted.sectionContent[indexPath.row]) + cell.comboImage?.image = AppImage.accountImage(AddAccountSections.selfhosted.sectionContent[indexPath.row]) default: return cell diff --git a/iOS/Settings/SettingsViewController.swift b/iOS/Settings/SettingsViewController.swift index 36bc3ec84..423edbe8b 100644 --- a/iOS/Settings/SettingsViewController.swift +++ b/iOS/Settings/SettingsViewController.swift @@ -121,7 +121,7 @@ final class SettingsViewController: UITableViewController { let acctCell = tableView.dequeueReusableCell(withIdentifier: "SettingsComboTableViewCell", for: indexPath) as! SettingsComboTableViewCell acctCell.applyThemeProperties() let account = sortedAccounts[indexPath.row] - acctCell.comboImage?.image = AppAsset.image(accountType: account.type) + acctCell.comboImage?.image = AppImage.accountImage(account.type) acctCell.comboNameLabel?.text = account.nameForDisplay cell = acctCell } diff --git a/iOS/ShareExtension/ShareFolderPickerController.swift b/iOS/ShareExtension/ShareFolderPickerController.swift index 3b628d82e..b7faa4de6 100644 --- a/iOS/ShareExtension/ShareFolderPickerController.swift +++ b/iOS/ShareExtension/ShareFolderPickerController.swift @@ -46,7 +46,7 @@ final class ShareFolderPickerController: UITableViewController { }() if let account = container as? ExtensionAccount { - cell.icon.image = AppAsset.image(accountType: account.type) + cell.icon.image = AppImage.accountImage(account.type) } else { cell.icon.image = AppAssets.folderImage.image }