diff --git a/Mac/MainWindow/IconView.swift b/Mac/MainWindow/IconView.swift index 743cf88de..ad025a598 100644 --- a/Mac/MainWindow/IconView.swift +++ b/Mac/MainWindow/IconView.swift @@ -54,8 +54,8 @@ final class IconView: NSView { return imageView.frame.size.height < bounds.size.height } - private static var lightBackgroundColor = AppAssets.iconLightBackgroundColor - private static var darkBackgroundColor = AppAssets.iconDarkBackgroundColor + private static var lightBackgroundColor = AppAsset.Mac.iconLightBackgroundColor + private static var darkBackgroundColor = AppAsset.Mac.iconDarkBackgroundColor override init(frame frameRect: NSRect) { super.init(frame: frameRect) diff --git a/iOS/AppDelegate.swift b/iOS/AppDelegate.swift index 943f21e1e..7a6dc68a7 100644 --- a/iOS/AppDelegate.swift +++ b/iOS/AppDelegate.swift @@ -70,7 +70,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD os_log(.debug, "Is first run.") } - FaviconGenerator.faviconTemplateImage = AppAssets.faviconTemplateImage + FaviconGenerator.faviconTemplateImage = AppAsset.faviconTemplate importFeedsIfNeeded() diff --git a/iOS/IconView.swift b/iOS/IconView.swift index b9904dca8..c1fd21adf 100644 --- a/iOS/IconView.swift +++ b/iOS/IconView.swift @@ -33,7 +33,7 @@ final class IconView: UIView { private var isDiscernable = true private let imageView: UIImageView = { - let imageView = NonIntrinsicImageView(image: AppAssets.faviconTemplateImage) + let imageView = NonIntrinsicImageView(image: AppAsset.faviconTemplate) imageView.contentMode = .scaleAspectFit imageView.clipsToBounds = true imageView.layer.cornerRadius = 2.0 diff --git a/iOS/Settings/TimelinePreviewTableViewController.swift b/iOS/Settings/TimelinePreviewTableViewController.swift index 48f4eac04..b7de6df6f 100644 --- a/iOS/Settings/TimelinePreviewTableViewController.swift +++ b/iOS/Settings/TimelinePreviewTableViewController.swift @@ -70,7 +70,7 @@ private extension TimelinePreviewTableViewController { let status = ArticleStatus(articleID: prototypeID, read: false, starred: false, dateArrived: Date()) let prototypeArticle = Article(accountID: prototypeID, articleID: prototypeID, feedID: prototypeID, uniqueID: prototypeID, title: longTitle, contentHTML: nil, contentText: nil, url: nil, externalURL: nil, summary: nil, imageURL: nil, datePublished: nil, dateModified: nil, authors: nil, status: status) - let iconImage = IconImage(AppAssets.faviconTemplateImage.withTintColor(AppAssets.secondaryAccentColor)) + let iconImage = IconImage(AppAsset.faviconTemplate.withTintColor(AppAssets.secondaryAccentColor)) return TimelineCellData(article: prototypeArticle, showFeedName: .feed, feedName: "Feed Name", byline: nil, iconImage: iconImage, showIcon: true, featuredImage: nil, numberOfLines: AppDefaults.shared.timelineNumberOfLines, iconSize: AppDefaults.shared.timelineIconSize) }