diff --git a/Sources/AssetKit/CAR/BitmapKeys.swift b/Sources/AssetKit/CAR/BitmapKeys.swift index d3e31b4..8053e9f 100644 --- a/Sources/AssetKit/CAR/BitmapKeys.swift +++ b/Sources/AssetKit/CAR/BitmapKeys.swift @@ -133,7 +133,7 @@ enum BitmapKeys { /// (say) preserved JPG would be misclassified as `.image` here. private static func inferKind(from renditions: [Rendition]) -> Descriptor.Kind { for rendition in renditions { - if case .bitmap(let body) = rendition.body, body.kind == .appIcon { + if case .bitmap(let body) = rendition.body, case .appIcon = body.kind { return .appIcon } } diff --git a/Sources/AssetKit/CAR/RenditionKey.swift b/Sources/AssetKit/CAR/RenditionKey.swift index 01dfb76..869d9b0 100644 --- a/Sources/AssetKit/CAR/RenditionKey.swift +++ b/Sources/AssetKit/CAR/RenditionKey.swift @@ -49,12 +49,10 @@ struct RenditionKey: Hashable, Sendable { case .bitmap(let body): self.element = Element.bitmap.rawValue switch body.kind { - case .appIcon: + case .appIcon(let index): self.part = Part.appIcon.rawValue - // Dimension2 is the appicon "Icon Index" slot. v1 only - // emits one logical icon size per appiconset, so this is - // always 1. - self.dimension2 = 1 + // Dimension2 is the appicon "Icon Index" slot. + self.dimension2 = index case .image: self.part = Part.image.rawValue // Generic image assets don't use Dimension2 at all. diff --git a/Sources/AssetKit/Rendition/ImageRenderer.swift b/Sources/AssetKit/Rendition/ImageRenderer.swift index 05e6107..a6e6583 100644 --- a/Sources/AssetKit/Rendition/ImageRenderer.swift +++ b/Sources/AssetKit/Rendition/ImageRenderer.swift @@ -60,6 +60,10 @@ enum ImageRenderer { } static func appIconRenditions(for appIcon: LoadedAppIcon, files: [IconFile]) throws -> [Rendition] { + let pointSizes = Set(files.map(\.pointSize)).sorted() + let iconIndices = Dictionary(uniqueKeysWithValues: pointSizes.enumerated().map { + ($0.element, UInt16($0.offset + 1)) + }) var out: [Rendition] = [] for file in files { let filename = file.sourceURL.lastPathComponent @@ -87,7 +91,7 @@ enum ImageRenderer { appearance: nil, gamut: .sRGB, filename: filename, - kind: .appIcon + kind: .appIcon(index: iconIndices[file.pointSize]!) ) out.append(contentsOf: try PNGSource.renditions(bytes: bytes, context: ctx)) } diff --git a/Sources/AssetKit/Rendition/Rendition.swift b/Sources/AssetKit/Rendition/Rendition.swift index 2175002..a6bade1 100644 --- a/Sources/AssetKit/Rendition/Rendition.swift +++ b/Sources/AssetKit/Rendition/Rendition.swift @@ -21,9 +21,10 @@ struct BitmapBody: Sendable { /// value -- actool picks different codes for appicons vs. generic images, /// and UIImage(named:) only finds renditions whose part matches the /// expected category for the lookup path. - enum Kind: Sendable { + enum Kind: Sendable, Equatable { /// `element=85, part=220`. Used by SpringBoard's icon-render pipeline. - case appIcon + /// The index distinguishes logical point sizes across scales and idioms. + case appIcon(index: UInt16) /// `element=85, part=181`. Used by UIImage(named:) for generic image /// assets from an `.imageset`. case image diff --git a/Tests/AssetKitTests/AppIconRenditionTests.swift b/Tests/AssetKitTests/AppIconRenditionTests.swift new file mode 100644 index 0000000..6997e88 --- /dev/null +++ b/Tests/AssetKitTests/AppIconRenditionTests.swift @@ -0,0 +1,75 @@ +import Foundation +import Testing +@testable import AssetKit + +@Suite("App icon rendition keys") +struct AppIconRenditionTests { + @Test("Multiple logical icon sizes have distinct encoded CAR keys") + func multipleSizes() async throws { + let catalog = FileManager.default.temporaryDirectory + .appendingPathComponent("icons-\(UUID().uuidString).xcassets", isDirectory: true) + defer { try? FileManager.default.removeItem(at: catalog) } + try MultiSizeAppIconFixture.write(to: catalog) + + let result = try await XCAssetCompiler(deploymentTarget: "17.0").compile(catalog: catalog) + let entries = try renditionEntries(in: result.carData) + #expect(entries.count == MultiSizeAppIconFixture.entries.count) + #expect(Set(entries.map(\.key)).count == entries.count, "duplicate RENDITIONS keys hide icon sizes") + for (key, width) in entries { + let points = Double(width) / Double(key.scale) + #expect(key.dimension2 == MultiSizeAppIconFixture.indices[points]) + #expect(key.element == 85) + #expect(key.part == 220) + } + } + + @Test("A single logical icon size keeps index 1 and images keep index 0") + func singleSize() async throws { + let catalog = try #require(Bundle.module.url( + forResource: "Test", withExtension: "xcassets", subdirectory: "Fixtures" + )) + let result = try await XCAssetCompiler( + deploymentTarget: "16.0", svgRasterizer: StubSVGRasterizer() + ).compile(catalog: catalog) + let entries = try renditionEntries(in: result.carData) + let icons = entries.filter { $0.key.part == 220 } + #expect(icons.count == 2) + #expect(icons.allSatisfy { $0.key.dimension2 == 1 }) + let images = entries.filter { $0.key.part == 181 } + #expect(!images.isEmpty) + #expect(images.allSatisfy { $0.key.dimension2 == 0 }) + } + + private func renditionEntries(in data: Data) throws -> [(key: RenditionKey, width: UInt32)] { + func u32(_ bytes: Data, _ offset: Int) -> UInt32 { + bytes.withUnsafeBytes { UInt32(bigEndian: $0.loadUnaligned(fromByteOffset: offset, as: UInt32.self)) } + } + let index = Int(u32(data, 0x10)) + func block(_ id: UInt32) -> Data { + let entry = index + 4 + Int(id) * 8 + let start = Int(u32(data, entry)) + return data.subdata(in: start..<(start + Int(u32(data, entry + 4)))) + } + let variables = Int(u32(data, 0x18)) + var cursor = variables + 4 + var tree: Data? + for _ in 0..