codeplay-common 4.10.7 → 4.10.9

package/files/buildCodeplay/project-scripts.cjs

@@ -38,7 +38,9 @@ function updateBuildScripts(scripts) {
   next['ionic:build'] = next['ionic:build'] || 'npm run build';
   next['ionic:serve'] = next['ionic:serve'] || 'cross-env NODE_ENV=development vite';
   next['baseline-profile:setup'] = next['baseline-profile:setup'] || 'node scripts-common/setup-baseline-profile.js';
-  next['baseline-profile:generate'] = next['baseline-profile:generate'] || 'cd android && gradlew.bat :app:generateBaselineProfile --console=plain';
+  if (!next['baseline-profile:generate'] || next['baseline-profile:generate'] === 'cd android && gradlew.bat :app:generateBaselineProfile --console=plain') {
+    next['baseline-profile:generate'] = 'node scripts-common/generate-baseline-profile.js';
+  }
   next.release = next.release || 'node finalrelease';
   return next;
 }

package/files/scripts-common/generate-baseline-profile.js

@@ -0,0 +1,42 @@
+const { execFileSync, spawnSync } = require('child_process');
+const path = require('path');
+
+function main() {
+  const devices = execFileSync('adb', ['devices'], { encoding: 'utf8' })
+    .split(/\r?\n/)
+    .map(line => line.match(/^(.+?)\tdevice\s*$/))
+    .filter(Boolean)
+    .map(match => match[1]);
+  const requestedSerial = process.env.ANDROID_SERIAL?.trim();
+  if (requestedSerial?.includes(',')) {
+    throw new Error('Set ANDROID_SERIAL to one device connection for Baseline Profile generation.');
+  }
+  const serial = requestedSerial || devices[0];
+  if (!serial || !devices.includes(serial)) {
+    throw new Error(requestedSerial
+      ? `ADB device is not online: ${requestedSerial}`
+      : 'No online ADB device. Connect an Android device before generating a Baseline Profile.');
+  }
+
+  console.log(`Generating Baseline Profile using one ADB connection: ${serial}`);
+  const args = [':app:generateBaselineProfile', '--console=plain'];
+  const result = spawnSync(
+    process.platform === 'win32' ? 'cmd.exe' : './gradlew',
+    process.platform === 'win32' ? ['/d', '/s', '/c', `gradlew.bat ${args.join(' ')}`] : args,
+    {
+      cwd: path.resolve(__dirname, '..', 'android'),
+      env: { ...process.env, ANDROID_SERIAL: serial },
+      stdio: 'inherit',
+    }
+  );
+  if (result.error) throw result.error;
+  if (result.signal) throw new Error(`Baseline Profile generation stopped by ${result.signal}.`);
+  process.exitCode = result.status ?? 1;
+}
+
+try {
+  main();
+} catch (error) {
+  console.error(`Baseline Profile generation failed: ${error.message}`);
+  process.exitCode = 1;
+}

package/files/take-screen-image.js

@@ -3,7 +3,8 @@
 //node take-screen-image.js --profiles vivo-store //only taking screenshot for vivo-store - Not only vivo, we can do this to all of our store images.
 //node take-screen-image.js --vivo-existing       //Used if we already took the screenshot and those vivo screenshots are not there then execute this to resize the screenshot for vivo store.
 //node take-screen-image.js --oppo-existing       //Used if we already took the screenshot and those oppo screenshots are not there then execute this to resize the screenshot for Oppo store.
-//App Store: import actual iOS/iPadOS PNG captures; Android replay is not an Apple screenshot source.
+//iPhone, iPhone Duo and iPad use plain screenshots without device frames or synthetic system bars.
+//Reframing recovers missing iPhone/iPad images from existing captures without cropping.
 //node take-screen-image.js --apple-source "C:\captures\iphone" --profiles iphone
 //Add --apple-promotional to reuse screenshot-copy.json captions around the original capture.
 
@@ -179,7 +180,7 @@ const deviceProfiles = [
     name: 'iphone',
     label: 'iPhone Dynamic Island medium-display App Store viewport',
     outputDirectory: 'iPhone',
-    frameType: 'iphone',
+    frameType: 'native-apple',
     width: 402,
     height: 874,
     deviceScaleFactor: 3,
@@ -192,7 +193,7 @@ const deviceProfiles = [
     name: 'iphone-duo',
     label: 'iPhone Duo inner-display App Store viewport',
     outputDirectory: 'iPhone-Duo',
-    frameType: 'iphone',
+    frameType: 'native-apple',
     showDynamicIsland: false,
     width: 669,
     height: 951,
@@ -206,7 +207,7 @@ const deviceProfiles = [
     name: 'ipad',
     label: 'iPad 13-inch App Store viewport',
     outputDirectory: 'iPad',
-    frameType: 'ipad',
+    frameType: 'native-apple',
     width: 1032,
     height: 1376,
     deviceScaleFactor: 2,
@@ -219,7 +220,7 @@ const deviceProfiles = [
     name: 'ipad-store',
     label: 'iPad App Store screenshot set',
     outputDirectory: 'iPad-Store',
-    frameType: 'tablet',
+    frameType: 'native-apple',
     width: 1024,
     height: 1366,
     deviceScaleFactor: 2,
@@ -230,7 +231,7 @@ const deviceProfiles = [
     name: 'iphone-store',
     label: 'iPhone Dynamic Island medium-display App Store screenshot set',
     outputDirectory: 'iPhone-Store',
-    frameType: 'iphone',
+    frameType: 'native-apple',
     width: 402,
     height: 874,
     deviceScaleFactor: 3,
@@ -617,7 +618,7 @@ function printProfiles() {
       + `(folder ${profile.outputDirectory}, viewport ${profile.width}x${profile.height}, `
       + `${(profile.outputFormat || 'png').toUpperCase()} ${outputWidth}x${outputHeight}${framedSize})`,
     );
-    if (isAppleProfile(profile)) {
+    if (isAppleProfile(profile) && profile.frameType !== 'native-apple') {
       console.log('                 Native Apple capture required; Android replay/reframing is disabled.');
     }
     if (profile.storeRequirements) {
@@ -655,7 +656,9 @@ function printHelp() {
   console.log('');
   console.log('A normal capture automatically creates any missing Amazon, Samsung, and Play Store assets.');
   console.log('Frame default: Android graphite (A). Apple imports do not add a device frame.');
-  console.log('iPhone/iPad profiles require --apple-source and exactly one profile per import.');
+  console.log('iPhone/iPad profiles capture and reframe plain screenshots without device frames or synthetic system bars.');
+  console.log('Reframing recovers missing iPhone/iPad screenshots from existing captures, preserving content with padding.');
+  console.log('Use --apple-source with one profile to import original iOS/iPadOS captures instead.');
   console.log('Name captures 1.png, 2.png, etc. to reuse existing promotional copy.');
   console.log('Apple originals and optional promotions are saved separately under Store-upload/Apple-Native.');
   console.log('Imports preserve source dimensions and system bars; the tool cannot verify capture provenance.');
@@ -693,7 +696,7 @@ async function chooseFrameStyles(options) {
     if (terminal) terminal.close();
   }
 
-  console.log(`Frame selection: Android ${choices.android}. Apple captures keep their native appearance.`);
+  console.log(`Frame selection: Android ${choices.android}. iPhone/iPad screenshots have no device frame.`);
   return choices;
 }
 
@@ -3407,8 +3410,6 @@ async function captureFramedScreenshot(
   skipExisting = false,
   outputRootDirectory = inFrameDirectory,
 ) {
-  if (profile.screenshotOnly) return false;
-
   const outputExtension = profile.outputExtension || path.extname(screenshotFileName).slice(1) || 'png';
   const outputFileName = `${path.parse(screenshotFileName).name}.${outputExtension}`;
   const framedProfileDirectory = path.join(outputRootDirectory, profile.outputDirectory);
@@ -3419,6 +3420,14 @@ async function captureFramedScreenshot(
     return false;
   }
 
+  if (profile.screenshotOnly) {
+    if (profile.frameType !== 'native-apple') return false;
+    fs.mkdirSync(framedProfileDirectory, { recursive: true });
+    fs.writeFileSync(framedScreenshotPath, screenshotBuffer, { flag: skipExisting ? 'wx' : 'w' });
+    console.log(`Saved plain ${profile.label}: ${framedScreenshotPath}`);
+    return true;
+  }
+
   const originalImageMetadata = await sharp(screenshotBuffer).metadata();
   const hasCustomFrameSize = Boolean(profile.framedWidth && profile.framedHeight);
   const frameWidth = profile.framedWidth || profile.width;
@@ -3570,8 +3579,8 @@ async function captureProfile(client, snapshot, profile, screenshotFileName) {
     frameId: frameTree.frameTree.frame.id,
     html: snapshot.html,
   });
-  if (profile.name === 'iphone-duo') {
-    // The Duo frame supplies its own system bars; do not capture Android insets again.
+  if (profile.frameType === 'native-apple') {
+    // Plain iPhone/iPad captures do not include Android system-bar spacing.
     await client.send('Runtime.evaluate', {
       expression: `(() => {
         const style = document.createElement('style');
@@ -3659,6 +3668,10 @@ async function frameExistingScreenshots(
   );
   const foundScreenshotNames = new Set();
 
+  for (const profile of selectedProfiles.filter((item) => item.frameType === 'native-apple')) {
+    await recoverMissingAppleScreenshots(profile, selectedScreenshotNames);
+  }
+
   try {
     replayBrowser = await launchReplayBrowser();
     replayClient = await createReplayPage(replayBrowser);
@@ -3901,6 +3914,40 @@ async function runInteractiveCaptureLoop(
   console.log('\nResponsive screenshot tool closed.');
 }
 
+async function recoverMissingAppleScreenshots(profile, selectedNames) {
+  const sourceFolders = profile.name.startsWith('ipad')
+    ? ['Amazon-Tab', 'Android-Tab-10inch', 'Android-Tab-7inch', 'Android']
+    : ['Android', 'Amazon-Phone'];
+  const sources = new Map();
+  for (const folder of sourceFolders) {
+    const directory = path.join(screenshotDirectory, folder);
+    if (!fs.existsSync(directory)) continue;
+    for (const fileName of fs.readdirSync(directory).sort()) {
+      if (!/\.png$/i.test(fileName)) continue;
+      const name = path.parse(fileName).name;
+      if (selectedNames.size && !selectedNames.has(name)) continue;
+      if (!sources.has(name)) sources.set(name, path.join(directory, fileName));
+    }
+  }
+  for (const [name, sourcePath] of sources) {
+    const outputPath = path.join(screenshotDirectory, profile.outputDirectory, `${name}.png`);
+    if (fs.existsSync(outputPath)) continue;
+    const image = sharp(sourcePath);
+    const { width, height } = await image.metadata();
+    const { data } = await image.clone().resize(1, 1, { fit: 'fill' }).toColourspace('srgb').removeAlpha().raw().toBuffer({ resolveWithObject: true });
+    const landscape = width > height;
+    const targetWidth = Math.min(profile.width, profile.height) * profile.deviceScaleFactor;
+    const targetHeight = Math.max(profile.width, profile.height) * profile.deviceScaleFactor;
+    const buffer = await image.resize(landscape ? targetHeight : targetWidth, landscape ? targetWidth : targetHeight, {
+      fit: 'contain',
+      background: { r: data[0], g: data[1], b: data[2], alpha: 1 },
+    }).removeAlpha().png().toBuffer();
+    fs.mkdirSync(path.dirname(outputPath), { recursive: true });
+    fs.writeFileSync(outputPath, buffer, { flag: 'wx' });
+    console.log(`Recovered plain screenshot from ${sourcePath}: ${outputPath}`);
+  }
+}
+
 function isAppleProfile(profile) {
   return /^(iphone|ipad|apple)(-|$)/.test(profile.name) || profile.name === 'mac';
 }
@@ -4113,15 +4160,16 @@ async function main() {
   if (!options.amazonAssets && !options.samsungAssets && !options.vivoExisting
     && !options.oppoExisting && !options.refreshInfo) {
     const selected = selectProfiles(options.profiles);
-    const appleProfiles = selected.filter(isAppleProfile);
+    const requiresNativeCapture = (profile) => isAppleProfile(profile) && profile.frameType !== 'native-apple';
+    const appleProfiles = selected.filter(requiresNativeCapture);
     if (appleProfiles.length) {
       const explicitSelection = options.profiles.split(',').some((name) => name.trim() && name.trim().toLowerCase() !== 'all');
       if (explicitSelection) {
-        throw new Error('Apple screenshots require native captures. Import iPhone/iPad captures with --apple-source <directory> --profiles iphone, iphone-duo, or ipad (one per import). Android replay/reframing is disabled for every Apple profile, including Watch, Vision Pro, TV, and Mac.');
+        throw new Error('Watch, Vision Pro, TV and Mac profiles require native captures. iPhone, iPhone Duo and iPad support plain screenshot capture and reframing.');
       }
-      options.profiles = selected.filter((profile) => !isAppleProfile(profile))
+      options.profiles = selected.filter((profile) => !requiresNativeCapture(profile))
         .map((profile) => profile.name).join(',');
-      console.log('Skipping all Apple Android replay profiles. Import native iPhone/iPad captures with --apple-source.');
+      console.log('Skipping Watch, Vision Pro, TV and Mac profiles. iPhone/iPad plain screenshots are enabled.');
     }
   }
 
@@ -4258,7 +4306,7 @@ async function main() {
     replayClient = await createReplayPage(replayBrowser);
 
     console.log(
-      'Non-Apple profiles are viewport approximations of the live Android WebView. Apple profiles require native captures.',
+      'Profiles are viewport approximations of the live Android WebView. iPhone/iPad outputs use plain screenshots without device frames.',
     );
 
     if (interactiveMode) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeplay-common",
-  "version": "4.10.7",
+  "version": "4.10.9",
   "description": "Common build scripts and files",
   "scripts": {
     "postinstall": "node scripts/sync-files.js",