device-shots 0.5.0 → 0.5.1

package/dist/index.js

@@ -142,7 +142,7 @@ function getAndroidScreenSize(width, height) {
   const longer = Math.max(width, height);
   const ratio = longer / shorter;
   if (ratio >= 1.7) return "phone";
-  if (shorter >= 1800) return "tablet-10";
+  if (shorter >= 1500) return "tablet-10";
   if (shorter >= 1200) return "tablet-7";
   return "phone";
 }
@@ -469,6 +469,9 @@ async function frameAndroidScreenshot(inputPath, outputPath) {
   if (!await commandExists("magick")) {
     throw new Error("ImageMagick is required for Android framing. Install with: brew install imagemagick");
   }
+  const { unlinkSync: unlinkSync2 } = await import("fs");
+  const { join: join5 } = await import("path");
+  const { tmpdir: tmpdir2 } = await import("os");
   const { stdout: identify } = await run("magick", [
     "identify",
     "-format",
@@ -483,23 +486,27 @@ async function frameAndroidScreenshot(inputPath, outputPath) {
   const radius = Math.round(width * 0.04);
   const totalW = width + padding * 2;
   const totalH = height + padding * 2;
+  const uid = Date.now();
+  const tmpMask = join5(tmpdir2(), `ds-mask-${uid}.png`);
+  const tmpRounded = join5(tmpdir2(), `ds-rounded-${uid}.png`);
   try {
-    const tmpRounded = inputPath.replace(".png", "_rounded_tmp.png");
+    await runOrFail("magick", [
+      "-size",
+      `${width}x${height}`,
+      "xc:black",
+      "-fill",
+      "white",
+      "-draw",
+      `roundrectangle 0,0 ${width - 1},${height - 1} ${radius},${radius}`,
+      tmpMask
+    ]);
     await runOrFail("magick", [
       inputPath,
+      tmpMask,
       "-alpha",
-      "set",
-      "(",
-      "+clone",
-      "-alpha",
-      "extract",
-      "-draw",
-      `fill black color 0,0 reset`,
-      "-draw",
-      `fill white roundrectangle 0,0 ${width - 1},${height - 1} ${radius},${radius}`,
-      ")",
+      "off",
       "-compose",
-      "DstIn",
+      "CopyOpacity",
       "-composite",
       tmpRounded
     ]);
@@ -507,8 +514,10 @@ async function frameAndroidScreenshot(inputPath, outputPath) {
       "-size",
       `${totalW}x${totalH}`,
       "xc:none",
+      "-fill",
+      "black",
       "-draw",
-      `fill black roundrectangle 0,0 ${totalW - 1},${totalH - 1} ${radius},${radius}`,
+      `roundrectangle 0,0 ${totalW - 1},${totalH - 1} ${radius},${radius}`,
       tmpRounded,
       "-gravity",
       "center",
@@ -517,14 +526,18 @@ async function frameAndroidScreenshot(inputPath, outputPath) {
       "-composite",
       outputPath
     ]);
+    return true;
+  } catch {
+    return false;
+  } finally {
+    try {
+      unlinkSync2(tmpMask);
+    } catch {
+    }
     try {
-      const { unlinkSync: unlinkSync2 } = await import("fs");
       unlinkSync2(tmpRounded);
     } catch {
     }
-    return true;
-  } catch {
-    return false;
   }
 }
 async function frameAllIosScreenshots(screenshotsDir, force = false) {
@@ -829,7 +842,7 @@ async function frameCommand(dir, options) {
 var program = new Command();
 program.name("device-shots").description(
   "Capture and frame mobile app screenshots from iOS simulators and Android emulators"
-).version("0.5.0");
+).version("0.5.1");
 program.command("capture").description("Capture screenshots from running devices").argument("[name]", "Screenshot name").option("-b, --bundle-id <id>", "App bundle ID").option("-o, --output <dir>", "Output directory").option("-p, --platform <platform>", "ios, android, or both").option("--no-frame", "Skip framing after capture").option("--time <time>", "Status bar time", "9:41").action(async (name, opts) => {
   await captureCommand({ name, ...opts });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "device-shots",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Capture and frame mobile app screenshots from iOS simulators and Android emulators",
   "type": "module",
   "bin": {