vxrn 2.0.0-beta.132.1 → 2.0.0-beta.133.1

package/dist/exports/prebuildWithoutExpo.mjs

@@ -335,7 +335,7 @@ ${renderPlistValue(value, indent)}`).join("\n");
 function appEntitlements(app) {
 	const modeled = {};
 	if (app.notifications?.push === true || app.ios?.widgets?.pushNotifications) {
-		modeled["aps-environment"] = notificationsHost.apsEnvironment;
+		modeled["aps-environment"] = app.notifications?.apsEnvironment ?? notificationsHost.apsEnvironment;
 	}
 	if (app.ios?.widgets) {
 		modeled["com.apple.security.application-groups"] = [app.ios.widgets.appGroup];
@@ -1098,6 +1098,52 @@ ${adaptiveIcon.monochrome ? "    <monochrome android:drawable=\"@mipmap/ic_launc
 		FSExtra.writeFileSync(path.join(anydpi, filename), adaptiveXml);
 	}
 }
+const IOS_DARK_APPEARANCE = [{
+	appearance: "luminosity",
+	value: "dark"
+}];
+function srgb(hex) {
+	return {
+		red: Number.parseInt(hex.slice(1, 3), 16) / 255,
+		green: Number.parseInt(hex.slice(3, 5), 16) / 255,
+		blue: Number.parseInt(hex.slice(5, 7), 16) / 255
+	};
+}
+function xcodeColorSet(light, dark) {
+	const entry = (hex) => {
+		const { red, green, blue } = srgb(hex);
+		return {
+			color: {
+				"color-space": "srgb",
+				components: {
+					red: red.toFixed(3),
+					green: green.toFixed(3),
+					blue: blue.toFixed(3),
+					alpha: "1.000"
+				}
+			},
+			idiom: "universal"
+		};
+	};
+	return `${JSON.stringify({
+		colors: [entry(light), ...dark ? [{
+			appearances: IOS_DARK_APPEARANCE,
+			...entry(dark)
+		}] : []],
+		info: {
+			author: "xcode",
+			version: 1
+		}
+	}, null, 2)}
+`;
+}
+function generateAccentColor(args) {
+	const accent = args.app.ios?.accentColor;
+	if (!accent) return;
+	const colorDir = path.join(args.dest, args.app.name, "Images.xcassets", "AccentColor.colorset");
+	FSExtra.mkdirSync(colorDir, { recursive: true });
+	FSExtra.writeFileSync(path.join(colorDir, "Contents.json"), xcodeColorSet(accent.light, accent.dark));
+}
 async function generateSplashScreen(args) {
 	const { root, dest, platform, app } = args;
 	if (!app.splash) return;
@@ -1107,7 +1153,9 @@ async function generateSplashScreen(args) {
 		if (!FSExtra.existsSync(source)) {
 			throw new Error(`[vxrn] native.app.splash source does not exist: ${source}`);
 		}
-		const image = sharp(source).rotate();
+		const { width: sourceWidth, format } = await sharp(source).metadata();
+		const density = format === "svg" && sourceWidth && !cover ? Math.min(2400, Math.ceil(72 * 4 * (app.splash?.width ?? 200) / sourceWidth)) : void 0;
+		const image = sharp(source, density ? { density } : {}).rotate();
 		const prepared = await (cover ? image : image.trim({ background: backgroundColor })).png().toBuffer({ resolveWithObject: true });
 		if (!prepared.info.width || !prepared.info.height) {
 			throw new Error("[vxrn] native.app.splash source must be an image");
@@ -1121,64 +1169,63 @@ async function generateSplashScreen(args) {
 	const artworkHeight = Number((artworkWidth * (metadata.height / metadata.width)).toFixed(3));
 	if (platform === "ios") {
 		const appDir = path.join(dest, app.name);
-		const splashDir = path.join(appDir, "Images.xcassets", "Splash.imageset");
-		FSExtra.mkdirSync(splashDir, { recursive: true });
-		const darkAppearance = [{
-			appearance: "luminosity",
-			value: "dark"
-		}];
-		await sharp(artwork).toFile(path.join(splashDir, "splash.png"));
-		if (darkArtwork) await sharp(darkArtwork).toFile(path.join(splashDir, "splash-dark.png"));
-		FSExtra.writeFileSync(path.join(splashDir, "Contents.json"), `${JSON.stringify({
-			images: [{
-				filename: "splash.png",
-				idiom: "universal",
-				scale: "1x"
-			}, ...darkArtwork ? [{
-				appearances: darkAppearance,
-				filename: "splash-dark.png",
-				idiom: "universal",
-				scale: "1x"
-			}] : []],
-			info: {
-				author: "xcode",
-				version: 1
-			}
-		}, null, 2)}
+		const assets = path.join(appDir, "Images.xcassets");
+		const writeImageSet = async (name, light, dark2, pointWidth) => {
+			const dir = path.join(assets, `${name}.imageset`);
+			FSExtra.mkdirSync(dir, { recursive: true });
+			const scales = pointWidth === void 0 ? [1] : [
+				1,
+				2,
+				3
+			];
+			const images = [];
+			for (const [variant, suffix, appearances] of [[
+				light,
+				"",
+				void 0
+			], [
+				dark2,
+				"-dark",
+				IOS_DARK_APPEARANCE
+			]]) {
+				if (!variant) continue;
+				for (const scale of scales) {
+					const filename = `${name.toLowerCase()}${suffix}${scale === 1 ? "" : `@${scale}x`}.png`;
+					const output = sharp(variant);
+					await (pointWidth === void 0 ? output : output.resize({ width: Math.round(pointWidth * scale) })).png().toFile(path.join(dir, filename));
+					images.push({
+						...appearances ? { appearances } : {},
+						filename,
+						idiom: "universal",
+						scale: `${scale}x`
+					});
+				}
+			}
+			FSExtra.writeFileSync(path.join(dir, "Contents.json"), `${JSON.stringify({
+				images,
+				info: {
+					author: "xcode",
+					version: 1
+				}
+			}, null, 2)}
 `);
-		const srgb = (hex) => ({
-			red: Number.parseInt(hex.slice(1, 3), 16) / 255,
-			green: Number.parseInt(hex.slice(3, 5), 16) / 255,
-			blue: Number.parseInt(hex.slice(5, 7), 16) / 255
-		});
-		const colorEntry = (hex) => {
-			const { red: red2, green: green2, blue: blue2 } = srgb(hex);
-			return {
-				color: {
-					"color-space": "srgb",
-					components: {
-						red: red2.toFixed(3),
-						green: green2.toFixed(3),
-						blue: blue2.toFixed(3),
-						alpha: "1.000"
-					}
-				},
-				idiom: "universal"
-			};
 		};
-		const colorDir = path.join(appDir, "Images.xcassets", "SplashBackground.colorset");
+		await writeImageSet("Splash", artwork, darkArtwork, cover ? void 0 : artworkWidth);
+		const readBackground = (sourcePath) => {
+			const source = path.resolve(root, sourcePath);
+			if (!FSExtra.existsSync(source)) {
+				throw new Error(`[vxrn] native.app.splash backgroundImage does not exist: ${source}`);
+			}
+			return sharp(source).rotate().png().toBuffer({ resolveWithObject: true });
+		};
+		const background = app.splash.backgroundImage ? await readBackground(app.splash.backgroundImage) : void 0;
+		const darkBackground = dark?.backgroundImage ? (await readBackground(dark.backgroundImage)).data : void 0;
+		if (background) {
+			await writeImageSet("SplashBackgroundImage", background.data, darkBackground, void 0);
+		}
+		const colorDir = path.join(assets, "SplashBackground.colorset");
 		FSExtra.mkdirSync(colorDir, { recursive: true });
-		FSExtra.writeFileSync(path.join(colorDir, "Contents.json"), `${JSON.stringify({
-			colors: [colorEntry(app.splash.backgroundColor), ...dark ? [{
-				appearances: darkAppearance,
-				...colorEntry(dark.backgroundColor)
-			}] : []],
-			info: {
-				author: "xcode",
-				version: 1
-			}
-		}, null, 2)}
-`);
+		FSExtra.writeFileSync(path.join(colorDir, "Contents.json"), xcodeColorSet(app.splash.backgroundColor, dark?.backgroundColor));
 		const { red, green, blue } = srgb(app.splash.backgroundColor);
 		FSExtra.writeFileSync(path.join(appDir, "LaunchScreen.storyboard"), `<?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="launch-controller">
@@ -1194,11 +1241,16 @@ async function generateSplashScreen(args) {
         <viewController id="launch-controller" sceneMemberID="viewController">
           <view key="view" contentMode="scaleToFill" id="launch-view">
             <rect key="frame" x="0.0" y="0.0" width="390" height="844"/>
-            <subviews>
+            <subviews>${background ? `
+              <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" image="SplashBackgroundImage" translatesAutoresizingMaskIntoConstraints="NO" id="splash-background"/>` : ""}
               <imageView userInteractionEnabled="NO" contentMode="${cover ? "scaleAspectFill" : "scaleAspectFit"}" image="Splash" translatesAutoresizingMaskIntoConstraints="NO" id="splash-image"/>
             </subviews>
             <color key="backgroundColor" name="SplashBackground"/>
-            <constraints>
+            <constraints>${background ? `
+              <constraint firstItem="splash-background" firstAttribute="leading" secondItem="launch-view" secondAttribute="leading" id="splash-background-leading"/>
+              <constraint firstItem="splash-background" firstAttribute="trailing" secondItem="launch-view" secondAttribute="trailing" id="splash-background-trailing"/>
+              <constraint firstItem="splash-background" firstAttribute="top" secondItem="launch-view" secondAttribute="top" id="splash-background-top"/>
+              <constraint firstItem="splash-background" firstAttribute="bottom" secondItem="launch-view" secondAttribute="bottom" id="splash-background-bottom"/>` : ""}
 ${cover ? `              <constraint firstItem="splash-image" firstAttribute="leading" secondItem="launch-view" secondAttribute="leading" id="splash-leading"/>
               <constraint firstItem="splash-image" firstAttribute="trailing" secondItem="launch-view" secondAttribute="trailing" id="splash-trailing"/>
               <constraint firstItem="splash-image" firstAttribute="top" secondItem="launch-view" secondAttribute="top" id="splash-top"/>
@@ -1214,7 +1266,8 @@ ${cover ? `              <constraint firstItem="splash-image" firstAttribute="le
     </scene>
   </scenes>
   <resources>
-    <image name="Splash" width="${metadata.width}" height="${metadata.height}"/>
+    <image name="Splash" width="${cover ? metadata.width : artworkWidth}" height="${cover ? metadata.height : artworkHeight}"/>${background ? `
+    <image name="SplashBackgroundImage" width="${background.info.width}" height="${background.info.height}"/>` : ""}
     <namedColor name="SplashBackground">
       <color red="${red}" green="${green}" blue="${blue}" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
     </namedColor>
@@ -1334,6 +1387,9 @@ ${schemes.map((scheme) => `				<string>${scheme}</string>`).join("\n")}
 				stamps.push(`	<key>ITSAppUsesNonExemptEncryption</key>
 	<${app.ios.usesNonExemptEncryption ? "true" : "false"}/>`);
 			}
+			if (app.ios?.accentColor) {
+				stamps.push("	<key>NSAccentColorName</key>\n	<string>AccentColor</string>");
+			}
 			if (app.ios?.fileSharing) {
 				stamps.push(`	<key>UIFileSharingEnabled</key>
 	<true/>
@@ -1797,6 +1853,10 @@ const generateForPlatform = async (root, platform, app, outDir = path.resolve(ro
 		platform,
 		app
 	});
+	if (platform === "ios") generateAccentColor({
+		dest,
+		app
+	});
 	copyAppResources({
 		root,
 		dest,