diff --git a/Mac/AppAssets.swift b/Mac/AppAssets.swift index a1649d307..88a00e350 100644 --- a/Mac/AppAssets.swift +++ b/Mac/AppAssets.swift @@ -48,7 +48,7 @@ struct AppAssets { return RSImage(named: "accountTheOldReader") }() - static let nnwFeedIcon = RSImage(named: "feedIcon")! + static let nnwFeedIcon = RSImage(named: "nnwFeedIcon")! @available(macOS 11.0, *) static var addNewSidebarItemImage: RSImage = { diff --git a/Mac/Resources/Assets.xcassets/FeedIcon.imageset/Contents.json b/Mac/Resources/Assets.xcassets/nnwFeedIcon.imageset/Contents.json similarity index 100% rename from Mac/Resources/Assets.xcassets/FeedIcon.imageset/Contents.json rename to Mac/Resources/Assets.xcassets/nnwFeedIcon.imageset/Contents.json diff --git a/Mac/Resources/Assets.xcassets/FeedIcon.imageset/FeedIcon 1.png b/Mac/Resources/Assets.xcassets/nnwFeedIcon.imageset/FeedIcon 1.png similarity index 100% rename from Mac/Resources/Assets.xcassets/FeedIcon.imageset/FeedIcon 1.png rename to Mac/Resources/Assets.xcassets/nnwFeedIcon.imageset/FeedIcon 1.png diff --git a/Mac/Resources/Assets.xcassets/FeedIcon.imageset/FeedIcon 2.png b/Mac/Resources/Assets.xcassets/nnwFeedIcon.imageset/FeedIcon 2.png similarity index 100% rename from Mac/Resources/Assets.xcassets/FeedIcon.imageset/FeedIcon 2.png rename to Mac/Resources/Assets.xcassets/nnwFeedIcon.imageset/FeedIcon 2.png diff --git a/Mac/Resources/Assets.xcassets/FeedIcon.imageset/FeedIcon.png b/Mac/Resources/Assets.xcassets/nnwFeedIcon.imageset/FeedIcon.png similarity index 100% rename from Mac/Resources/Assets.xcassets/FeedIcon.imageset/FeedIcon.png rename to Mac/Resources/Assets.xcassets/nnwFeedIcon.imageset/FeedIcon.png diff --git a/iOS/AppAssets.swift b/iOS/AppAssets.swift index d32cd9b1d..aa0fdefbc 100644 --- a/iOS/AppAssets.swift +++ b/iOS/AppAssets.swift @@ -51,6 +51,11 @@ struct AppAssets { return UIImage(named: "accountTheOldReader")! }() +<<<<<<< HEAD +======= + static let nnwFeedIcon = RSImage(named: "nnwFeedIcon")! + +>>>>>>> ecbc38963 (Rename feedIcon asset to nnwFeedIcon.) static var articleExtractorError: UIImage = { return UIImage(named: "articleExtractorError")! }() diff --git a/iOS/Resources/Assets.xcassets/nnwFeedIcon.imageset/Contents.json b/iOS/Resources/Assets.xcassets/nnwFeedIcon.imageset/Contents.json new file mode 100644 index 000000000..defff668e --- /dev/null +++ b/iOS/Resources/Assets.xcassets/nnwFeedIcon.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "feedIcon.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "feedIcon 1.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "feedIcon 2.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iOS/Resources/Assets.xcassets/nnwFeedIcon.imageset/feedIcon 1.png b/iOS/Resources/Assets.xcassets/nnwFeedIcon.imageset/feedIcon 1.png new file mode 100644 index 000000000..7551d44a7 Binary files /dev/null and b/iOS/Resources/Assets.xcassets/nnwFeedIcon.imageset/feedIcon 1.png differ diff --git a/iOS/Resources/Assets.xcassets/nnwFeedIcon.imageset/feedIcon 2.png b/iOS/Resources/Assets.xcassets/nnwFeedIcon.imageset/feedIcon 2.png new file mode 100644 index 000000000..7551d44a7 Binary files /dev/null and b/iOS/Resources/Assets.xcassets/nnwFeedIcon.imageset/feedIcon 2.png differ diff --git a/iOS/Resources/Assets.xcassets/nnwFeedIcon.imageset/feedIcon.png b/iOS/Resources/Assets.xcassets/nnwFeedIcon.imageset/feedIcon.png new file mode 100644 index 000000000..7551d44a7 Binary files /dev/null and b/iOS/Resources/Assets.xcassets/nnwFeedIcon.imageset/feedIcon.png differ