codeplay-common 4.9.4 → 4.9.6

package/files/buildCodeplay/codeplayBeforeBuild-6.4.js

@@ -4448,6 +4448,21 @@ function syncAndroidBuildOptimization() {
 }
 // Android build optimization END
 
+function syncAndroidCordovaResourceKeep() {
+  if (buildPlatform !== 'android' || !fs.existsSync(androidPlatformPath)) return;
+
+  // Cordova loads config.xml by name; preserve it even when no plugins are installed yet.
+  const rawPath = path.join(androidPlatformPath, 'app', 'src', 'main', 'res', 'raw');
+  const keepPath = path.join(rawPath, 'codeplay_cordova_keep.xml');
+  const content = '<?xml version="1.0" encoding="utf-8"?>\n'
+    + '<resources xmlns:tools="http://schemas.android.com/tools"\n'
+    + '    tools:keep="@xml/config" />\n';
+  if (fs.existsSync(keepPath) && fs.readFileSync(keepPath, 'utf8') === content) return;
+
+  fs.mkdirSync(rawPath, { recursive: true });
+  fs.writeFileSync(keepPath, content, 'utf8');
+}
+
 async function main() {
   validateThemeFolderLocation();
   validateAndRestoreSignDetails();
@@ -4467,6 +4482,7 @@ async function main() {
   checkAdmobConfigurationProperty();
   syncAndroidAdIdPermission();
   syncAndroidBuildOptimization();
+  syncAndroidCordovaResourceKeep();
 }
 
 await main();

package/files/take-screen-image.js

@@ -3,9 +3,9 @@
 //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.
-//node take-screen-image.js --profiles iphone,iphone-duo,ipad //Capture current App Store sizes; iPhone-Duo uses the 2007x2853 inner display.
-//Apple also accepts 1398x2034 for the Duo outer display. This profile captures the inner display only.
-//New captures create iPhone-Duo folders automatically. Reframing existing files does not recapture responsive UI at the new viewport sizes.
+//App Store: import actual iOS/iPadOS PNG captures; Android replay is not an Apple screenshot source.
+//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.
 
 
 /*
@@ -74,6 +74,22 @@ const browserExecutablePaths = [
   'C:\\Program Files (x86)\\Microsoft\\Edge\\Application\\msedge.exe',
 ];
 
+// Full-display sizes from Apple's screenshot specifications, checked 2026-10-20.
+// https://developer.apple.com/help/app-store-connect/reference/app-information/screenshot-specifications/
+// Source captures retain their size; never resize one Apple device family into another.
+const appleScreenshotSizes = {
+  iphone: [
+    [1260, 2736], [1290, 2796], [1320, 2868], [1284, 2778], [1242, 2688],
+    [1179, 2556], [1206, 2622], [1170, 2532], [1125, 2436], [1080, 2340],
+    [1242, 2208], [750, 1334], [640, 1136], [640, 960],
+  ],
+  'iphone-duo': [[1398, 2034], [2007, 2853]],
+  ipad: [
+    [2064, 2752], [2048, 2732], [1488, 2266], [1668, 2420],
+    [1668, 2388], [1640, 2360], [1668, 2224], [1536, 2048], [768, 1024],
+  ],
+};
+
 const deviceProfiles = [
   {
     name: 'android-phone',
@@ -520,12 +536,25 @@ function parseArguments() {
     screenshots: '',
     androidFrame: '',
     iosFrame: '',
+    appleSource: '',
+    applePromotional: false,
+    appleExisting: false,
   };
 
   for (let index = 0; index < args.length; index += 1) {
     const argument = args[index];
 
-    if (argument === '--amazon-assets') {
+    if (argument === '--apple-existing') {
+      options.appleExisting = true;
+    } else if (argument === '--apple-source') {
+      options.appleSource = args[index + 1] || '';
+      if (!options.appleSource || options.appleSource.startsWith('--')) {
+        throw new Error('--apple-source requires a directory of genuine iOS/iPadOS PNG captures.');
+      }
+      index += 1;
+    } else if (argument === '--apple-promotional') {
+      options.applePromotional = true;
+    } else if (argument === '--amazon-assets') {
       options.amazonAssets = true;
     } else if (argument === '--samsung-assets') {
       options.samsungAssets = true;
@@ -588,6 +617,9 @@ function printProfiles() {
       + `(folder ${profile.outputDirectory}, viewport ${profile.width}x${profile.height}, `
       + `${(profile.outputFormat || 'png').toUpperCase()} ${outputWidth}x${outputHeight}${framedSize})`,
     );
+    if (isAppleProfile(profile)) {
+      console.log('                 Native Apple capture required; Android replay/reframing is disabled.');
+    }
     if (profile.storeRequirements) {
       console.log(
         `                 Store limits: ${profile.storeRequirements.minImages}-${profile.storeRequirements.maxImages} images, `
@@ -603,12 +635,14 @@ function printHelp() {
   console.log('');
   console.log('Usage:');
   console.log('  node take-screen-image.js');
-  console.log('  node take-screen-image.js --profiles iphone,ipad');
-  console.log('  node take-screen-image.js --profiles iphone,iphone-duo,ipad');
-  console.log('  node take-screen-image.js --android-frame graphite --ios-frame titanium');
-  console.log('  node take-screen-image.js --prefix home --profiles android-phone,ipad');
+  console.log('  node take-screen-image.js --apple-source "C:\\captures\\iphone" --profiles iphone');
+  console.log('  node take-screen-image.js --apple-source "C:\\captures\\ipad" --profiles ipad --apple-promotional');
+  console.log('  node take-screen-image.js --apple-source "C:\\captures\\duo" --profiles iphone-duo');
+  console.log('  node take-screen-image.js --apple-existing --profiles iphone,iphone-duo,ipad');
+  console.log('  node take-screen-image.js --android-frame graphite');
+  console.log('  node take-screen-image.js --prefix home --profiles android-phone');
   console.log('  node take-screen-image.js --frame-existing');
-  console.log('  node take-screen-image.js --reframe-existing --profiles android-phone,iphone');
+  console.log('  node take-screen-image.js --reframe-existing --profiles android-phone');
   console.log('  node take-screen-image.js --reframe-existing --screenshots 1,2');
   console.log('  node take-screen-image.js --refresh-info 1');
   console.log('  node take-screen-image.js --vivo-existing');
@@ -620,7 +654,15 @@ function printHelp() {
   console.log('  node take-screen-image.js --delete 3,4,5');
   console.log('');
   console.log('A normal capture automatically creates any missing Amazon, Samsung, and Play Store assets.');
-  console.log('Frame defaults: Android graphite (A), iPhone midnight (D).');
+  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('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.');
+  console.log('Use full-display PNG captures without alpha channels, up to 10 per size.');
+  console.log('Each size gets its own folder. Re-importing a filename at that size never overwrites it.');
+  console.log('--apple-existing reprocesses Store-image-Screenshot images without synthetic system bars or frames.');
+  console.log('Reprocessed images go to Store-upload/Apple-Reprocessed; they are not native Apple captures.');
 }
 
 async function chooseFrameStyles(options) {
@@ -634,7 +676,7 @@ async function chooseFrameStyles(options) {
   const terminal = canPrompt ? readline.createInterface({ input: process.stdin, output: process.stdout }) : null;
 
   try {
-    for (const platform of ['android', 'ios']) {
+    for (const platform of ['android']) {
       if (!choices[platform] && terminal) {
         const names = Object.values(frameStyles[platform]).map((style) => style.label);
         choices[platform] = await terminal.question(
@@ -651,7 +693,7 @@ async function chooseFrameStyles(options) {
     if (terminal) terminal.close();
   }
 
-  console.log(`Frame selection: Android ${choices.android}, iPhone ${choices.ios}.`);
+  console.log(`Frame selection: Android ${choices.android}. Apple captures keep their native appearance.`);
   return choices;
 }
 
@@ -1732,6 +1774,8 @@ async function waitForReplayLayout(client, snapshot) {
 }
 
 function getFrameAdornment(frameType) {
+  if (frameType === 'native-apple') return '';
+
   if (frameType === 'iphone') {
     return '';
   }
@@ -2135,6 +2179,7 @@ function createDeviceFrameHtml(
 ) {
   const screenshotDataUrl = `data:image/${imageFormat === 'jpeg' ? 'jpeg' : 'png'};base64,${screenshotBuffer.toString('base64')}`;
   const aspectRatio = `${imageWidth} / ${imageHeight}`;
+  const useDuoFrame = profile.name === 'iphone-duo' && profile.frameType !== 'native-apple';
   const phonePlatform = profile.frameType === 'iphone' ? 'ios' : profile.frameType === 'android-phone' ? 'android' : null;
   const statusBarPlatform = profile.frameType === 'ipad' ? 'ipad' : phonePlatform;
   const phoneStyle = phonePlatform && frameStyles[phonePlatform][selectedFrameStyles[phonePlatform]];
@@ -2265,7 +2310,7 @@ function createDeviceFrameHtml(
       border-radius: 999px;
       background: #000;
     }
-    ${profile.name === 'iphone-duo' ? `
+    ${useDuoFrame ? `
     .device.iphone-duo {
       --duo-radius: clamp(24px, 4vw, 100px);
       --duo-bezel: clamp(5px, 0.65vw, 14px);
@@ -2614,10 +2659,30 @@ function createDeviceFrameHtml(
   </style>
 </head>
 <body class="${phonePlatform ? 'phone-frame' : ''} ${screenshotCopy ? 'has-copy' : ''}">
+  ${profile.frameType === 'native-apple' ? `<style>
+    .device.native-apple {
+      box-sizing: border-box;
+      width: auto;
+      height: 68%;
+      padding: 0;
+      border: 0;
+      border-radius: 0;
+      background: transparent;
+      box-shadow: 0 2vh 5vh rgba(0,0,0,0.2);
+    }
+    .device.native-apple .screen { border-radius: 0; box-shadow: none; }
+    .device.native-apple .screen img { object-fit: contain; }
+    @media (orientation: landscape) {
+      body.has-copy .device.native-apple {
+        width: min(60vw, ${84 * imageWidth / imageHeight}vh);
+        height: auto;
+      }
+    }
+  </style>` : ''}
   ${createPromotionalDecorations(palette)}
   ${createScreenshotCopyMarkup(screenshotCopy)}
-  <main class="device ${profile.frameType}${profile.name === 'iphone-duo' ? ' iphone-duo' : ''}">
-    <div class="screen">${phoneStatusBar}<img src="${screenshotDataUrl}" />${phoneNavigation}${profile.name === 'iphone-duo' ? '<div class="duo-camera" aria-hidden="true"></div>' : ''}</div>
+  <main class="device ${profile.frameType}${useDuoFrame ? ' iphone-duo' : ''}">
+    <div class="screen">${phoneStatusBar}<img src="${screenshotDataUrl}" />${phoneNavigation}${useDuoFrame ? '<div class="duo-camera" aria-hidden="true"></div>' : ''}</div>
     ${getFrameAdornment(profile.frameType)}
   </main>
 </body>
@@ -3836,6 +3901,134 @@ async function runInteractiveCaptureLoop(
   console.log('\nResponsive screenshot tool closed.');
 }
 
+function isAppleProfile(profile) {
+  return /^(iphone|ipad|apple)(-|$)/.test(profile.name) || profile.name === 'mac';
+}
+
+function validateAppleScreenshot(profile, metadata, fileName) {
+  const family = profile.name === 'iphone-duo' ? 'iphone-duo'
+    : profile.name.startsWith('ipad') ? 'ipad' : 'iphone';
+  const validSize = appleScreenshotSizes[family].some(([width, height]) => (
+    (metadata.width === width && metadata.height === height)
+    || (metadata.width === height && metadata.height === width)
+  ));
+  if (!validSize) {
+    throw new Error(`${fileName}: ${metadata.width}x${metadata.height} is not a supported full-display ${family} screenshot size. Capture the correct Apple device; do not resize another device's image.`);
+  }
+  if (metadata.hasAlpha) {
+    throw new Error(`${fileName}: Apple screenshots cannot include an alpha channel. Export an RGB PNG without transparency.`);
+  }
+}
+
+async function importAppleScreenshots(options) {
+  const profiles = selectProfiles(options.profiles);
+  if (!options.profiles || profiles.length !== 1
+    || !['iphone', 'iphone-duo', 'ipad', 'iphone-store', 'ipad-store'].includes(profiles[0].name)) {
+    throw new Error('--apple-source requires one profile: iphone, iphone-duo, ipad, iphone-store, or ipad-store.');
+  }
+  if (options.frameExisting || options.reframeExisting || options.dryRun
+    || options.refreshInfo || options.vivoExisting || options.oppoExisting
+    || options.amazonAssets || options.samsungAssets || options.prefix || options.screenshots
+    || options.deleteRequested || options.iosFrame) {
+    throw new Error('Use --apple-source separately from capture, reframe, asset, and screenshot-selection options.');
+  }
+
+  const sourceDirectory = fs.realpathSync(path.resolve(options.appleSource));
+  const isExistingSource = options.appleExisting
+    && sourceDirectory === fs.realpathSync(path.join(screenshotDirectory, profiles[0].outputDirectory));
+  if (options.appleExisting && !isExistingSource) {
+    throw new Error('--apple-existing only reads the selected Store-image-Screenshot profile folder.');
+  }
+  for (const legacyProfile of isExistingSource ? [] : deviceProfiles.filter(isAppleProfile)) {
+    for (const root of [screenshotDirectory, inFrameDirectory, uploadDirectory]) {
+      const legacyDirectory = path.join(root, legacyProfile.outputDirectory);
+      if (!fs.existsSync(legacyDirectory)) continue;
+      const relative = path.relative(fs.realpathSync(legacyDirectory), sourceDirectory);
+      if (!relative || (relative !== '..' && !relative.startsWith(`..${path.sep}`) && !path.isAbsolute(relative))) {
+        throw new Error('This source is a legacy Android replay/framed Apple output. Import original captures from the actual Apple app instead.');
+      }
+    }
+  }
+  const sourceFiles = fs.readdirSync(sourceDirectory, { withFileTypes: true })
+    .filter((entry) => entry.isFile() && /\.png$/i.test(entry.name))
+    .map((entry) => entry.name)
+    .sort((first, second) => first.localeCompare(second, undefined, { numeric: true }));
+  if (!sourceFiles.length) throw new Error('No PNG captures found in --apple-source.');
+
+  const profile = profiles[0];
+  const nativeDirectory = path.join(uploadDirectory, isExistingSource ? 'Apple-Reprocessed' : 'Apple-Native');
+  const originalsDirectory = path.join(nativeDirectory, 'Originals', profile.outputDirectory);
+  const promotionalDirectory = path.join(nativeDirectory, 'Promotional');
+  // Preflight the complete import before writing anything. Never overwrite previous assets.
+  const captures = [];
+  const sizeCounts = new Map();
+  const plannedOutputs = new Set();
+  for (const fileName of sourceFiles) {
+    const buffer = fs.readFileSync(path.join(sourceDirectory, fileName));
+    const metadata = await sharp(buffer).metadata();
+    if (metadata.format !== 'png' || !metadata.width || !metadata.height
+      || (metadata.pages || 1) !== 1 || (metadata.orientation && metadata.orientation !== 1)) {
+      throw new Error(`Use an unrotated, single-image PNG capture: ${fileName}`);
+    }
+    validateAppleScreenshot(profile, metadata, fileName);
+    // Decode the whole image before copying it; a valid PNG header alone is insufficient.
+    await sharp(buffer).stats();
+    const size = `${metadata.width}x${metadata.height}`;
+    if (!sizeCounts.has(size)) {
+      const existingDirectory = path.join(originalsDirectory, size);
+      const existingCount = fs.existsSync(existingDirectory)
+        ? fs.readdirSync(existingDirectory).filter((name) => /\.png$/i.test(name)).length : 0;
+      sizeCounts.set(size, existingCount);
+    }
+    sizeCounts.set(size, sizeCounts.get(size) + 1);
+    if (sizeCounts.get(size) > 10) throw new Error(`Apple allows up to 10 screenshots per size; ${size} exceeds that limit.`);
+    const originalPath = path.join(originalsDirectory, size, fileName);
+    const promotionalPath = path.join(promotionalDirectory, profile.outputDirectory, size, `${path.parse(fileName).name}.png`);
+    for (const target of [originalPath, ...(options.applePromotional ? [promotionalPath] : [])]) {
+      if (fs.existsSync(target)) throw new Error(`Output already exists; move it or rename the input first: ${target}`);
+      const key = target.toLowerCase();
+      if (plannedOutputs.has(key)) throw new Error(`Duplicate output filename: ${fileName}`);
+      plannedOutputs.add(key);
+    }
+    if (options.applePromotional && !getScreenshotCopy(fileName)) {
+      throw new Error(`No promotional copy for ${fileName}. Use a matching screenshot-copy.json name or omit --apple-promotional.`);
+    }
+    captures.push({ fileName, buffer, metadata, originalPath, size });
+  }
+
+  let browser;
+  let client;
+  try {
+    if (options.applePromotional) {
+      browser = await launchReplayBrowser();
+      client = await createReplayPage(browser);
+    }
+    for (const { fileName, buffer, metadata, originalPath, size } of captures) {
+      fs.mkdirSync(path.dirname(originalPath), { recursive: true });
+      fs.writeFileSync(originalPath, buffer, { flag: 'wx' });
+      console.log(`Saved unchanged source image (${metadata.width}x${metadata.height}): ${originalPath}`);
+      if (client) {
+        await captureFramedScreenshot(client, buffer, {
+          ...profile,
+          outputDirectory: path.join(profile.outputDirectory, size),
+          frameType: 'native-apple',
+          screenshotOnly: false,
+          framedWidth: metadata.width,
+          framedHeight: metadata.height,
+        }, fileName, true, promotionalDirectory);
+      }
+    }
+  } finally {
+    if (client) client.close();
+    if (browser) await closeReplayBrowser(browser);
+  }
+  console.log('Apple image processing complete. Source dimensions are preserved; no system bars or device frames were added.');
+  console.log(isExistingSource
+    ? 'These images reuse Android-derived app content; they are not native iOS/iPadOS captures.'
+    : 'Use captures from the actual iOS/iPadOS app; this tool cannot verify their origin.');
+  console.log('Check current App Store Connect size requirements and replace old screenshots in every size/localization.');
+}
+
 async function getInteractiveOptions(options) {
   if (
     !process.stdin.isTTY
@@ -3882,6 +4075,34 @@ async function main() {
     return;
   }
 
+  if (options.appleExisting) {
+    if (options.appleSource) throw new Error('Use --apple-existing separately from --apple-source.');
+    const profiles = selectProfiles(options.profiles || 'iphone,iphone-duo,ipad');
+    if (profiles.some((profile) => !['iphone', 'iphone-duo', 'ipad', 'iphone-store', 'ipad-store'].includes(profile.name))) {
+      throw new Error('--apple-existing supports only iPhone/iPad screenshot profiles.');
+    }
+    for (const profile of profiles) {
+      await importAppleScreenshots({
+        ...options,
+        profiles: profile.name,
+        appleSource: path.join(screenshotDirectory, profile.outputDirectory),
+        applePromotional: true,
+      });
+    }
+    return;
+  }
+
+  if (options.appleSource) {
+    await importAppleScreenshots(options);
+    return;
+  }
+  if (options.applePromotional) {
+    throw new Error('--apple-promotional requires --apple-source.');
+  }
+  if (options.iosFrame) {
+    throw new Error('--ios-frame is no longer used. Import native Apple captures with --apple-source.');
+  }
+
   if (options.deleteRequested) {
     deleteMatchingImages(options.deleteNames);
     return;
@@ -3889,6 +4110,21 @@ async function main() {
 
   options = await getInteractiveOptions(options);
 
+  if (!options.amazonAssets && !options.samsungAssets && !options.vivoExisting
+    && !options.oppoExisting && !options.refreshInfo) {
+    const selected = selectProfiles(options.profiles);
+    const appleProfiles = selected.filter(isAppleProfile);
+    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.');
+      }
+      options.profiles = selected.filter((profile) => !isAppleProfile(profile))
+        .map((profile) => profile.name).join(',');
+      console.log('Skipping all Apple Android replay profiles. Import native iPhone/iPad captures with --apple-source.');
+    }
+  }
+
   if (!options.dryRun) {
     initializeScreenshotData();
   }
@@ -4022,7 +4258,7 @@ async function main() {
     replayClient = await createReplayPage(replayBrowser);
 
     console.log(
-      'Apple, TV, Chromebook, Mac, and XR profiles are viewport approximations of the live Android WebView.',
+      'Non-Apple profiles are viewport approximations of the live Android WebView. Apple profiles require native captures.',
     );
 
     if (interactiveMode) {

package/package.json

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