device-shots 0.5.12 → 0.6.1

package/dist/index.js

@@ -269,7 +269,6 @@ async function captureIosScreenshot(udid, outputPath) {
 }
 
 // src/devices/android.ts
-import { execSync } from "child_process";
 function sanitizeName2(name) {
   return name.replace(/[ (),]/g, "_").replace(/[^A-Za-z0-9_-]/g, "");
 }
@@ -335,54 +334,6 @@ async function discoverAndroidDevices(bundleId) {
   }
   return devices;
 }
-function sleep(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-function adbShellSync(adb, serial, cmd) {
-  try {
-    const result = execSync(`${adb} -s ${serial} shell ${cmd}`, {
-      encoding: "utf-8",
-      timeout: 1e4
-    });
-    return result.trim();
-  } catch (e) {
-    return e.stdout?.trim() || e.stderr?.trim() || "";
-  }
-}
-async function setAndroidDemoMode(serial, time = "9:30") {
-  const hhmm = time.replace(":", "");
-  const adb = getAdbPath();
-  const ACTION = "com.android.systemui.demo";
-  adbShellSync(adb, serial, "settings put global sysui_demo_allowed 1");
-  adbShellSync(adb, serial, "settings put global sysui_tuner_demo_on 1");
-  await sleep(500);
-  let r = adbShellSync(adb, serial, `am broadcast -a ${ACTION} --es command enter`);
-  process.stderr.write(`[demo] enter: ${r}
-`);
-  await sleep(1e3);
-  r = adbShellSync(adb, serial, `am broadcast -a ${ACTION} --es command clock --es hhmm ${hhmm}`);
-  process.stderr.write(`[demo] clock: ${r}
-`);
-  r = adbShellSync(adb, serial, `am broadcast -a ${ACTION} --es command network --es wifi show --es level 4`);
-  process.stderr.write(`[demo] wifi: ${r}
-`);
-  r = adbShellSync(adb, serial, `am broadcast -a ${ACTION} --es command network --es mobile show --es datatype none --es level 4`);
-  process.stderr.write(`[demo] mobile: ${r}
-`);
-  r = adbShellSync(adb, serial, `am broadcast -a ${ACTION} --es command battery --es level 100 --es plugged false`);
-  process.stderr.write(`[demo] battery: ${r}
-`);
-  r = adbShellSync(adb, serial, `am broadcast -a ${ACTION} --es command notifications --es visible false`);
-  process.stderr.write(`[demo] notif: ${r}
-`);
-  await sleep(1e3);
-}
-async function clearAndroidDemoMode(serial) {
-  const adb = getAdbPath();
-  const ACTION = "com.android.systemui.demo";
-  adbShellSync(adb, serial, `am broadcast -a ${ACTION} --es command exit`);
-  adbShellSync(adb, serial, "settings put global sysui_tuner_demo_on 0");
-}
 async function captureAndroidScreenshot(serial, outputPath) {
   const adb = getAdbPath();
   const deviceTmp = "/sdcard/screenshot_tmp.png";
@@ -618,7 +569,6 @@ async function captureCommand(options) {
   const outputDir = options.output || config.output;
   const platform = options.platform || config.platform;
   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);
@@ -695,13 +645,6 @@ Detected ${devices.length} device(s) with ${bundleIdDisplay}:`)
     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, androidTime);
-    }
-    s.succeed("Android demo mode set");
-  }
   console.log("");
   const captured = [];
   for (const device of devices) {
@@ -753,9 +696,6 @@ Detected ${devices.length} device(s) with ${bundleIdDisplay}:`)
   if (iosDevices.length > 0) {
     await clearIosStatusBar();
   }
-  for (const device of androidDevices) {
-    await clearAndroidDemoMode(device.captureId);
-  }
   const skippedDupes = captured.length - movedBuckets.size;
   let msg = `
 Captured ${movedBuckets.size} screenshot(s) as '${screenshotName}'.`;
@@ -865,7 +805,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.12");
+).version("0.6.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.12",
+  "version": "0.6.1",
   "description": "Capture and frame mobile app screenshots from iOS simulators and Android emulators",
   "type": "module",
   "bin": {