@craft-native/ios 0.0.98 → 0.0.100

package/dist/cli.js

@@ -69,6 +69,19 @@ function plistString(key, value) {
   return `    <key>${key}</key>
     <string>${xmlEscape(value)}</string>`;
 }
+function resolveAppearance(config) {
+  if (config.appearance)
+    return config.appearance;
+  return config.darkMode === false ? "light" : "dark";
+}
+function renderAppearance(config) {
+  const appearance = resolveAppearance(config);
+  if (appearance === "system")
+    return { interfaceStyle: "Automatic", statusBarStyle: "UIStatusBarStyleDefault" };
+  if (appearance === "light")
+    return { interfaceStyle: "Light", statusBarStyle: "UIStatusBarStyleDarkContent" };
+  return { interfaceStyle: "Dark", statusBarStyle: "UIStatusBarStyleLightContent" };
+}
 function renderUsageDescriptions(config) {
   const entries = [
     [config.enableSpeechRecognition, "NSSpeechRecognitionUsageDescription", `${config.appName} uses speech recognition for voice input.`],
@@ -261,17 +274,25 @@ function renderAssetCatalog(output, config) {
     info: { author: "xcode", version: 1 }
   }, null, 2)}
 `);
-  const color = config.backgroundColor?.replace(/^#/, "") || "000000";
-  const normalized = color.length === 3 ? [...color].map((value) => `${value}${value}`).join("") : color.padEnd(6, "0").slice(0, 6);
-  const components = [0, 2, 4].map((index) => (Number.parseInt(normalized.slice(index, index + 2), 16) / 255).toFixed(3));
-  writeFileSync(join(launchBackground, "Contents.json"), `${JSON.stringify({
-    colors: [{
-      color: {
-        "color-space": "srgb",
-        components: { alpha: "1.000", blue: components[2], green: components[1], red: components[0] }
-      },
+  const colorEntry = (hex) => {
+    const color = hex?.replace(/^#/, "") || "000000";
+    const normalized = color.length === 3 ? [...color].map((value) => `${value}${value}`).join("") : color.padEnd(6, "0").slice(0, 6);
+    const components = [0, 2, 4].map((index) => (Number.parseInt(normalized.slice(index, index + 2), 16) / 255).toFixed(3));
+    return {
+      "color-space": "srgb",
+      components: { alpha: "1.000", blue: components[2], green: components[1], red: components[0] }
+    };
+  };
+  const colors = [{ color: colorEntry(config.backgroundColor), idiom: "universal" }];
+  if (config.backgroundColorDark) {
+    colors.push({
+      appearances: [{ appearance: "luminosity", value: "dark" }],
+      color: colorEntry(config.backgroundColorDark),
       idiom: "universal"
-    }],
+    });
+  }
+  writeFileSync(join(launchBackground, "Contents.json"), `${JSON.stringify({
+    colors,
     info: { author: "xcode", version: 1 }
   }, null, 2)}
 `);
@@ -345,10 +366,18 @@ async function refreshRuntime(output, override) {
   await installRuntime(output, dir);
   console.log("   Refreshed the Zig runtime from", dir);
 }
+function productName(name) {
+  const words = name.split(/[^A-Za-z0-9]+/).filter(Boolean);
+  const joined = words.map((word) => word[0].toUpperCase() + word.slice(1)).join("");
+  if (!joined)
+    return "Craft";
+  return /^\d/.test(joined) ? `App${joined}` : joined;
+}
 async function init(options) {
-  const { name, bundleId, teamId, output } = options;
+  const { name: displayName, bundleId, teamId, output } = options;
+  const name = productName(displayName);
   console.log(`
-\u26A1 Initializing Craft iOS project: ${name}`);
+\u26A1 Initializing Craft iOS project: ${displayName}`);
   console.log(`   Output: ${output}
 `);
   const dirs = [output, join(output, "Sources"), join(output, "Shared"), join(output, "dist")];
@@ -359,11 +388,11 @@ async function init(options) {
       mkdirSync(dir, { recursive: true });
     }
   }
-  const finalBundleId = bundleId || `com.craft.${name.toLowerCase().replace(/[^a-z0-9]/g, "")}`;
+  const finalBundleId = bundleId || `com.craft.${name.toLowerCase()}`;
   const bundleIdPrefix = finalBundleId.split(".").slice(0, -1).join(".");
   const config = {
     ...DEFAULT_CONFIG,
-    appName: name,
+    appName: displayName,
     bundleId: finalBundleId,
     teamId: teamId || "",
     ...options.config
@@ -375,7 +404,7 @@ async function init(options) {
   const swiftSource = swiftTemplate.replace(/CraftApp/g, `${name}App`).replace(/\{\{BUNDLE_ID\}\}/g, finalBundleId);
   writeFileSync(join(output, "Sources", `${name}App.swift`), swiftSource);
   const infoPlistTemplate = readFileSync(join(TEMPLATES_DIR, "Info.plist.template"), "utf-8");
-  const infoPlist = infoPlistTemplate.replace(/\{\{APP_NAME\}\}/g, name).replace(/\{\{BUNDLE_ID\}\}/g, finalBundleId).replace(/\{\{VERSION\}\}/g, config.version || "1.0.0").replace(/\{\{BUILD_NUMBER\}\}/g, config.buildNumber || "1").replace(/\{\{UI_STYLE\}\}/g, config.darkMode ? "Dark" : "Light").replace(/\{\{ORIENTATIONS\}\}/g, renderOrientations(config)).replace(/\{\{USAGE_DESCRIPTIONS\}\}/g, renderUsageDescriptions(config)).replace(/\{\{URL_TYPES\}\}/g, renderUrlTypes(config)).replace(/\{\{BACKGROUND_MODES\}\}/g, renderBackgroundModes(config)).replace(/\{\{LIVE_ACTIVITY_SUPPORT\}\}/g, config.enableLiveActivities ? `    <key>NSSupportsLiveActivities</key>
+  const infoPlist = infoPlistTemplate.replace(/\{\{APP_NAME\}\}/g, xmlEscape(displayName)).replace(/\{\{BUNDLE_ID\}\}/g, finalBundleId).replace(/\{\{VERSION\}\}/g, config.version || "1.0.0").replace(/\{\{BUILD_NUMBER\}\}/g, config.buildNumber || "1").replace(/\{\{UI_STYLE\}\}/g, renderAppearance(config).interfaceStyle).replace(/\{\{STATUS_BAR_STYLE\}\}/g, renderAppearance(config).statusBarStyle).replace(/\{\{ORIENTATIONS\}\}/g, renderOrientations(config)).replace(/\{\{USAGE_DESCRIPTIONS\}\}/g, renderUsageDescriptions(config)).replace(/\{\{URL_TYPES\}\}/g, renderUrlTypes(config)).replace(/\{\{BACKGROUND_MODES\}\}/g, renderBackgroundModes(config)).replace(/\{\{LIVE_ACTIVITY_SUPPORT\}\}/g, config.enableLiveActivities ? `    <key>NSSupportsLiveActivities</key>
     <true/>
     <key>NSSupportsLiveActivitiesFrequentUpdates</key>
     <true/>` : "");
@@ -458,10 +487,10 @@ ${nativeDependencies.join(`
   if (config.enableWatchApp) {
     const watchSource = readFileSync(join(TEMPLATES_DIR, "CraftWatchApp.swift.template"), "utf8").replace(/\{\{APP_NAME\}\}/g, name);
     writeFileSync(join(output, "WatchExtension", `${name}WatchApp.swift`), watchSource);
-    const watchInfo = readFileSync(join(TEMPLATES_DIR, "WatchApp.Info.plist.template"), "utf8").replace(/\{\{APP_NAME\}\}/g, name).replace(/\{\{BUNDLE_ID\}\}/g, finalBundleId);
+    const watchInfo = readFileSync(join(TEMPLATES_DIR, "WatchApp.Info.plist.template"), "utf8").replace(/\{\{APP_NAME\}\}/g, xmlEscape(displayName)).replace(/\{\{BUNDLE_ID\}\}/g, finalBundleId);
     writeFileSync(join(output, "WatchApp", "Info.plist"), watchInfo);
     writeFileSync(join(output, "WatchApp", "Watch.entitlements"), renderWatchEntitlements(config));
-    const watchExtensionInfo = readFileSync(join(TEMPLATES_DIR, "WatchExtension.Info.plist.template"), "utf8").replace(/\{\{APP_NAME\}\}/g, name).replace(/\{\{BUNDLE_ID\}\}/g, finalBundleId);
+    const watchExtensionInfo = readFileSync(join(TEMPLATES_DIR, "WatchExtension.Info.plist.template"), "utf8").replace(/\{\{APP_NAME\}\}/g, xmlEscape(displayName)).replace(/\{\{BUNDLE_ID\}\}/g, finalBundleId);
     writeFileSync(join(output, "WatchExtension", "Info.plist"), watchExtensionInfo);
     writeFileSync(join(output, "WatchExtension", "Watch.entitlements"), renderWatchEntitlements(config));
   }
@@ -470,7 +499,7 @@ ${nativeDependencies.join(`
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="viewport-fit=cover, width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
-  <title>${name}</title>
+  <title>${xmlEscape(displayName)}</title>
   <style>
     * { margin: 0; padding: 0; box-sizing: border-box; }
     body {
@@ -491,7 +520,7 @@ ${nativeDependencies.join(`
 </head>
 <body>
   <div class="container">
-    <h1>\u26A1 ${name}</h1>
+    <h1>\u26A1 ${xmlEscape(displayName)}</h1>
     <p>Built with Craft iOS</p>
     <p class="ready" id="status">Waiting for Craft bridge...</p>
   </div>
@@ -541,7 +570,7 @@ async function build(options) {
     if (result.exitCode === 0) {
       console.log("   Running xcodegen...");
       await $`cd ${output} && xcodegen generate`.quiet();
-      console.log(`\u2705 Xcode project created: ${config.appName}.xcodeproj`);
+      console.log(`\u2705 Xcode project created: ${productName(config.appName)}.xcodeproj`);
     } else {
       throw new Error("xcodegen not found");
     }

package/dist/index.d.ts

@@ -3,13 +3,24 @@
  *
  * Generates native iOS apps from web content using WKWebView.
  */
+export type CraftAppearance = 'light' | 'dark' | 'system';
 export interface CraftConfig {
     appName: string;
     bundleId: string;
     version?: string;
     buildNumber?: string;
     darkMode?: boolean;
+    /**
+     * Which interface style the app draws in. `system` follows the phone's
+     * Light/Dark setting (and the page's `prefers-color-scheme` with it); `light`
+     * and `dark` pin one. Unset keeps the older `darkMode` switch.
+     */
+    appearance?: CraftAppearance;
     backgroundColor?: string;
+    /** The launch and webview background while the phone is in Dark Mode. */
+    backgroundColorDark?: string;
+    /** Edge-swipe back and forward through the page's history, pushState entries included. */
+    swipeNavigation?: boolean;
     enableSpeechRecognition?: boolean;
     enableHaptics?: boolean;
     enableShare?: boolean;
@@ -115,6 +126,20 @@ export interface RunOptions {
     output: string;
 }
 export declare function renderDeviceFamilies(config: CraftConfig): string;
+/** `appearance` when set, otherwise what the older `darkMode` switch pinned. */
+export declare function resolveAppearance(config: Pick<CraftConfig, 'appearance' | 'darkMode'>): CraftAppearance;
+/**
+ * The Info.plist interface style and the status bar that reads on it.
+ *
+ * The status bar used to be `LightContent` whatever the app looked like:
+ * white text that vanished on a light page. It now follows the appearance —
+ * dark text on a light app, light on a dark one, and the system's choice when
+ * the app follows the system.
+ */
+export declare function renderAppearance(config: Pick<CraftConfig, 'appearance' | 'darkMode'>): {
+    interfaceStyle: string;
+    statusBarStyle: string;
+};
 export declare function renderUsageDescriptions(config: CraftConfig): string;
 export declare function renderOrientations(config: CraftConfig): string;
 export declare function renderUrlTypes(config: CraftConfig): string;
@@ -181,6 +206,17 @@ export declare function resolveRuntimeDir(override?: string | null): string | nu
  * Returns true when a runtime was installed.
  */
 export declare function installRuntime(output: string, runtimeDir: string): Promise<boolean>;
+/**
+ * The identifier an app's display name becomes wherever Xcode or Swift needs
+ * one: the project, the target, the product and the `@main` type.
+ *
+ * The display name goes in front of people and may say anything; an
+ * identifier may not. "HQ.training" used to become `struct HQ.trainingApp`,
+ * which does not compile. Words are joined in PascalCase ("HQTraining"), and
+ * a name that starts with a digit or has no letters at all still yields a
+ * valid Swift type.
+ */
+export declare function productName(name: string): string;
 export declare function init(options: InitOptions): Promise<void>;
 /**
  * Build web assets and generate Xcode project

package/dist/index.js

@@ -64,6 +64,19 @@ function plistString(key, value) {
   return `    <key>${key}</key>
     <string>${xmlEscape(value)}</string>`;
 }
+function resolveAppearance(config) {
+  if (config.appearance)
+    return config.appearance;
+  return config.darkMode === false ? "light" : "dark";
+}
+function renderAppearance(config) {
+  const appearance = resolveAppearance(config);
+  if (appearance === "system")
+    return { interfaceStyle: "Automatic", statusBarStyle: "UIStatusBarStyleDefault" };
+  if (appearance === "light")
+    return { interfaceStyle: "Light", statusBarStyle: "UIStatusBarStyleDarkContent" };
+  return { interfaceStyle: "Dark", statusBarStyle: "UIStatusBarStyleLightContent" };
+}
 function renderUsageDescriptions(config) {
   const entries = [
     [config.enableSpeechRecognition, "NSSpeechRecognitionUsageDescription", `${config.appName} uses speech recognition for voice input.`],
@@ -256,17 +269,25 @@ function renderAssetCatalog(output, config) {
     info: { author: "xcode", version: 1 }
   }, null, 2)}
 `);
-  const color = config.backgroundColor?.replace(/^#/, "") || "000000";
-  const normalized = color.length === 3 ? [...color].map((value) => `${value}${value}`).join("") : color.padEnd(6, "0").slice(0, 6);
-  const components = [0, 2, 4].map((index) => (Number.parseInt(normalized.slice(index, index + 2), 16) / 255).toFixed(3));
-  writeFileSync(join(launchBackground, "Contents.json"), `${JSON.stringify({
-    colors: [{
-      color: {
-        "color-space": "srgb",
-        components: { alpha: "1.000", blue: components[2], green: components[1], red: components[0] }
-      },
+  const colorEntry = (hex) => {
+    const color = hex?.replace(/^#/, "") || "000000";
+    const normalized = color.length === 3 ? [...color].map((value) => `${value}${value}`).join("") : color.padEnd(6, "0").slice(0, 6);
+    const components = [0, 2, 4].map((index) => (Number.parseInt(normalized.slice(index, index + 2), 16) / 255).toFixed(3));
+    return {
+      "color-space": "srgb",
+      components: { alpha: "1.000", blue: components[2], green: components[1], red: components[0] }
+    };
+  };
+  const colors = [{ color: colorEntry(config.backgroundColor), idiom: "universal" }];
+  if (config.backgroundColorDark) {
+    colors.push({
+      appearances: [{ appearance: "luminosity", value: "dark" }],
+      color: colorEntry(config.backgroundColorDark),
       idiom: "universal"
-    }],
+    });
+  }
+  writeFileSync(join(launchBackground, "Contents.json"), `${JSON.stringify({
+    colors,
     info: { author: "xcode", version: 1 }
   }, null, 2)}
 `);
@@ -340,10 +361,18 @@ async function refreshRuntime(output, override) {
   await installRuntime(output, dir);
   console.log("   Refreshed the Zig runtime from", dir);
 }
+function productName(name) {
+  const words = name.split(/[^A-Za-z0-9]+/).filter(Boolean);
+  const joined = words.map((word) => word[0].toUpperCase() + word.slice(1)).join("");
+  if (!joined)
+    return "Craft";
+  return /^\d/.test(joined) ? `App${joined}` : joined;
+}
 async function init(options) {
-  const { name, bundleId, teamId, output } = options;
+  const { name: displayName, bundleId, teamId, output } = options;
+  const name = productName(displayName);
   console.log(`
-\u26A1 Initializing Craft iOS project: ${name}`);
+\u26A1 Initializing Craft iOS project: ${displayName}`);
   console.log(`   Output: ${output}
 `);
   const dirs = [output, join(output, "Sources"), join(output, "Shared"), join(output, "dist")];
@@ -354,11 +383,11 @@ async function init(options) {
       mkdirSync(dir, { recursive: true });
     }
   }
-  const finalBundleId = bundleId || `com.craft.${name.toLowerCase().replace(/[^a-z0-9]/g, "")}`;
+  const finalBundleId = bundleId || `com.craft.${name.toLowerCase()}`;
   const bundleIdPrefix = finalBundleId.split(".").slice(0, -1).join(".");
   const config = {
     ...DEFAULT_CONFIG,
-    appName: name,
+    appName: displayName,
     bundleId: finalBundleId,
     teamId: teamId || "",
     ...options.config
@@ -370,7 +399,7 @@ async function init(options) {
   const swiftSource = swiftTemplate.replace(/CraftApp/g, `${name}App`).replace(/\{\{BUNDLE_ID\}\}/g, finalBundleId);
   writeFileSync(join(output, "Sources", `${name}App.swift`), swiftSource);
   const infoPlistTemplate = readFileSync(join(TEMPLATES_DIR, "Info.plist.template"), "utf-8");
-  const infoPlist = infoPlistTemplate.replace(/\{\{APP_NAME\}\}/g, name).replace(/\{\{BUNDLE_ID\}\}/g, finalBundleId).replace(/\{\{VERSION\}\}/g, config.version || "1.0.0").replace(/\{\{BUILD_NUMBER\}\}/g, config.buildNumber || "1").replace(/\{\{UI_STYLE\}\}/g, config.darkMode ? "Dark" : "Light").replace(/\{\{ORIENTATIONS\}\}/g, renderOrientations(config)).replace(/\{\{USAGE_DESCRIPTIONS\}\}/g, renderUsageDescriptions(config)).replace(/\{\{URL_TYPES\}\}/g, renderUrlTypes(config)).replace(/\{\{BACKGROUND_MODES\}\}/g, renderBackgroundModes(config)).replace(/\{\{LIVE_ACTIVITY_SUPPORT\}\}/g, config.enableLiveActivities ? `    <key>NSSupportsLiveActivities</key>
+  const infoPlist = infoPlistTemplate.replace(/\{\{APP_NAME\}\}/g, xmlEscape(displayName)).replace(/\{\{BUNDLE_ID\}\}/g, finalBundleId).replace(/\{\{VERSION\}\}/g, config.version || "1.0.0").replace(/\{\{BUILD_NUMBER\}\}/g, config.buildNumber || "1").replace(/\{\{UI_STYLE\}\}/g, renderAppearance(config).interfaceStyle).replace(/\{\{STATUS_BAR_STYLE\}\}/g, renderAppearance(config).statusBarStyle).replace(/\{\{ORIENTATIONS\}\}/g, renderOrientations(config)).replace(/\{\{USAGE_DESCRIPTIONS\}\}/g, renderUsageDescriptions(config)).replace(/\{\{URL_TYPES\}\}/g, renderUrlTypes(config)).replace(/\{\{BACKGROUND_MODES\}\}/g, renderBackgroundModes(config)).replace(/\{\{LIVE_ACTIVITY_SUPPORT\}\}/g, config.enableLiveActivities ? `    <key>NSSupportsLiveActivities</key>
     <true/>
     <key>NSSupportsLiveActivitiesFrequentUpdates</key>
     <true/>` : "");
@@ -453,10 +482,10 @@ ${nativeDependencies.join(`
   if (config.enableWatchApp) {
     const watchSource = readFileSync(join(TEMPLATES_DIR, "CraftWatchApp.swift.template"), "utf8").replace(/\{\{APP_NAME\}\}/g, name);
     writeFileSync(join(output, "WatchExtension", `${name}WatchApp.swift`), watchSource);
-    const watchInfo = readFileSync(join(TEMPLATES_DIR, "WatchApp.Info.plist.template"), "utf8").replace(/\{\{APP_NAME\}\}/g, name).replace(/\{\{BUNDLE_ID\}\}/g, finalBundleId);
+    const watchInfo = readFileSync(join(TEMPLATES_DIR, "WatchApp.Info.plist.template"), "utf8").replace(/\{\{APP_NAME\}\}/g, xmlEscape(displayName)).replace(/\{\{BUNDLE_ID\}\}/g, finalBundleId);
     writeFileSync(join(output, "WatchApp", "Info.plist"), watchInfo);
     writeFileSync(join(output, "WatchApp", "Watch.entitlements"), renderWatchEntitlements(config));
-    const watchExtensionInfo = readFileSync(join(TEMPLATES_DIR, "WatchExtension.Info.plist.template"), "utf8").replace(/\{\{APP_NAME\}\}/g, name).replace(/\{\{BUNDLE_ID\}\}/g, finalBundleId);
+    const watchExtensionInfo = readFileSync(join(TEMPLATES_DIR, "WatchExtension.Info.plist.template"), "utf8").replace(/\{\{APP_NAME\}\}/g, xmlEscape(displayName)).replace(/\{\{BUNDLE_ID\}\}/g, finalBundleId);
     writeFileSync(join(output, "WatchExtension", "Info.plist"), watchExtensionInfo);
     writeFileSync(join(output, "WatchExtension", "Watch.entitlements"), renderWatchEntitlements(config));
   }
@@ -465,7 +494,7 @@ ${nativeDependencies.join(`
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="viewport-fit=cover, width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
-  <title>${name}</title>
+  <title>${xmlEscape(displayName)}</title>
   <style>
     * { margin: 0; padding: 0; box-sizing: border-box; }
     body {
@@ -486,7 +515,7 @@ ${nativeDependencies.join(`
 </head>
 <body>
   <div class="container">
-    <h1>\u26A1 ${name}</h1>
+    <h1>\u26A1 ${xmlEscape(displayName)}</h1>
     <p>Built with Craft iOS</p>
     <p class="ready" id="status">Waiting for Craft bridge...</p>
   </div>
@@ -536,7 +565,7 @@ async function build(options) {
     if (result.exitCode === 0) {
       console.log("   Running xcodegen...");
       await $`cd ${output} && xcodegen generate`.quiet();
-      console.log(`\u2705 Xcode project created: ${config.appName}.xcodeproj`);
+      console.log(`\u2705 Xcode project created: ${productName(config.appName)}.xcodeproj`);
     } else {
       throw new Error("xcodegen not found");
     }
@@ -655,6 +684,7 @@ export {
   showSimulator,
   run,
   resolveRuntimeDir,
+  resolveAppearance,
   renderWatchEntitlements,
   renderUsageDescriptions,
   renderUrlTypes,
@@ -664,6 +694,8 @@ export {
   renderEntitlements,
   renderDeviceFamilies,
   renderBackgroundModes,
+  renderAppearance,
+  productName,
   pickSimulator,
   orderSimulators,
   open,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@craft-native/ios",
-  "version": "0.0.98",
+  "version": "0.0.100",
   "homepage": "https://github.com/craft-native/craft/tree/main/packages/ios#readme",
   "repository": {
     "type": "git",

package/templates/CraftApp.swift

@@ -223,7 +223,7 @@ struct CraftApp: App {
         WindowGroup {
             CraftWebView(config: appState.config)
                 .ignoresSafeArea()
-                .preferredColorScheme(appState.config.darkMode ? .dark : .light)
+                .preferredColorScheme(appState.config.colorScheme)
                 .environmentObject(appState)
                 .onOpenURL { url in
                     // Handle deep links and universal links
@@ -353,7 +353,14 @@ struct CraftConfig: Codable {
     var appName: String = "Craft App"
     var bundleId: String = "com.craft.app"
     var darkMode: Bool = true
+    /// "light", "dark" or "system". Absent in configs older than the field,
+    /// which keep what `darkMode` pinned.
+    var appearance: String? = nil
     var backgroundColor: String = "#1a1a2e"
+    /// The background while the phone is in Dark Mode; the light one if unset.
+    var backgroundColorDark: String? = nil
+    /// Edge-swipe back and forward through the page's history.
+    var swipeNavigation: Bool? = nil
     var enableSpeechRecognition: Bool = false
     var enableHaptics: Bool = false
     var enableShare: Bool = false
@@ -393,6 +400,26 @@ struct CraftConfig: Codable {
     var trustedOrigins: [String] = []
 }
 
+extension CraftConfig {
+    /// The scheme SwiftUI pins, or nil to follow the phone's setting.
+    var colorScheme: ColorScheme? {
+        switch appearance {
+        case "system": return nil
+        case "light": return .light
+        case "dark": return .dark
+        default: return darkMode ? .dark : .light
+        }
+    }
+
+    /// The webview's background, resolved per trait so a Dark Mode switch
+    /// repaints it without a reload.
+    var resolvedBackgroundColor: UIColor {
+        let light = UIColor(hex: backgroundColor) ?? .black
+        guard let darkHex = backgroundColorDark, let dark = UIColor(hex: darkHex) else { return light }
+        return UIColor { traits in traits.userInterfaceStyle == .dark ? dark : light }
+    }
+}
+
 // MARK: - WebView
 final class BundledAssetSchemeHandler: NSObject, WKURLSchemeHandler {
     private let rootURL: URL?
@@ -505,6 +532,13 @@ struct CraftWebView: UIViewRepresentable {
         let webView = WKWebView(frame: .zero, configuration: webConfig)
         webView.navigationDelegate = context.coordinator
         webView.isOpaque = false
+        // An edge swipe goes back (and forward) through the page's history,
+        // pushState entries included, the way every iOS app's stack does.
+        webView.allowsBackForwardNavigationGestures = config.swipeNavigation ?? false
+        #if DEBUG
+        // Safari's Develop menu can attach to a debug build; never a release.
+        if #available(iOS 16.4, *) { webView.isInspectable = true }
+        #endif
 
         // Before any message can be offered. Zig evaluates every reply against
         // this webview, and without it an action would run, succeed, and reach
@@ -517,7 +551,7 @@ struct CraftWebView: UIViewRepresentable {
         CraftEventManager.shared.setWebView(webView)
 
         // Parse background color
-        let bgColor = UIColor(hex: config.backgroundColor) ?? .black
+        let bgColor = config.resolvedBackgroundColor
         webView.backgroundColor = bgColor
         webView.scrollView.backgroundColor = bgColor
 
@@ -1276,7 +1310,7 @@ struct CraftWebView: UIViewRepresentable {
             case "requestHealthAuthorization":
                 if config.enableHealthKit {
                     let types = body["types"] as? [String] ?? []
-                    requestHealthAuthorization(types: types, callbackId: callbackId)
+                    requestHealthAuthorization(types: types, readOnly: body["readOnly"] as? Bool ?? false, callbackId: callbackId)
                 } else {
                     rejectCallback(callbackId, error: "HealthKit is disabled", code: "CAPABILITY_DISABLED")
                 }
@@ -1298,6 +1332,32 @@ struct CraftWebView: UIViewRepresentable {
                 } else {
                     rejectCallback(callbackId, error: "HealthKit is disabled")
                 }
+            case "getHealthWorkouts":
+                if config.enableHealthKit {
+                    getHealthWorkouts(
+                        startDate: body["startDate"] as? Double,
+                        endDate: body["endDate"] as? Double,
+                        limit: body["limit"] as? Int,
+                        callbackId: callbackId
+                    )
+                } else {
+                    rejectCallback(callbackId, error: "HealthKit is disabled", code: "CAPABILITY_DISABLED")
+                }
+            case "getHealthDailyStatistics":
+                if config.enableHealthKit {
+                    if let dataType = body["type"] as? String {
+                        getHealthDailyStatistics(
+                            type: dataType,
+                            startDate: body["startDate"] as? Double,
+                            endDate: body["endDate"] as? Double,
+                            callbackId: callbackId
+                        )
+                    } else {
+                        rejectCallback(callbackId, error: "getHealthDailyStatistics was called without a type", code: "INVALID_ARGUMENT")
+                    }
+                } else {
+                    rejectCallback(callbackId, error: "HealthKit is disabled", code: "CAPABILITY_DISABLED")
+                }
 
             // MARK: - Live Activities
             case "startLiveActivity":
@@ -3188,19 +3248,28 @@ struct CraftWebView: UIViewRepresentable {
                 var legacyNotifications = craft.notifications;
 
                 craft.contractVersion = '1.0.0';
+                // Actions answered by a person, through a system sheet they
+                // may take a minute to read. Thirty seconds of reading the
+                // HealthKit sheet used to fail the call while the sheet was
+                // still open; these wait for the answer instead.
+                var personFacing = {
+                    requestHealthAuthorization: true,
+                    requestPermission: true,
+                    signInWithApple: true
+                };
                 craft._invoke = function(action, payload) {
                     var self = craft;
                     var id = 'cb_' + (++self._callbackId);
                     var message = Object.assign({}, payload || {}, {action: action, callbackId: id});
                     window.webkit.messageHandlers.craft.postMessage(message);
                     return new Promise(function(resolve, reject) {
-                        var timeout = setTimeout(function() {
+                        var timeout = personFacing[action] ? null : setTimeout(function() {
                             delete self._callbacks[id];
                             reject(new Error('Craft bridge timed out: ' + action));
                         }, 30000);
                         self._callbacks[id] = {
-                            resolve: function(value) { clearTimeout(timeout); resolve(value); },
-                            reject: function(error) { clearTimeout(timeout); reject(error); }
+                            resolve: function(value) { if (timeout) clearTimeout(timeout); resolve(value); },
+                            reject: function(error) { if (timeout) clearTimeout(timeout); reject(error); }
                         };
                     });
                 };
@@ -3336,12 +3405,22 @@ struct CraftWebView: UIViewRepresentable {
                     readRecording: function() { return craft._invoke('readLocationRecording'); }
                 };
                 craft.health = {
-                    requestAuthorization: function(types) { return craft._invoke('requestHealthAuthorization', {types: types || []}); },
+                    requestAuthorization: function(types, options) {
+                        return craft._invoke('requestHealthAuthorization', {types: types || [], readOnly: Boolean(options && options.write === false)});
+                    },
                     getData: function(type, options) {
                         options = options || {};
                         return craft._invoke('getHealthData', {type: type, startDate: options.startDate, endDate: options.endDate});
                     },
-                    saveWorkout: function(workout) { return craft._invoke('saveHealthWorkout', workout || {}); }
+                    saveWorkout: function(workout) { return craft._invoke('saveHealthWorkout', workout || {}); },
+                    getWorkouts: function(options) {
+                        options = options || {};
+                        return craft._invoke('getHealthWorkouts', {startDate: options.startDate, endDate: options.endDate, limit: options.limit});
+                    },
+                    getDailyStatistics: function(type, options) {
+                        options = options || {};
+                        return craft._invoke('getHealthDailyStatistics', {type: type, startDate: options.startDate, endDate: options.endDate});
+                    }
                 };
                 craft.liveActivity = {
                     start: function(options) { return craft._invoke('startLiveActivity', options || {}); },
@@ -5066,7 +5145,7 @@ struct CraftWebView: UIViewRepresentable {
         }
 
         // MARK: - Health
-        private func requestHealthAuthorization(types: [String], callbackId: String?) {
+        private func requestHealthAuthorization(types: [String], readOnly: Bool = false, callbackId: String?) {
             guard let healthStore = healthStore else {
                 rejectCallback(callbackId, error: "HealthKit not available")
                 return
@@ -5100,11 +5179,38 @@ struct CraftWebView: UIViewRepresentable {
                     }
                 case "workouts":
                     readTypes.insert(HKObjectType.workoutType())
+                    // A workout's own heart rate and energy are read through
+                    // these; without them every workout comes back bare.
+                    if let heartType = HKQuantityType.quantityType(forIdentifier: .heartRate) {
+                        readTypes.insert(heartType)
+                    }
+                    if let energyType = HKQuantityType.quantityType(forIdentifier: .activeEnergyBurned) {
+                        readTypes.insert(energyType)
+                    }
+                case "restingHeartRate":
+                    if let restingType = HKQuantityType.quantityType(forIdentifier: .restingHeartRate) {
+                        readTypes.insert(restingType)
+                    }
+                case "heartRateVariability":
+                    if let hrvType = HKQuantityType.quantityType(forIdentifier: .heartRateVariabilitySDNN) {
+                        readTypes.insert(hrvType)
+                    }
+                case "bodyMass":
+                    if let massType = HKQuantityType.quantityType(forIdentifier: .bodyMass) {
+                        readTypes.insert(massType)
+                    }
+                case "sleep":
+                    if let sleepType = HKObjectType.categoryType(forIdentifier: .sleepAnalysis) {
+                        readTypes.insert(sleepType)
+                    }
                 default:
                     break
                 }
             }
 
+            // A page that only reads asks only to read: the sheet then says
+            // "access", not "access and update".
+            if readOnly { shareTypes.removeAll() }
             healthStore.requestAuthorization(toShare: shareTypes, read: readTypes) { [weak self] success, error in
                 if success {
                     self?.resolveCallback(callbackId, result: true)
@@ -5120,44 +5226,32 @@ struct CraftWebView: UIViewRepresentable {
                 return
             }
 
-            var quantityType: HKQuantityType?
-            var unit: HKUnit?
-
-            switch type {
-            case "steps":
-                quantityType = HKQuantityType.quantityType(forIdentifier: .stepCount)
-                unit = .count()
-            case "heartRate":
-                quantityType = HKQuantityType.quantityType(forIdentifier: .heartRate)
-                unit = HKUnit(from: "count/min")
-            case "activeEnergy":
-                quantityType = HKQuantityType.quantityType(forIdentifier: .activeEnergyBurned)
-                unit = .kilocalorie()
-            case "distance":
-                quantityType = HKQuantityType.quantityType(forIdentifier: .distanceWalkingRunning)
-                unit = .meter()
-            default:
+            guard let spec = Self.healthQuantity(type), let qType = spec.type else {
                 rejectCallback(callbackId, error: "Unknown health data type")
                 return
             }
-
-            guard let qType = quantityType, let qUnit = unit else {
-                rejectCallback(callbackId, error: "Invalid health data type")
-                return
-            }
+            let qUnit = spec.unit
 
             let start = startDate != nil ? Date(timeIntervalSince1970: startDate! / 1000) : Calendar.current.date(byAdding: .day, value: -7, to: Date())!
             let end = endDate != nil ? Date(timeIntervalSince1970: endDate! / 1000) : Date()
 
             let predicate = HKQuery.predicateForSamples(withStart: start, end: end, options: .strictStartDate)
 
-            let query = HKStatisticsQuery(quantityType: qType, quantitySamplePredicate: predicate, options: .cumulativeSum) { [weak self] _, result, error in
+            // A discrete type (heart rate, weight) has no sum: HealthKit fails
+            // the whole query when asked for one, which is what heart rate
+            // used to do. Each type is asked for the statistic it has.
+            let query = HKStatisticsQuery(quantityType: qType, quantitySamplePredicate: predicate, options: spec.options) { [weak self] _, result, error in
                 if let error = error {
+                    // No samples in the range is an answer, not a failure.
+                    if (error as? HKError)?.code == .errorNoData {
+                        self?.resolveCallback(callbackId, result: ["value": 0, "unit": qUnit.unitString])
+                        return
+                    }
                     self?.rejectCallback(callbackId, error: error.localizedDescription)
                     return
                 }
 
-                let value = result?.sumQuantity()?.doubleValue(for: qUnit) ?? 0
+                let value = result.flatMap { Self.statisticValue($0, options: spec.options, unit: qUnit) } ?? 0
                 self?.resolveCallback(callbackId, result: ["value": value, "unit": qUnit.unitString])
             }
 
@@ -5252,6 +5346,194 @@ struct CraftWebView: UIViewRepresentable {
             }
         }
 
+        /// The quantity behind each health data type, its unit, and the one
+        /// statistic that type supports.
+        private static func healthQuantity(_ type: String) -> (type: HKQuantityType?, unit: HKUnit, options: HKStatisticsOptions)? {
+            let bpm = HKUnit.count().unitDivided(by: .minute())
+            switch type {
+            case "steps": return (HKQuantityType.quantityType(forIdentifier: .stepCount), .count(), .cumulativeSum)
+            case "activeEnergy": return (HKQuantityType.quantityType(forIdentifier: .activeEnergyBurned), .kilocalorie(), .cumulativeSum)
+            case "distance": return (HKQuantityType.quantityType(forIdentifier: .distanceWalkingRunning), .meter(), .cumulativeSum)
+            case "heartRate": return (HKQuantityType.quantityType(forIdentifier: .heartRate), bpm, .discreteAverage)
+            case "restingHeartRate": return (HKQuantityType.quantityType(forIdentifier: .restingHeartRate), bpm, .discreteAverage)
+            case "heartRateVariability": return (HKQuantityType.quantityType(forIdentifier: .heartRateVariabilitySDNN), .secondUnit(with: .milli), .discreteAverage)
+            case "bodyMass": return (HKQuantityType.quantityType(forIdentifier: .bodyMass), .gramUnit(with: .kilo), .mostRecent)
+            default: return nil
+            }
+        }
+
+        private static func statisticValue(_ statistics: HKStatistics, options: HKStatisticsOptions, unit: HKUnit) -> Double? {
+            if options.contains(.cumulativeSum) { return statistics.sumQuantity()?.doubleValue(for: unit) }
+            if options.contains(.mostRecent) { return statistics.mostRecentQuantity()?.doubleValue(for: unit) }
+            return statistics.averageQuantity()?.doubleValue(for: unit)
+        }
+
+        private static let healthDayFormatter: DateFormatter = {
+            let formatter = DateFormatter()
+            formatter.calendar = Calendar(identifier: .gregorian)
+            formatter.locale = Locale(identifier: "en_US_POSIX")
+            formatter.timeZone = .current
+            formatter.dateFormat = "yyyy-MM-dd"
+            return formatter
+        }()
+
+        /// A stable name for a workout's activity, independent of the SDK's
+        /// raw values, so a page can map it to its own sports.
+        private static func workoutTypeName(_ type: HKWorkoutActivityType) -> String {
+            switch type {
+            case .running: return "running"
+            case .cycling: return "cycling"
+            case .walking: return "walking"
+            case .hiking: return "hiking"
+            case .swimming: return "swimming"
+            case .rowing: return "rowing"
+            case .elliptical: return "elliptical"
+            case .stairClimbing, .stairs: return "stairClimbing"
+            case .yoga: return "yoga"
+            case .pilates: return "pilates"
+            case .functionalStrengthTraining, .traditionalStrengthTraining, .coreTraining: return "strength"
+            case .highIntensityIntervalTraining: return "hiit"
+            case .crossTraining, .mixedCardio: return "crossTraining"
+            case .crossCountrySkiing: return "crossCountrySkiing"
+            case .downhillSkiing, .snowboarding: return "skiing"
+            case .paddleSports: return "paddling"
+            case .climbing: return "climbing"
+            case .dance, .socialDance, .cardioDance: return "dance"
+            case .cooldown, .flexibility, .mindAndBody: return "mobility"
+            default: return "other"
+            }
+        }
+
+        /// Workouts in Apple Health — the watch's, and every app's that
+        /// writes there — newest first, with the numbers a training log needs.
+        private func getHealthWorkouts(startDate: Double?, endDate: Double?, limit: Int?, callbackId: String?) {
+            guard let healthStore = healthStore else {
+                rejectCallback(callbackId, error: "HealthKit not available")
+                return
+            }
+
+            let start = startDate.map { Date(timeIntervalSince1970: $0 / 1000) } ?? Calendar.current.date(byAdding: .day, value: -30, to: Date())!
+            let end = endDate.map { Date(timeIntervalSince1970: $0 / 1000) } ?? Date()
+            let predicate = HKQuery.predicateForSamples(withStart: start, end: end, options: [])
+            let newestFirst = NSSortDescriptor(key: HKSampleSortIdentifierStartDate, ascending: false)
+            let cap = max(1, min(limit ?? 200, 1000))
+
+            let query = HKSampleQuery(sampleType: HKObjectType.workoutType(), predicate: predicate, limit: cap, sortDescriptors: [newestFirst]) { [weak self] _, samples, error in
+                if let error = error, (error as? HKError)?.code != .errorNoData {
+                    self?.rejectCallback(callbackId, error: error.localizedDescription)
+                    return
+                }
+
+                let bpm = HKUnit.count().unitDivided(by: .minute())
+                let workouts: [[String: Any]] = (samples as? [HKWorkout] ?? []).map { workout in
+                    var item: [String: Any] = [
+                        "id": workout.uuid.uuidString,
+                        "type": Self.workoutTypeName(workout.workoutActivityType),
+                        "startDate": workout.startDate.timeIntervalSince1970 * 1000,
+                        "endDate": workout.endDate.timeIntervalSince1970 * 1000,
+                        "durationSeconds": workout.duration,
+                        "sourceName": workout.sourceRevision.source.name,
+                        "indoor": (workout.metadata?[HKMetadataKeyIndoorWorkout] as? Bool) ?? false,
+                    ]
+                    if let meters = workout.totalDistance?.doubleValue(for: .meter()), meters > 0 {
+                        item["distanceMeters"] = meters
+                    }
+                    if let ascent = workout.metadata?[HKMetadataKeyElevationAscended] as? HKQuantity {
+                        item["elevationGainMeters"] = ascent.doubleValue(for: .meter())
+                    }
+                    if #available(iOS 16.0, *) {
+                        if let heartType = HKQuantityType.quantityType(forIdentifier: .heartRate),
+                           let heart = workout.statistics(for: heartType) {
+                            if let average = heart.averageQuantity()?.doubleValue(for: bpm) { item["averageHeartRate"] = average }
+                            if let maximum = heart.maximumQuantity()?.doubleValue(for: bpm) { item["maxHeartRate"] = maximum }
+                        }
+                        if let energyType = HKQuantityType.quantityType(forIdentifier: .activeEnergyBurned),
+                           let calories = workout.statistics(for: energyType)?.sumQuantity()?.doubleValue(for: .kilocalorie()) {
+                            item["activeEnergyCalories"] = calories
+                        }
+                    } else if let calories = workout.totalEnergyBurned?.doubleValue(for: .kilocalorie()) {
+                        item["activeEnergyCalories"] = calories
+                    }
+                    return item
+                }
+                self?.resolveCallback(callbackId, result: workouts)
+            }
+            healthStore.execute(query)
+        }
+
+        /// One value per local day: a sum for steps, energy and distance, an
+        /// average for heart rate, resting heart rate and HRV, the latest
+        /// weight, and hours asleep for sleep (counted on the day you woke).
+        private func getHealthDailyStatistics(type: String, startDate: Double?, endDate: Double?, callbackId: String?) {
+            guard let healthStore = healthStore else {
+                rejectCallback(callbackId, error: "HealthKit not available")
+                return
+            }
+
+            let calendar = Calendar.current
+            let end = endDate.map { Date(timeIntervalSince1970: $0 / 1000) } ?? Date()
+            let start = calendar.startOfDay(for: startDate.map { Date(timeIntervalSince1970: $0 / 1000) } ?? calendar.date(byAdding: .day, value: -30, to: end)!)
+
+            if type == "sleep" {
+                guard let sleepType = HKObjectType.categoryType(forIdentifier: .sleepAnalysis) else {
+                    rejectCallback(callbackId, error: "Sleep data is unavailable")
+                    return
+                }
+                // From the evening before the first day, so its night counts.
+                let predicate = HKQuery.predicateForSamples(withStart: calendar.date(byAdding: .hour, value: -12, to: start), end: end, options: [])
+                let query = HKSampleQuery(sampleType: sleepType, predicate: predicate, limit: HKObjectQueryNoLimit, sortDescriptors: nil) { [weak self] _, samples, error in
+                    if let error = error, (error as? HKError)?.code != .errorNoData {
+                        self?.rejectCallback(callbackId, error: error.localizedDescription)
+                        return
+                    }
+                    // Time in bed and time awake are not sleep; every asleep
+                    // stage (and the older single "asleep" value) is.
+                    let awake: Set<Int> = [HKCategoryValueSleepAnalysis.inBed.rawValue, HKCategoryValueSleepAnalysis.awake.rawValue]
+                    var secondsByDay: [String: Double] = [:]
+                    for sample in samples as? [HKCategorySample] ?? [] where !awake.contains(sample.value) {
+                        let day = Self.healthDayFormatter.string(from: sample.endDate)
+                        secondsByDay[day, default: 0] += sample.endDate.timeIntervalSince(sample.startDate)
+                    }
+                    let days = secondsByDay.keys.sorted().map { day -> [String: Any] in
+                        ["date": day, "value": (secondsByDay[day]! / 3600 * 100).rounded() / 100, "unit": "hr"]
+                    }
+                    self?.resolveCallback(callbackId, result: days)
+                }
+                healthStore.execute(query)
+                return
+            }
+
+            guard let spec = Self.healthQuantity(type), let qType = spec.type else {
+                rejectCallback(callbackId, error: "Unknown health data type")
+                return
+            }
+            let predicate = HKQuery.predicateForSamples(withStart: start, end: end, options: [])
+            let query = HKStatisticsCollectionQuery(
+                quantityType: qType,
+                quantitySamplePredicate: predicate,
+                options: spec.options,
+                anchorDate: start,
+                intervalComponents: DateComponents(day: 1)
+            )
+            query.initialResultsHandler = { [weak self] _, collection, error in
+                if let error = error, (error as? HKError)?.code != .errorNoData {
+                    self?.rejectCallback(callbackId, error: error.localizedDescription)
+                    return
+                }
+                var days: [[String: Any]] = []
+                collection?.enumerateStatistics(from: start, to: end) { statistics, _ in
+                    guard let value = Self.statisticValue(statistics, options: spec.options, unit: spec.unit) else { return }
+                    days.append([
+                        "date": Self.healthDayFormatter.string(from: statistics.startDate),
+                        "value": value,
+                        "unit": spec.unit.unitString,
+                    ])
+                }
+                self?.resolveCallback(callbackId, result: days)
+            }
+            healthStore.execute(query)
+        }
+
         // MARK: - Live Activities
         private func startLiveActivity(body: [String: Any], callbackId: String?) {
             guard #available(iOS 16.2, *), ActivityAuthorizationInfo().areActivitiesEnabled else {

package/templates/Info.plist.template

@@ -38,7 +38,7 @@
     <key>UIUserInterfaceStyle</key>
     <string>{{UI_STYLE}}</string>
     <key>UIStatusBarStyle</key>
-    <string>UIStatusBarStyleLightContent</string>
+    <string>{{STATUS_BAR_STYLE}}</string>
     <key>UIViewControllerBasedStatusBarAppearance</key>
     <false/>
 {{USAGE_DESCRIPTIONS}}