vxrn 2.0.0-beta.129.1 → 2.0.0-beta.131.1

package/dist/exports/prebuildWithoutExpo.mjs

@@ -10,6 +10,8 @@ import { swiftPackageDirectories } from "../utils/swiftPackageId.mjs";
 const nativeProjectPatches = module.createRequire(import.meta.url)("../../native-project-patches.cjs");
 const notificationsHost = nativeProjectPatches.ONE_NOTIFICATIONS;
 const updatesHost = nativeProjectPatches.ONE_UPDATES;
+const PORTRAIT_ORIENTATIONS = ["UIInterfaceOrientationPortrait", "UIInterfaceOrientationPortraitUpsideDown"];
+const LANDSCAPE_ORIENTATIONS = ["UIInterfaceOrientationLandscapeLeft", "UIInterfaceOrientationLandscapeRight"];
 const validatePrebuildApp = validateNativeApp;
 const ANDROID_DENSITIES = {
 	mdpi: 1,
@@ -245,7 +247,7 @@ function patchIosPbxprojSceneDelegate(rendered, appName) {
 	}
 	return patched;
 }
-function patchIosPbxprojPushEntitlements(rendered, appName) {
+function patchIosPbxprojAppEntitlements(rendered, appName) {
 	const edits = [["/* AppDelegate.swift */ = {isa = PBXFileReference;", `		${PUSH_ENTITLEMENTS_FILE_REF_ID} /* ${appName}.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = ${appName}.entitlements; path = ${appName}/${appName}.entitlements; sourceTree = "<group>"; };`], ["/* AppDelegate.swift */,", `				${PUSH_ENTITLEMENTS_FILE_REF_ID} /* ${appName}.entitlements */,`]];
 	let patched = rendered;
 	for (const [anchor, insertion] of edits) {
@@ -262,13 +264,55 @@ function patchIosPbxprojPushEntitlements(rendered, appName) {
 	return patched.split(setting).join(`${setting}
 				CODE_SIGN_ENTITLEMENTS = ${appName}/${appName}.entitlements;`);
 }
-function renderPushEntitlements() {
+function renderPlistValue(value, indent) {
+	if (typeof value === "string") return `${indent}<string>${escapeXml(value)}</string>`;
+	if (typeof value === "boolean") return `${indent}<${value}/>`;
+	if (typeof value === "number") {
+		return Number.isInteger(value) ? `${indent}<integer>${value}</integer>` : `${indent}<real>${value}</real>`;
+	}
+	if (Array.isArray(value)) {
+		return `${indent}<array>
+${value.map((item) => renderPlistValue(item, `${indent}	`)).join("\n")}
+${indent}</array>`;
+	}
+	return `${indent}<dict>
+${renderPlistEntries(value, `${indent}	`)}
+${indent}</dict>`;
+}
+function renderPlistEntries(entries, indent) {
+	return Object.entries(entries).map(([key, value]) => `${indent}<key>${escapeXml(key)}</key>
+${renderPlistValue(value, indent)}`).join("\n");
+}
+function appEntitlements(app) {
+	const modeled = {};
+	if (app.notifications?.push === true || app.ios?.widgets?.pushNotifications) {
+		modeled["aps-environment"] = notificationsHost.apsEnvironment;
+	}
+	if (app.ios?.widgets) {
+		modeled["com.apple.security.application-groups"] = [app.ios.widgets.appGroup];
+	}
+	if (app.ios?.associatedDomains?.length) {
+		modeled["com.apple.developer.associated-domains"] = app.ios.associatedDomains;
+	}
+	if (app.ios?.usesAppleSignIn) {
+		modeled["com.apple.developer.applesignin"] = ["Default"];
+	}
+	for (const key of Object.keys(app.ios?.entitlements ?? {})) {
+		if (key in modeled) {
+			throw new Error(`[vxrn] native.app.ios.entitlements sets ${key}, which native.app already writes: use its field`);
+		}
+	}
+	return {
+		...modeled,
+		...app.ios?.entitlements
+	};
+}
+function renderEntitlements(entries) {
 	return `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>aps-environment</key>
-	<string>${notificationsHost.apsEnvironment}</string>
+${renderPlistEntries(entries, "	")}
 </dict>
 </plist>
 `;
@@ -407,8 +451,9 @@ function generateSceneDelegate(args) {
 	const { dest, platform, app } = args;
 	if (platform !== "ios") return;
 	FSExtra.writeFileSync(path.join(dest, app.name, "SceneDelegate.swift"), renderSceneDelegateSwift(app.name));
-	if (app.notifications?.push === true && !app.ios?.widgets) {
-		FSExtra.writeFileSync(path.join(dest, app.name, `${app.name}.entitlements`), renderPushEntitlements());
+	const entitlements = appEntitlements(app);
+	if (Object.keys(entitlements).length && !app.ios?.widgets) {
+		FSExtra.writeFileSync(path.join(dest, app.name, `${app.name}.entitlements`), renderEntitlements(entitlements));
 	}
 }
 function generateIosWidgets(dest, app) {
@@ -421,7 +466,7 @@ function generateIosWidgets(dest, app) {
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0"><dict><key>com.apple.security.application-groups</key><array><string>${escapeXml(widgets.appGroup)}</string></array></dict></plist>
 `;
-	FSExtra.writeFileSync(path.join(appDir, "OneAppWidgets.entitlements"), widgets.pushNotifications || app.notifications?.push ? entitlements.replace("</dict></plist>", `<key>aps-environment</key><string>${notificationsHost.apsEnvironment}</string></dict></plist>`) : entitlements);
+	FSExtra.writeFileSync(path.join(appDir, "OneAppWidgets.entitlements"), renderEntitlements(appEntitlements(app)));
 	FSExtra.writeFileSync(path.join(extensionDir, "OneWidgets.entitlements"), entitlements);
 	FSExtra.writeFileSync(path.join(extensionDir, "WidgetInfo.plist"), `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
@@ -964,6 +1009,46 @@ async function generateAppIcons(args) {
 		}
 	}
 }
+async function generateAdaptiveIcon(args) {
+	const { root, dest, app } = args;
+	const adaptiveIcon = app.android?.adaptiveIcon;
+	if (!adaptiveIcon) return;
+	const res = path.join(dest, "app", "src", "main", "res");
+	const layers = {
+		foreground: adaptiveIcon.foreground,
+		background: adaptiveIcon.background,
+		monochrome: adaptiveIcon.monochrome
+	};
+	for (const [layer, file] of Object.entries(layers)) {
+		if (!file) continue;
+		const source = path.resolve(root, file);
+		if (!FSExtra.existsSync(source)) {
+			throw new Error(`[vxrn] native.app.android.adaptiveIcon.${layer} does not exist: ${source}`);
+		}
+		for (const [density, multiplier] of Object.entries(ANDROID_DENSITIES)) {
+			const pixels = 108 * multiplier;
+			await sharp(source).rotate().resize(pixels, pixels, { fit: "cover" }).png().toFile(path.join(res, `mipmap-${density}`, `ic_launcher_${layer}.png`));
+		}
+	}
+	if (!adaptiveIcon.background) {
+		FSExtra.writeFileSync(path.join(res, "values", "ic_launcher_background.xml"), `<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">${adaptiveIcon.backgroundColor ?? "#FFFFFF"}</color>
+</resources>
+`);
+	}
+	const adaptiveXml = `<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="${adaptiveIcon.background ? "@mipmap/ic_launcher_background" : "@color/ic_launcher_background"}"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+${adaptiveIcon.monochrome ? "    <monochrome android:drawable=\"@mipmap/ic_launcher_monochrome\"/>\n" : ""}</adaptive-icon>
+`;
+	const anydpi = path.join(res, "mipmap-anydpi-v26");
+	FSExtra.mkdirSync(anydpi, { recursive: true });
+	for (const filename of ["ic_launcher.xml", "ic_launcher_round.xml"]) {
+		FSExtra.writeFileSync(path.join(anydpi, filename), adaptiveXml);
+	}
+}
 async function generateSplashScreen(args) {
 	const { root, dest, platform, app } = args;
 	if (!app.splash) return;
@@ -971,7 +1056,9 @@ async function generateSplashScreen(args) {
 	if (!FSExtra.existsSync(source)) {
 		throw new Error(`[vxrn] native.app.splash source does not exist: ${source}`);
 	}
-	const { data: artwork, info: metadata } = await sharp(source).rotate().trim({ background: app.splash.backgroundColor }).png().toBuffer({ resolveWithObject: true });
+	const cover = app.splash.resizeMode === "cover";
+	const image = sharp(source).rotate();
+	const { data: artwork, info: metadata } = await (cover ? image : image.trim({ background: app.splash.backgroundColor })).png().toBuffer({ resolveWithObject: true });
 	if (!metadata.width || !metadata.height) {
 		throw new Error("[vxrn] native.app.splash source must be an image");
 	}
@@ -1012,14 +1099,17 @@ async function generateSplashScreen(args) {
           <view key="view" contentMode="scaleToFill" id="launch-view">
             <rect key="frame" x="0.0" y="0.0" width="390" height="844"/>
             <subviews>
-              <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="Splash" translatesAutoresizingMaskIntoConstraints="NO" id="splash-image"/>
+              <imageView userInteractionEnabled="NO" contentMode="${cover ? "scaleAspectFill" : "scaleAspectFit"}" image="Splash" translatesAutoresizingMaskIntoConstraints="NO" id="splash-image"/>
             </subviews>
             <color key="backgroundColor" red="${red}" green="${green}" blue="${blue}" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
-              <constraint firstItem="splash-image" firstAttribute="centerX" secondItem="launch-view" secondAttribute="centerX" id="splash-center-x"/>
+${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"/>
+              <constraint firstItem="splash-image" firstAttribute="bottom" secondItem="launch-view" secondAttribute="bottom" id="splash-bottom"/>` : `              <constraint firstItem="splash-image" firstAttribute="centerX" secondItem="launch-view" secondAttribute="centerX" id="splash-center-x"/>
               <constraint firstItem="splash-image" firstAttribute="centerY" secondItem="launch-view" secondAttribute="centerY" id="splash-center-y"/>
               <constraint firstItem="splash-image" firstAttribute="width" constant="${artworkWidth}" id="splash-width"/>
-              <constraint firstItem="splash-image" firstAttribute="height" constant="${artworkHeight}" id="splash-height"/>
+              <constraint firstItem="splash-image" firstAttribute="height" constant="${artworkHeight}" id="splash-height"/>`}
             </constraints>
           </view>
         </viewController>
@@ -1161,6 +1251,27 @@ ${schemes.map((scheme) => `				<string>${scheme}</string>`).join("\n")}
 				stamps.push(`	<key>${updatesHost.runtimeVersionInfoPlistKey}</key>
 	<string>${escapeXml(app.updates.runtimeVersion)}</string>`);
 			}
+			if (app.userInterfaceStyle !== void 0) {
+				stamps.push(`	<key>UIUserInterfaceStyle</key>
+	<string>${app.userInterfaceStyle === "light" ? "Light" : app.userInterfaceStyle === "dark" ? "Dark" : "Automatic"}</string>`);
+			}
+			if (app.orientation !== void 0) {
+				const phoneOrientations = app.orientation === "portrait" ? PORTRAIT_ORIENTATIONS : app.orientation === "landscape" ? LANDSCAPE_ORIENTATIONS : [...PORTRAIT_ORIENTATIONS, ...LANDSCAPE_ORIENTATIONS];
+				const phoneList = /\t<key>UISupportedInterfaceOrientations<\/key>\n\t<array>\n[\s\S]*?\t<\/array>/;
+				if (!phoneList.test(rendered)) {
+					throw new Error(`[vxrn] prebuild template ${relativePath} lost its UISupportedInterfaceOrientations list`);
+				}
+				rendered = rendered.replace(phoneList, `	<key>UISupportedInterfaceOrientations</key>
+	<array>
+${phoneOrientations.map((orientation) => `		<string>${orientation}</string>`).join("\n")}
+	</array>`);
+			}
+			for (const [key, value] of Object.entries(app.ios?.infoPlist ?? {})) {
+				if (rendered.includes(`<key>${key}</key>`) || stamps.some((stamp) => stamp.includes(`<key>${key}</key>`))) {
+					throw new Error(`[vxrn] native.app.ios.infoPlist sets ${key}, which the template or native.app already writes: use its field`);
+				}
+				stamps.push(renderPlistEntries({ [key]: value }, "	"));
+			}
 			if (stamps.length) {
 				const anchor = "	<key>LSRequiresIPhoneOS</key>";
 				if (!rendered.includes(anchor)) throw new Error(`[vxrn] prebuild template ${relativePath} lost its LSRequiresIPhoneOS anchor`);
@@ -1265,6 +1376,44 @@ ${line}
 `;
 			}
 		}
+		if (platform === "android" && relativePath === "app/src/main/res/values/styles.xml" && (app.userInterfaceStyle === "light" || app.userInterfaceStyle === "dark")) {
+			const dayNight = "parent=\"Theme.AppCompat.DayNight.NoActionBar\"";
+			if (!rendered.includes(dayNight)) {
+				throw new Error(`[vxrn] cannot lock userInterfaceStyle: expected ${dayNight} in app/src/main/res/values/styles.xml`);
+			}
+			rendered = rendered.replace(dayNight, app.userInterfaceStyle === "light" ? "parent=\"Theme.AppCompat.Light.NoActionBar\"" : "parent=\"Theme.AppCompat.NoActionBar\"");
+		}
+		if (platform === "android" && relativePath === "app/src/main/AndroidManifest.xml" && (app.android?.permissions?.length || app.android?.blockedPermissions?.length)) {
+			const anchor = "<uses-permission android:name=\"android.permission.INTERNET\" />";
+			if (!rendered.includes(anchor)) {
+				throw new Error("[vxrn] cannot stamp permissions: expected the INTERNET permission in app/src/main/AndroidManifest.xml");
+			}
+			const permissionName = (name) => name.includes(".") ? name : `android.permission.${name}`;
+			const lines = [...(app.android?.permissions ?? []).map((name) => `    <uses-permission android:name="${permissionName(name)}" />`), ...(app.android?.blockedPermissions ?? []).map((name) => `    <uses-permission android:name="${permissionName(name)}" tools:node="remove" />`)];
+			rendered = rendered.replace(anchor, `${anchor}
+${lines.join("\n")}`);
+			if (app.android?.blockedPermissions?.length && !rendered.includes("xmlns:tools=")) {
+				rendered = rendered.replace("xmlns:android=\"http://schemas.android.com/apk/res/android\"", "xmlns:android=\"http://schemas.android.com/apk/res/android\"\n    xmlns:tools=\"http://schemas.android.com/tools\"");
+			}
+		}
+		if (platform === "android" && relativePath === "app/src/main/AndroidManifest.xml" && app.android?.appLinks?.length) {
+			rendered = rendered.replace("      </activity>", `        <intent-filter android:autoVerify="true">
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.DEFAULT" />
+            <category android:name="android.intent.category.BROWSABLE" />
+            <data android:scheme="https" />
+${app.android.appLinks.map((link) => `            <data android:host="${link.host}"${link.pathPrefix ? ` android:pathPrefix="${link.pathPrefix}"` : ""} />`).join("\n")}
+        </intent-filter>
+      </activity>`);
+		}
+		if (platform === "android" && relativePath === "app/src/main/AndroidManifest.xml" && app.orientation !== void 0) {
+			const anchor = "android:name=\".MainActivity\"";
+			if (!rendered.includes(anchor)) {
+				throw new Error("[vxrn] cannot stamp the orientation: expected .MainActivity in app/src/main/AndroidManifest.xml");
+			}
+			rendered = rendered.replace(anchor, `${anchor}
+        android:screenOrientation="${app.orientation === "default" ? "unspecified" : app.orientation}"`);
+		}
 		if (platform === "android" && relativePath === "app/src/main/AndroidManifest.xml" && app.pictureInPicture) {
 			const anchor = "android:name=\".MainActivity\"";
 			if (!rendered.includes(anchor)) {
@@ -1370,8 +1519,8 @@ end`);
 			rendered = patchIosBundlePhase(rendered, app.updates?.runtimeVersion);
 			rendered = patchIosPbxprojSceneDelegate(rendered, appName);
 			rendered = patchIosPbxprojOneBridgingHeader(rendered, appName);
-			if (app.notifications?.push === true && !app.ios?.widgets) {
-				rendered = patchIosPbxprojPushEntitlements(rendered, appName);
+			if (Object.keys(appEntitlements(app)).length && !app.ios?.widgets) {
+				rendered = patchIosPbxprojAppEntitlements(rendered, appName);
 			}
 			if (app.ios?.widgets) rendered = patchIosPbxprojWidgets(rendered, app);
 		}
@@ -1416,8 +1565,14 @@ use_frameworks! :linkage => :${app.ios.useFrameworks}`);
 			}
 			rendered = rendered.replace(hardcodedGradlePlugin, `includeBuild(new File(["node", "--print", "require('module').createRequire(require.resolve('react-native/package.json')).resolve('@react-native/gradle-plugin/package.json')"].execute(null, settingsDir).text.trim()).parentFile.canonicalPath)`);
 		}
-		if (platform === "android" && app.android?.minSdk !== void 0) {
-			rendered = rendered.replace(/minSdkVersion = \d+/g, `minSdkVersion = ${app.android.minSdk}`);
+		for (const [field, setting] of [
+			["minSdk", "minSdkVersion"],
+			["targetSdk", "targetSdkVersion"],
+			["compileSdk", "compileSdkVersion"]
+		]) {
+			const value = platform === "android" ? app.android?.[field] : void 0;
+			if (value === void 0) continue;
+			rendered = rendered.replace(new RegExp(`${setting} = \\d+`, "g"), `${setting} = ${value}`);
 		}
 	}
 	return {
@@ -1474,6 +1629,11 @@ const generateForPlatform = async (root, platform, app, outDir = path.resolve(ro
 		platform,
 		app
 	});
+	if (platform === "android") await generateAdaptiveIcon({
+		root,
+		dest,
+		app
+	});
 	await generateSplashScreen({
 		root,
 		dest,