Skip to content

armgit / alook

Public Imported from GitHub
0

Multi-Agent Collaboration for Team and Friends

fix(desktop): size android adaptive launcher icon

Generde4e4961e016
diff --git a/scripts/ci/logo-assets.test.ts b/scripts/ci/logo-assets.test.ts
index 79b7e1c03..b3d909e50 100644
--- a/scripts/ci/logo-assets.test.ts
+++ b/scripts/ci/logo-assets.test.ts
@@ -3,6 +3,7 @@ import { readFile } from "node:fs/promises"
import { resolve } from "node:path"
import { describe, expect, it } from "vitest"
import {
+ androidAdaptiveForegroundSizes,
assertSvgContract,
canonicalizeIcns,
desktopRasterAssets,
@@ -16,6 +17,53 @@ const repoRoot = resolve(import.meta.dirname, "../..")
const requireFromCli = createRequire(resolve(repoRoot, "src/cli/package.json"))
const sharp = requireFromCli("sharp")
+const androidLegacyIconSizes = {
+ mdpi: 48,
+ hdpi: 49,
+ xhdpi: 96,
+ xxhdpi: 144,
+ xxxhdpi: 192,
+} as const
+
+const desktopPngSizes = {
+ "32x32.png": 32,
+ "64x64.png": 64,
+ "128x128.png": 128,
+ "icon.png": 512,
+ "Square30x30Logo.png": 30,
+ "Square44x44Logo.png": 44,
+ "Square71x71Logo.png": 71,
+ "Square89x89Logo.png": 89,
+ "Square107x107Logo.png": 107,
+ "Square142x142Logo.png": 142,
+ "Square150x150Logo.png": 150,
+ "Square284x284Logo.png": 284,
+ "Square310x310Logo.png": 310,
+ "StoreLogo.png": 50,
+} as const
+
+const iosPngSizes = {
+} as const
+
async function alphaBounds(path: string) {
const { data, info } = await sharp(path).ensureAlpha().raw().toBuffer({ resolveWithObject: true })
let left = info.width
@@ -51,6 +99,8 @@ describe("logo asset generator", () => {
it("covers every approved platform family and protects the exceptions", () => {
expect(desktopRasterAssets).toHaveLength(17)
expect(iosRasterAssets).toHaveLength(18)
+ expect(Object.keys(desktopPngSizes)).toEqual(desktopRasterAssets.filter(file => file.endsWith(".png")))
+ expect(Object.keys(iosPngSizes)).toEqual(iosRasterAssets)
expect(preservedAssets).toEqual([
"src/web/src/app/favicon.ico",
"assets/readme/banner.png",
@@ -125,4 +175,64 @@ describe("logo asset generator", () => {
bounds: [2, 2, 46, 46],
})
})
+
+ it("keeps Android adaptive foreground artwork inside the safe zone at every density", async () => {
+ const adaptiveXml = await readFile(resolve(repoRoot, "src/desktop/src-tauri/gen/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml"), "utf8")
+ expect(adaptiveXml).toContain('<foreground android:drawable="@mipmap/ic_launcher_foreground"/>')
+ expect(adaptiveXml).toContain('<background android:drawable="@color/ic_launcher_background"/>')
+
+ for (const [density, { canvas, artwork }] of Object.entries(androidAdaptiveForegroundSizes)) {
+ const offset = Math.floor((canvas - artwork) / 2)
+ const base = resolve(repoRoot, `src/desktop/src-tauri/gen/android/app/src/main/res/mipmap-${density}`)
+ expect(await alphaBounds(resolve(base, "ic_launcher_foreground.png"))).toEqual({
+ width: canvas,
+ height: canvas,
+ bounds: [offset, offset, offset + artwork, offset + artwork],
+ opaque: false,
+ })
+ for (const file of ["ic_launcher.png", "ic_launcher_round.png"]) {
+ expect(await alphaBounds(resolve(base, file))).toMatchObject({
+ width: androidLegacyIconSizes[density as keyof typeof androidLegacyIconSizes],
+ height: androidLegacyIconSizes[density as keyof typeof androidLegacyIconSizes],
+ opaque: false,
+ })
+ }
+ }
+ })
+
+ it("locks Tauri Apple, macOS, Windows, and Linux icon container contracts", async () => {
+ for (const [file, size] of Object.entries(iosPngSizes)) {
+ const generated = resolve(repoRoot, "src/desktop/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset", file)
+ const packaged = resolve(repoRoot, "src/desktop/src-tauri/icons/ios", file)
+ expect(await readFile(packaged)).toEqual(await readFile(generated))
+ expect(await alphaBounds(generated)).toEqual({
+ width: size,
+ height: size,
+ bounds: [0, 0, size, size],
+ opaque: true,
+ })
+ }
+
+ for (const [file, size] of Object.entries(desktopPngSizes)) {
+ expect(await alphaBounds(resolve(repoRoot, "src/desktop/src-tauri/icons", file))).toMatchObject({
+ width: size,
+ height: size,
+ bounds: [0, 0, size, size],
+ opaque: false,
+ })
+ }
+
+ const ico = await readFile(resolve(repoRoot, "src/desktop/src-tauri/icons/icon.ico"))
+ const icoSizes = Array.from({ length: ico.readUInt16LE(4) }, (_, index) => {
+ const offset = 6 + index * 16
+ return [ico[offset] || 256, ico[offset + 1] || 256]
+ })
+ expect(ico.subarray(0, 4)).toEqual(Buffer.from([0, 0, 1, 0]))
+ expect(icoSizes).toEqual([[32, 32], [16, 16], [24, 24], [48, 48], [64, 64], [256, 256]])
+
+ const icns = await readFile(resolve(repoRoot, "src/desktop/src-tauri/icons/icon.icns"))
+ expect(icns.subarray(0, 4).toString("ascii")).toBe("icns")
+ expect(icns.readUInt32BE(4)).toBe(icns.length)
+ expect(canonicalizeIcns(icns)).toEqual(icns)
+ })
})
diff --git a/scripts/generate-logo-assets.mjs b/scripts/generate-logo-assets.mjs
index cbc4bb721..4b6010630 100644
--- a/scripts/generate-logo-assets.mjs
+++ b/scripts/generate-logo-assets.mjs
@@ -68,7 +68,14 @@ export const iosRasterAssets = [
]
-const androidDensities = ["mdpi", "hdpi", "xhdpi", "xxhdpi", "xxxhdpi"]
+export const androidAdaptiveForegroundSizes = {
+ mdpi: { canvas: 108, artwork: 66 },
+ hdpi: { canvas: 162, artwork: 99 },
+ xhdpi: { canvas: 216, artwork: 132 },
+ xxhdpi: { canvas: 324, artwork: 198 },
+ xxxhdpi: { canvas: 432, artwork: 264 },
+}
+const androidDensities = Object.keys(androidAdaptiveForegroundSizes)
const androidSplashSizes = { mdpi: 108, hdpi: 162, xhdpi: 216, xxhdpi: 324, xxxhdpi: 432 }
const appleSplashSizes = { "[email protected]": 80, "[email protected]": 160, "[email protected]": 240 }
@@ -192,9 +199,14 @@ export async function generateLogoAssets() {
for (const density of androidDensities) {
const sourceDir = join(fullBleedOutput, "android", `mipmap-${density}`)
const destinationDir = `src/desktop/src-tauri/gen/android/app/src/main/res/mipmap-${density}`
- for (const file of ["ic_launcher.png", "ic_launcher_round.png", "ic_launcher_foreground.png"]) {
+ for (const file of ["ic_launcher.png", "ic_launcher_round.png"]) {
await copy(join(sourceDir, file), `${destinationDir}/${file}`)
}
+ const { canvas, artwork } = androidAdaptiveForegroundSizes[density]
+ await writeFile(
+ resolve(repoRoot, destinationDir, "ic_launcher_foreground.png"),
+ await renderContained(canonical, canvas, artwork),
+ )
const splashSize = androidSplashSizes[density]
const artworkSize = Math.round(splashSize * 0.5185185185)
await writeFile(
diff --git a/src/desktop/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/src/desktop/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
index 934e4954d..487fcbaa9 100644
Binary files a/src/desktop/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and b/src/desktop/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/src/desktop/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/src/desktop/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
index 8c81daf0a..e3a0c6e4d 100644
Binary files a/src/desktop/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and b/src/desktop/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/src/desktop/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/src/desktop/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
index 4ef12a13c..d711c0074 100644
Binary files a/src/desktop/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and b/src/desktop/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/src/desktop/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/src/desktop/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
index 0419e7491..c443c491c 100644
Binary files a/src/desktop/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/src/desktop/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/src/desktop/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/src/desktop/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
index 0a5f2e984..ff28f3050 100644
Binary files a/src/desktop/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/src/desktop/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ