From d61a895bc49c864a551de86685a949b896cbf13d Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Sun, 24 Sep 2023 10:42:07 -0700 Subject: [PATCH] Rename masterFolderImage to folderImage. --- Mac/AppAssets.swift | 2 +- Shared/Extensions/SmallIconProvider.swift | 2 +- iOS/AppAssets.swift | 4 ++-- iOS/ShareExtension/ShareFolderPickerController.swift | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Mac/AppAssets.swift b/Mac/AppAssets.swift index a8647baf5..5ae72d260 100644 --- a/Mac/AppAssets.swift +++ b/Mac/AppAssets.swift @@ -132,7 +132,7 @@ struct AppAssets { return RSImage(named: "legacyArticleExtractorProgress4") }() - static var masterFolderImage: IconImage { + static var folderImage: IconImage { let image = NSImage(systemSymbolName: "folder", accessibilityDescription: nil)! let preferredColor = NSColor(named: "AccentColor")! return IconImage(image, isSymbol: true, isBackgroundSupressed: true, preferredColor: preferredColor.cgColor) diff --git a/Shared/Extensions/SmallIconProvider.swift b/Shared/Extensions/SmallIconProvider.swift index 52f36b342..ca71ba44d 100644 --- a/Shared/Extensions/SmallIconProvider.swift +++ b/Shared/Extensions/SmallIconProvider.swift @@ -37,6 +37,6 @@ extension Feed: SmallIconProvider { extension Folder: SmallIconProvider { var smallIcon: IconImage? { - AppAssets.masterFolderImage + AppAssets.folderImage } } diff --git a/iOS/AppAssets.swift b/iOS/AppAssets.swift index 34bbfda93..2a5f81634 100644 --- a/iOS/AppAssets.swift +++ b/iOS/AppAssets.swift @@ -157,11 +157,11 @@ struct AppAssets { return UIImage(systemName: "arrow.down.circle")! }() - static var masterFolderImage: IconImage = { + static var folderImage: IconImage = { return IconImage(UIImage(systemName: "folder.fill")!, isSymbol: true, isBackgroundSupressed: true, preferredColor: AppAssets.secondaryAccentColor.cgColor) }() - static var masterFolderImageNonIcon: UIImage = { + static var folderImageNonIcon: UIImage = { return UIImage(systemName: "folder.fill")!.withRenderingMode(.alwaysOriginal).withTintColor(.secondaryLabel) }() diff --git a/iOS/ShareExtension/ShareFolderPickerController.swift b/iOS/ShareExtension/ShareFolderPickerController.swift index 3d957974b..7c1319060 100644 --- a/iOS/ShareExtension/ShareFolderPickerController.swift +++ b/iOS/ShareExtension/ShareFolderPickerController.swift @@ -48,7 +48,7 @@ class ShareFolderPickerController: UITableViewController { if let account = container as? ExtensionAccount { cell.icon.image = AppAssets.image(for: account.type) } else { - cell.icon.image = AppAssets.masterFolderImage.image + cell.icon.image = AppAssets.folderImage.image } cell.label?.text = container?.name ?? ""