Skip to content

armgit / alook

Public Imported from GitHub
0

Multi-Agent Collaboration for Team and Friends

fix: enlarge android adaptive launcher icon (#747)

Gener0f4fd7ba7f8d
diff --git a/scripts/ci/logo-assets.test.ts b/scripts/ci/logo-assets.test.ts
index 04db05f43..69c1dfd0a 100644
--- a/scripts/ci/logo-assets.test.ts
+++ b/scripts/ci/logo-assets.test.ts
@@ -95,6 +95,33 @@ async function visibleColors(path: string) {
return colors
}
+async function expressionBounds(path: string) {
+ const { data, info } = await sharp(path).ensureAlpha().raw().toBuffer({ resolveWithObject: true })
+ let left = info.width
+ let top = info.height
+ let right = 0
+ let bottom = 0
+ let hasBlack = false
+ let hasWhite = false
+ for (let y = 0; y < info.height; y += 1) {
+ for (let x = 0; x < info.width; x += 1) {
+ const offset = (y * info.width + x) * info.channels
+ if (data[offset + 3] === 0) continue
+ const isBlack = data[offset] === 0 && data[offset + 1] === 0 && data[offset + 2] === 0
+ const isWhite = data[offset] === 255 && data[offset + 1] === 255 && data[offset + 2] === 255
+ if (!isBlack && !isWhite) continue
+ hasBlack ||= isBlack
+ hasWhite ||= isWhite
+ left = Math.min(left, x)
+ top = Math.min(top, y)
+ right = Math.max(right, x + 1)
+ bottom = Math.max(bottom, y + 1)
+ }
+ }
+ if (!hasBlack || !hasWhite) throw new Error(`${path} is missing visible expression colors`)
+ return [left, top, right, bottom]
+}
+
describe("logo asset generator", () => {
it("locks the canonical structured transparent SVG", async () => {
const canonical = await readFile(resolve(repoRoot, "assets/alook.svg"), "utf8")
@@ -206,20 +233,29 @@ describe("logo asset generator", () => {
})
})
- it("keeps Android adaptive foreground artwork inside the safe zone at every density", async () => {
+ it("fills Android adaptive masks while keeping the expression 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 safeSize = canvas * 66 / 108
+ const safeOffset = (canvas - safeSize) / 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({
+ const foreground = resolve(base, "ic_launcher_foreground.png")
+ expect(artwork).toBe(canvas * 84 / 108)
+ expect(await alphaBounds(foreground)).toEqual({
width: canvas,
height: canvas,
bounds: [offset, offset, offset + artwork, offset + artwork],
opaque: false,
})
+ const [left, top, right, bottom] = await expressionBounds(foreground)
+ expect(left).toBeGreaterThanOrEqual(safeOffset)
+ expect(top).toBeGreaterThanOrEqual(safeOffset)
+ expect(right).toBeLessThanOrEqual(safeOffset + safeSize)
+ expect(bottom).toBeLessThanOrEqual(safeOffset + safeSize)
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],
diff --git a/scripts/generate-logo-assets.mjs b/scripts/generate-logo-assets.mjs
index 8f2d397ed..b7b7f7f12 100644
--- a/scripts/generate-logo-assets.mjs
+++ b/scripts/generate-logo-assets.mjs
@@ -68,11 +68,11 @@ export const iosRasterAssets = [
]
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 },
+ mdpi: { canvas: 108, artwork: 84 },
+ hdpi: { canvas: 162, artwork: 126 },
+ xhdpi: { canvas: 216, artwork: 168 },
+ xxhdpi: { canvas: 324, artwork: 252 },
+ xxxhdpi: { canvas: 432, artwork: 336 },
}
const androidDensities = Object.keys(androidAdaptiveForegroundSizes)
const androidSplashSizes = { mdpi: 108, hdpi: 162, xhdpi: 216, xxhdpi: 324, xxxhdpi: 432 }
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 487fcbaa9..38904e8fa 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 e3a0c6e4d..5c5001f17 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 d711c0074..a60f7ac30 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 c443c491c..79fff703c 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 ff28f3050..afcbfe296 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