craft-native 0.0.442 → 0.0.443

package/dist/android/src/index.d.ts

@@ -122,6 +122,18 @@ export interface CraftAndroidConfig {
     }>;
     trustedOrigins?: string[];
     appIconPath?: string;
+    /**
+     * The launch splash: a directory laid out as Android resources, holding
+     * `drawable-<density>/splash_icon.png` (Android 12's splash icon, 288dp
+     * with its content inside the 192dp circle) and `splash_logo.png` (the
+     * logo the window background centres before Android 12), with Dark Mode
+     * ones in `drawable-night-<density>`. ts-images' `generateSplashScreens`
+     * writes exactly this (`android.resources`). Both sit on `backgroundColor`
+     * (`backgroundColorDark` at night), the colour the first frame continues.
+     * Without it, Android 12 shows the launcher icon and older versions the
+     * background colour.
+     */
+    splashResources?: string;
     /**
      * The small icon in the status bar and on every notification the app
      * shows, push or local: an Android vector drawable (`.xml`) or a `.png`,
@@ -268,6 +280,30 @@ export interface RunOptions {
     device?: string;
     output: string;
 }
+/** A splash file, by its place under `res/` (`drawable-night-xxhdpi/splash_icon.png`). */
+export interface AndroidSplashFile {
+    folder: string;
+    name: 'splash_icon.png' | 'splash_logo.png';
+    path: string;
+}
+/**
+ * The splash files in a resources directory: `splash_icon.png` and
+ * `splash_logo.png` in each `drawable[-night][-<density>]` folder. A directory
+ * with neither is a mistake, not an app without a splash.
+ */
+export declare function androidSplashFiles(resources: string): AndroidSplashFile[];
+/**
+ * The launch theme the activity starts in, and the theme it swaps to before
+ * its first frame. Android 12 and later draw their splash from
+ * `windowSplashScreen*`; earlier versions draw the window background, here
+ * the logo centred on the background colour. Either way the colour is the
+ * app's own `background`, so nothing flashes when the first frame replaces it.
+ */
+export declare function androidLaunchThemes(splash: Pick<AndroidSplashFile, 'name'>[]): {
+    base: string;
+    v31: string;
+    background?: string;
+};
 export declare function syncAndroidWebAssets(source: string, output: string): void;
 export declare function renderAndroidPermissions(config: CraftAndroidConfig): string;
 export declare function renderAndroidDeepLinks(config: CraftAndroidConfig): string;

package/dist/android/src/index.js

@@ -757,6 +757,49 @@ function requireRegularFile(path, label) {
   if (!statSync(path).isFile())
     throw new Error(`${label} must be a file: ${path}`);
 }
+function androidSplashFiles(resources) {
+  if (!existsSync(resources) || !statSync(resources).isDirectory())
+    throw new Error(`Splash resources must be a directory: ${resources}`);
+  const files = [];
+  for (const folder of readdirSync(resources).sort()) {
+    if (!/^drawable(?:-night)?(?:-(?:l|m|tv|h|xh|xxh|xxxh)dpi)?$/.test(folder))
+      continue;
+    for (const name of ["splash_icon.png", "splash_logo.png"]) {
+      const path = join3(resources, folder, name);
+      if (existsSync(path) && statSync(path).isFile())
+        files.push({ folder, name, path });
+    }
+  }
+  if (!files.length)
+    throw new Error(`Splash resources hold no drawable*/splash_icon.png or splash_logo.png: ${resources}`);
+  return files;
+}
+function androidLaunchThemes(splash) {
+  const icon = splash.some((file) => file.name === "splash_icon.png");
+  const logo = splash.some((file) => file.name === "splash_logo.png");
+  const base = logo ? `    <style name="Theme.CraftApp.Launch" parent="Theme.CraftApp">
+        <item name="android:windowBackground">@drawable/craft_launch_background</item>
+    </style>
+` : `    <style name="Theme.CraftApp.Launch" parent="Theme.CraftApp" />
+`;
+  const v31 = `<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.CraftApp.Launch" parent="Theme.CraftApp">
+        <item name="android:windowSplashScreenBackground">@color/background</item>${icon ? `
+        <item name="android:windowSplashScreenAnimatedIcon">@drawable/splash_icon</item>` : ""}
+    </style>
+</resources>
+`;
+  const background = logo ? `<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" android:opacity="opaque">
+    <item android:drawable="@color/background" />
+    <item>
+        <bitmap android:gravity="center" android:src="@drawable/splash_logo" />
+    </item>
+</layer-list>
+` : undefined;
+  return { base, v31, background };
+}
 function containsPath(parent, candidate) {
   const relativePath = relative(parent, candidate);
   return relativePath === "" || relativePath !== ".." && !relativePath.startsWith(`..${sep}`) && !isAbsolute2(relativePath);
@@ -964,6 +1007,7 @@ function writeAndroidConfig(output, config) {
   writeFileSync(join3(output, "craft.config.json"), JSON.stringify(config, null, 2));
   const runtimeConfig = { ...config };
   delete runtimeConfig.appIconPath;
+  delete runtimeConfig.splashResources;
   delete runtimeConfig.notificationIconPath;
   delete runtimeConfig.googleServicesFile;
   writeFileSync(join3(output, "app/src/main/assets/craft.config.json"), JSON.stringify(runtimeConfig, null, 2));
@@ -1266,6 +1310,7 @@ async function init(options) {
   if (config.appIconPath && ![".gif", ".jpg", ".png", ".webp"].includes(appIconExtension ?? "")) {
     throw new Error(`Unsupported Android app icon format: ${appIconExtension || "(none)"}`);
   }
+  const splash = config.splashResources ? androidSplashFiles(config.splashResources) : [];
   if (config.notificationIconPath)
     requireRegularFile(config.notificationIconPath, "Notification icon");
   const notificationIconExtension = config.notificationIconPath ? extname(config.notificationIconPath).toLowerCase() : undefined;
@@ -1475,6 +1520,17 @@ zipStorePath=wrapper/dists
 </vector>
 `);
   }
+  const resDir = join3(output, "app/src/main/res");
+  for (const folder of existsSync(resDir) ? readdirSync(resDir) : []) {
+    if (folder.startsWith("drawable"))
+      for (const name of ["splash_icon.png", "splash_logo.png"])
+        rmSync2(join3(resDir, folder, name), { force: true });
+  }
+  for (const file of splash) {
+    mkdirSync2(join3(resDir, file.folder), { recursive: true });
+    cpSync(file.path, join3(resDir, file.folder, file.name));
+  }
+  const launch = androidLaunchThemes(splash);
   const themesXml = `<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <style name="Theme.CraftApp" parent="Theme.Material3.DayNight.NoActionBar">
@@ -1482,9 +1538,15 @@ zipStorePath=wrapper/dists
         <item name="android:navigationBarColor">@color/primary</item>
         <item name="android:windowBackground">@color/background</item>
     </style>
-</resources>
+${launch.base}</resources>
 `;
   writeFileSync(join3(output, "app/src/main/res/values/themes.xml"), themesXml);
+  mkdirSync2(join3(output, "app/src/main/res/values-v31"), { recursive: true });
+  writeFileSync(join3(output, "app/src/main/res/values-v31/themes.xml"), launch.v31);
+  if (launch.background)
+    writeFileSync(join3(output, "app/src/main/res/drawable/craft_launch_background.xml"), launch.background);
+  else
+    rmSync2(join3(output, "app/src/main/res/drawable/craft_launch_background.xml"), { force: true });
   const activityMainXml = config.renderer === "native" ? `<?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/native_root"
@@ -1708,6 +1770,8 @@ async function run(options) {
 export {
   ANDROID_MIN_SDK,
   HEALTH_CONNECT_PERMISSIONS,
+  androidLaunchThemes,
+  androidSplashFiles,
   build,
   compressNativeSources,
   createAndroidEmulator,

package/dist/android/templates/AndroidManifest.xml.template

@@ -45,7 +45,8 @@
             android:windowSoftInputMode="adjustResize"
             android:supportsPictureInPicture="true"
             android:resizeableActivity="true"
-            android:launchMode="singleTask">
+            android:launchMode="singleTask"
+            android:theme="@style/Theme.CraftApp.Launch">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

package/dist/android/templates/MainActivity.kt.template

@@ -76,6 +76,9 @@ class MainActivity : AppCompatActivity() {
 
     @SuppressLint("SetJavaScriptEnabled")
     override fun onCreate(savedInstanceState: Bundle?) {
+        // The activity starts in the launch theme (the splash); its own theme
+        // takes over before the first frame, on the same background colour.
+        setTheme(R.style.Theme_CraftApp)
         applyConfiguredAppearance()
         super.onCreate(savedInstanceState)
 

package/dist/android/templates/MainActivityNative.kt.template

@@ -4738,6 +4738,9 @@ class MainActivity : AppCompatActivity() {
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        // The activity starts in the launch theme (the splash); its own theme
+        // takes over before the first frame, on the same background colour.
+        setTheme(R.style.Theme_CraftApp)
         applyConfiguredAppearance()
         super.onCreate(savedInstanceState)
         onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {

package/dist/cli.js

@@ -3228,7 +3228,7 @@ function pinCraftNativeDependency(packagePath, craftVersion) {
 `);
 }
 // package.json
-var version = "0.0.442";
+var version = "0.0.443";
 
 // bin/cli.ts
 var spawnedFrom = process6.env[CRAFT_CLI_SPAWN_MARKER];

package/dist/index.cjs

@@ -376,7 +376,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.442";
+var version = "0.0.443";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;

package/dist/index.js

@@ -117,7 +117,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.442";
+var version = "0.0.443";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;

package/dist/ios/src/index.d.ts

@@ -208,7 +208,9 @@ export interface CraftConfig {
      * screen until the page says it is ready (`splash.hide()`), so the app goes
      * from launch to content without a blank web view in between. PNG, PDF or
      * SVG, drawn at its own size in points: give an SVG the width and height it
-     * should have on screen.
+     * should have on screen. A PNG with `@2x` and `@3x` files beside it
+     * (`LaunchLogo.png`, `LaunchLogo@2x.png`, `LaunchLogo@3x.png`, as ts-images'
+     * `generateSplashScreens` writes them) is sharp on every screen.
      */
     splashImagePath?: string;
     /** The splash logo in Dark Mode, on `backgroundColorDark`. The light one if unset. */
@@ -532,6 +534,16 @@ export declare function renderPrivacyManifest(config: CraftConfig): string;
 export declare function pngHasAlpha(bytes: Uint8Array): boolean;
 /** The asset the launch screen and the splash both draw, so one hands over to the other unseen. */
 export declare const LAUNCH_LOGO = "LaunchLogo";
+/**
+ * A bitmap splash's `@2x` and `@3x` files beside it (`LaunchLogo.png`,
+ * `LaunchLogo@2x.png`, `LaunchLogo@3x.png`, as ts-images'
+ * `generateSplashScreens` writes them), by scale. A bitmap without them is
+ * one image, drawn at its pixel size in points.
+ */
+export declare function splashScales(source: string): Array<{
+    scale: 1 | 2 | 3;
+    path: string;
+}>;
 /** The launch screen: the background colour, and the splash logo on it when there is one. */
 export declare function renderLaunchScreen(config: Pick<CraftConfig, 'splashImagePath'>): string;
 /** Near-black or near-white, whichever reads on `background` (WCAG relative luminance). */

package/dist/ios/src/index.js

@@ -1107,6 +1107,14 @@ function renderAssetCatalog(output, config) {
   renderLaunchLogo(catalog, config);
 }
 var LAUNCH_LOGO = "LaunchLogo";
+function splashScales(source) {
+  const extension = extname(source);
+  if (!/^\.(?:png|jpe?g)$/i.test(extension))
+    return [{ scale: 1, path: source }];
+  const stem = source.slice(0, -extension.length);
+  const scales = [2, 3].map((scale) => ({ scale, path: `${stem}@${scale}x${extension}` })).filter((item) => existsSync2(item.path));
+  return scales.length ? [{ scale: 1, path: source }, ...scales] : [{ scale: 1, path: source }];
+}
 function renderLaunchLogo(catalog, config) {
   const imageset = join4(catalog, `${LAUNCH_LOGO}.imageset`);
   rmSync3(imageset, { recursive: true, force: true });
@@ -1123,13 +1131,18 @@ function renderLaunchLogo(catalog, config) {
     const extension = source.split(".").pop().toLowerCase();
     if (extension === "svg" || extension === "pdf")
       vector = true;
-    const filename = `${LAUNCH_LOGO}${dark ? "-dark" : ""}.${extension}`;
-    cpSync(source, join4(imageset, filename));
-    images.push({
-      ...dark ? { appearances: [{ appearance: "luminosity", value: "dark" }] } : {},
-      filename,
-      idiom: "universal"
-    });
+    const files = splashScales(source);
+    const scaled = files.length > 1;
+    for (const { scale, path } of files) {
+      const filename = `${LAUNCH_LOGO}${dark ? "-dark" : ""}${scale === 1 ? "" : `@${scale}x`}.${extension}`;
+      cpSync(path, join4(imageset, filename));
+      images.push({
+        ...dark ? { appearances: [{ appearance: "luminosity", value: "dark" }] } : {},
+        filename,
+        idiom: "universal",
+        ...scaled ? { scale: `${scale}x` } : {}
+      });
+    }
   }
   writeFileSync3(join4(imageset, "Contents.json"), `${JSON.stringify({
     images,
@@ -1841,6 +1854,7 @@ export {
   runPostGenerateHook,
   serializeSimulatorSteps,
   showSimulator,
+  splashScales,
   syncNativeFonts,
   syncWebAssets,
   usesNativeBundle

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "craft-native",
-  "version": "0.0.442",
+  "version": "0.0.443",
   "type": "module",
   "description": "Build desktop apps with web languages - TypeScript SDK for Craft",
   "author": "Chris Breuer <chris@stacksjs.org>",