device-shots 0.5.5 → 0.5.7

package/dist/index.js

@@ -31,6 +31,7 @@ var DEFAULTS = {
   output: "./.screenshots",
   platform: "both",
   time: "9:41",
+  androidTime: "9:30",
   frame: true
 };
 async function loadConfig() {
@@ -51,6 +52,7 @@ function createDefaultConfig(bundleId) {
       output: "./.screenshots",
       platform: "both",
       time: "9:41",
+      androidTime: "9:30",
       frame: true
     },
     null,
@@ -332,36 +334,49 @@ async function discoverAndroidDevices(bundleId) {
   }
   return devices;
 }
-async function setAndroidDemoMode(serial, time) {
+async function adbShell(serial, cmd) {
   const adb = getAdbPath();
+  const { stdout, stderr } = await run(adb, ["-s", serial, "shell", cmd]);
+  return stdout || stderr;
+}
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+async function setAndroidDemoMode(serial, time = "9:30") {
   const hhmm = time.replace(":", "");
-  const commands = [
-    ["settings", "put", "global", "sysui_demo_allowed", "1"],
-    ["am", "broadcast", "-a", "com.android.systemui.demo", "-e", "command", "enter"],
-    ["am", "broadcast", "-a", "com.android.systemui.demo", "-e", "command", "clock", "-e", "hhmm", hhmm],
-    ["am", "broadcast", "-a", "com.android.systemui.demo", "-e", "command", "wifi", "-e", "fully", "true", "-e", "wifi", "show"],
-    ["am", "broadcast", "-a", "com.android.systemui.demo", "-e", "command", "network", "-e", "mobile", "show", "-e", "fully", "true", "-e", "level", "4"],
-    ["am", "broadcast", "-a", "com.android.systemui.demo", "-e", "command", "battery", "-e", "level", "100", "-e", "plugged", "false"],
-    ["am", "broadcast", "-a", "com.android.systemui.demo", "-e", "command", "notifications", "-e", "visible", "false"]
-  ];
-  for (const cmd of commands) {
-    await run(adb, ["-s", serial, "shell", ...cmd]);
-  }
+  await adbShell(serial, "settings put global sysui_demo_allowed 1");
+  await adbShell(
+    serial,
+    "am broadcast -a com.android.systemui.demo -e command enter"
+  );
+  await sleep(500);
+  await adbShell(
+    serial,
+    `am broadcast -a com.android.systemui.demo -e command clock -e hhmm ${hhmm}`
+  );
+  await adbShell(
+    serial,
+    "am broadcast -a com.android.systemui.demo -e command network -e wifi show -e level 4"
+  );
+  await adbShell(
+    serial,
+    "am broadcast -a com.android.systemui.demo -e command network -e mobile show -e datatype none -e level 4"
+  );
+  await adbShell(
+    serial,
+    "am broadcast -a com.android.systemui.demo -e command battery -e level 100 -e plugged false"
+  );
+  await adbShell(
+    serial,
+    "am broadcast -a com.android.systemui.demo -e command notifications -e visible false"
+  );
+  await sleep(500);
 }
 async function clearAndroidDemoMode(serial) {
-  const adb = getAdbPath();
-  await run(adb, [
-    "-s",
+  await adbShell(
     serial,
-    "shell",
-    "am",
-    "broadcast",
-    "-a",
-    "com.android.systemui.demo",
-    "-e",
-    "command",
-    "exit"
-  ]);
+    "am broadcast -a com.android.systemui.demo -e command exit"
+  );
 }
 async function captureAndroidScreenshot(serial, outputPath) {
   const adb = getAdbPath();
@@ -597,7 +612,8 @@ async function captureCommand(options) {
   const bundleIdDisplay = Array.isArray(bundleId) ? bundleId.join(", ") : bundleId;
   const outputDir = options.output || config.output;
   const platform = options.platform || config.platform;
-  const time = options.time || config.time;
+  const iosTime = options.time || config.time;
+  const androidTime = config.androidTime;
   const shouldFrame = !options.noFrame && config.frame;
   const spinner = ora("Discovering devices...").start();
   const devices = await discoverDevices(bundleId, platform);
@@ -671,13 +687,13 @@ Detected ${devices.length} device(s) with ${bundleIdDisplay}:`)
   const androidDevices = devices.filter((d) => d.platform === "android");
   if (iosDevices.length > 0) {
     const s = ora("Setting clean iOS status bar...").start();
-    await setIosStatusBar(time);
+    await setIosStatusBar(iosTime);
     s.succeed("iOS status bar set");
   }
   if (androidDevices.length > 0) {
     const s = ora("Setting clean Android status bar...").start();
     for (const device of androidDevices) {
-      await setAndroidDemoMode(device.captureId, time);
+      await setAndroidDemoMode(device.captureId, androidTime);
     }
     s.succeed("Android demo mode set");
   }
@@ -844,7 +860,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.5");
+).version("0.5.7");
 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.5",
+  "version": "0.5.7",
   "description": "Capture and frame mobile app screenshots from iOS simulators and Android emulators",
   "type": "module",
   "bin": {