diff --git a/Shared/Extensions/IconImage.swift b/Shared/Extensions/IconImage.swift index 1ddc2935d..1839b4abf 100644 --- a/Shared/Extensions/IconImage.swift +++ b/Shared/Extensions/IconImage.swift @@ -25,9 +25,11 @@ final class IconImage { }() let image: RSImage - - init(_ image: RSImage) { + let isSymbol: Bool + + init(_ image: RSImage, isSymbol: Bool = false) { self.image = image + self.isSymbol = isSymbol } } diff --git a/iOS/AppAssets.swift b/iOS/AppAssets.swift index 287e27b23..b982bc677 100644 --- a/iOS/AppAssets.swift +++ b/iOS/AppAssets.swift @@ -126,7 +126,7 @@ struct AppAssets { }() static var masterFolderImage: IconImage = { - return IconImage(UIImage(systemName: "folder.fill")!) + return IconImage(UIImage(systemName: "folder.fill")!, isSymbol: true) }() static var moreImage: UIImage = { @@ -158,7 +158,7 @@ struct AppAssets { }() static var searchFeedImage: IconImage = { - return IconImage(UIImage(systemName: "magnifyingglass")!) + return IconImage(UIImage(systemName: "magnifyingglass")!, isSymbol: true) }() static var secondaryAccentColor: UIColor = { @@ -190,7 +190,7 @@ struct AppAssets { }() static var starredFeedImage: IconImage = { - return IconImage(UIImage(systemName: "star.fill")!) + return IconImage(UIImage(systemName: "star.fill")!, isSymbol: true) }() static var tickMarkColor: UIColor = { @@ -203,7 +203,7 @@ struct AppAssets { }() static var todayFeedImage: IconImage = { - return IconImage(UIImage(systemName: "sun.max.fill")!) + return IconImage(UIImage(systemName: "sun.max.fill")!, isSymbol: true) }() static var trashImage: UIImage = { @@ -211,7 +211,7 @@ struct AppAssets { }() static var unreadFeedImage: IconImage = { - return IconImage(UIImage(systemName: "largecircle.fill.circle")!) + return IconImage(UIImage(systemName: "largecircle.fill.circle")!, isSymbol: true) }() static var vibrantTextColor: UIColor = { diff --git a/iOS/IconView.swift b/iOS/IconView.swift index 7ce9faf3f..0c3885a5b 100644 --- a/iOS/IconView.swift +++ b/iOS/IconView.swift @@ -52,7 +52,7 @@ final class IconView: UIView { } private var isSymbolImage: Bool { - return imageView.image?.isSymbolImage ?? false + return iconImage?.isSymbol ?? false } override init(frame: CGRect) {