craft-native 0.0.238 → 0.0.241

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

@@ -3,6 +3,10 @@
  *
  * Generates Android apps with native Craft components and optional WebView content.
  */
+import { type AndroidMapProvider } from './native-map.js';
+export type { AndroidMapProvider } from './native-map.js';
+/** Providers this published builder can generate as real Android map views. */
+export declare const nativeMapProviders: readonly ['google', 'maplibre'];
 export { runKotlinFixture } from './testing.js';
 export { createAndroidEmulator } from './emulator.js';
 export type { AndroidEmulatorOptions, AndroidEmulatorSession } from './emulator.js';
@@ -71,8 +75,20 @@ export interface CraftAndroidConfig {
     }>;
     trustedOrigins?: string[];
     appIconPath?: 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`,
+     * white on transparent, since Android draws only its shape. Without one,
+     * a white Craft mark. Never the launcher icon, which shows as a white
+     * square.
+     */
+    notificationIconPath?: string;
+    /** The `#RRGGBB` Android tints the notification icon and app name with. The system's own colour without it. */
+    notificationColor?: string;
     googleServicesFile?: string;
-    /** Google Maps Android SDK key used by native `Map` screens. */
+    /** Native map renderer. MapLibre needs no SDK key; Google remains the default for compatibility. */
+    mapProvider?: AndroidMapProvider;
+    /** Google Maps Android SDK key, used only by the Google native map host. */
     mapsApiKey?: string;
     devServerURL?: string;
     hasBundledFallback?: boolean;

package/dist/android/src/index.js

@@ -4,6 +4,48 @@ import { cpSync, existsSync, mkdirSync as mkdirSync2, readFileSync as readFileSy
 import { dirname as dirname2, extname, isAbsolute as isAbsolute2, join as join3, relative, resolve as resolve2, sep } from "path";
 var {$ } = globalThis.Bun;
 
+// ../android/src/native-map.ts
+function androidMapHost(provider = "google") {
+  if (provider === "google")
+    return {
+      template: "CraftNativeMapGoogle.kt.template",
+      imports: `import com.google.android.gms.maps.CameraUpdateFactory
+import com.google.android.gms.maps.GoogleMap
+import com.google.android.gms.maps.MapView
+import com.google.android.gms.maps.OnMapReadyCallback
+import com.google.android.gms.maps.model.BitmapDescriptorFactory
+import com.google.android.gms.maps.model.LatLng
+import com.google.android.gms.maps.model.LatLngBounds
+import com.google.android.gms.maps.model.Marker
+import com.google.android.gms.maps.model.MarkerOptions
+import com.google.android.gms.maps.model.Polyline
+import com.google.android.gms.maps.model.PolylineOptions`,
+      dependency: "com.google.android.gms:play-services-maps:18.2.0"
+    };
+  if (provider === "maplibre")
+    return {
+      template: "CraftNativeMapLibre.kt.template",
+      imports: `import org.maplibre.android.MapLibre
+import org.maplibre.android.camera.CameraPosition
+import org.maplibre.android.camera.CameraUpdateFactory
+import org.maplibre.android.geometry.LatLng
+import org.maplibre.android.geometry.LatLngBounds
+import org.maplibre.android.location.LocationComponentActivationOptions
+import org.maplibre.android.maps.MapLibreMap
+import org.maplibre.android.maps.MapView
+import org.maplibre.android.maps.OnMapReadyCallback
+import org.maplibre.android.maps.Style
+import org.maplibre.android.style.expressions.Expression
+import org.maplibre.android.style.layers.CircleLayer
+import org.maplibre.android.style.layers.LineLayer
+import org.maplibre.android.style.layers.SymbolLayer
+import org.maplibre.android.style.layers.PropertyFactory.*
+import org.maplibre.android.style.sources.GeoJsonSource`,
+      dependency: "org.maplibre.gl:android-sdk:13.7.1"
+    };
+  throw new Error(`Unknown Android native map provider: ${provider}. Expected google or maplibre.`);
+}
+
 // ../android/src/promise-runtime.ts
 var ANDROID_PROMISE_RUNTIME = `
 if (window.__craftRejectPendingPromises) {
@@ -315,6 +357,7 @@ async function createAndroidEmulator(options) {
 }
 
 // ../android/src/index.ts
+var nativeMapProviders = ["google", "maplibre"];
 function syncNativeFonts(fonts, output) {
   const destination = join3(output, "app/src/main/assets/NativeFonts");
   const names = new Set;
@@ -549,6 +592,7 @@ function normalizeAndroidNetworkConfig(config) {
   config.trustedOrigins = [...new Set(trustedOrigins)];
 }
 function validateAndroidConfig(config) {
+  androidMapHost(config.mapProvider);
   if (!config.appName.trim())
     throw new Error("Android app name must not be empty");
   if (config.renderer !== undefined && config.renderer !== "web" && config.renderer !== "native") {
@@ -682,6 +726,7 @@ function writeAndroidConfig(output, config) {
   writeFileSync(join3(output, "craft.config.json"), JSON.stringify(config, null, 2));
   const runtimeConfig = { ...config };
   delete runtimeConfig.appIconPath;
+  delete runtimeConfig.notificationIconPath;
   delete runtimeConfig.googleServicesFile;
   writeFileSync(join3(output, "app/src/main/assets/craft.config.json"), JSON.stringify(runtimeConfig, null, 2));
 }
@@ -802,7 +847,9 @@ function renderNativeShellManifest(config) {
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>
-        </service>`);
+        </service>
+        <meta-data android:name="com.google.firebase.messaging.default_notification_icon" android:resource="@drawable/craft_notification_icon" />${config.notificationColor ? `
+        <meta-data android:name="com.google.firebase.messaging.default_notification_color" android:resource="@color/craft_notification_color" />` : ""}`);
   }
   if (config.enableHealthConnect) {
     parts.push(`        <activity-alias
@@ -912,6 +959,18 @@ async function init(options) {
   if (config.appIconPath && ![".gif", ".jpg", ".png", ".webp"].includes(appIconExtension ?? "")) {
     throw new Error(`Unsupported Android app icon format: ${appIconExtension || "(none)"}`);
   }
+  if (config.notificationIconPath)
+    requireRegularFile(config.notificationIconPath, "Notification icon");
+  const notificationIconExtension = config.notificationIconPath ? extname(config.notificationIconPath).toLowerCase() : undefined;
+  if (config.notificationIconPath && ![".png", ".xml"].includes(notificationIconExtension ?? "")) {
+    throw new Error(`Unsupported Android notification icon format: ${notificationIconExtension || "(none)"} (use a vector drawable .xml or a white-on-transparent .png)`);
+  }
+  if (config.notificationIconPath && notificationIconExtension === ".xml" && !/<vector[\s>]/.test(readFileSync2(config.notificationIconPath, "utf8"))) {
+    throw new Error("Notification icon .xml must be an Android vector drawable (<vector>)");
+  }
+  if (config.notificationColor !== undefined && !/^#[0-9a-f]{6}$/i.test(config.notificationColor)) {
+    throw new Error(`notificationColor must be #RRGGBB, not ${String(config.notificationColor)}`);
+  }
   const dirs = [
     output,
     join3(output, "app/src/main/java", packagePath),
@@ -936,7 +995,7 @@ async function init(options) {
     cpSync(config.googleServicesFile, join3(output, "app/google-services.json"));
   }
   const mainActivityTemplate = readFileSync2(join3(TEMPLATES_DIR, config.renderer === "native" ? "MainActivityNative.kt.template" : "MainActivity.kt.template"), "utf-8");
-  const mainActivity = mainActivityTemplate.replace(/\{\{PACKAGE_NAME\}\}/g, finalPackageName).replace(/\{\{APP_NAME\}\}/g, name);
+  const mainActivity = mainActivityTemplate.replace(/\{\{NATIVE_MAP_IMPORTS\}\}/g, () => androidMapHost(config.mapProvider).imports).replace(/\{\{NATIVE_MAP_HOST\}\}/g, () => readFileSync2(join3(TEMPLATES_DIR, androidMapHost(config.mapProvider).template), "utf8")).replace(/\{\{PACKAGE_NAME\}\}/g, finalPackageName).replace(/\{\{APP_NAME\}\}/g, name);
   writeFileSync(join3(output, "app/src/main/java", packagePath, "MainActivity.kt"), mainActivity);
   writeFileSync(join3(output, "app/src/main/java", packagePath, "CraftAppLinks.kt"), readFileSync2(join3(TEMPLATES_DIR, "CraftAppLinks.kt.template"), "utf8").replace(/\{\{PACKAGE_NAME\}\}/g, finalPackageName));
   writeFileSync(join3(output, "app/src/main/java", packagePath, "CraftCrashReporter.kt"), readFileSync2(join3(TEMPLATES_DIR, "CraftCrashReporter.kt.template"), "utf-8").replace(/\{\{PACKAGE_NAME\}\}/g, finalPackageName).replace(/\{\{CRAFT_VERSION\}\}/g, CRAFT_ANDROID_VERSION));
@@ -979,11 +1038,11 @@ async function init(options) {
   mkdirSync2(nativeDir, { recursive: true });
   writeFileSync(join3(nativeDir, "CraftNative.kt"), craftNative);
   const serviceTemplate = readFileSync2(join3(TEMPLATES_DIR, "LocationRecordingService.kt.template"), "utf-8");
-  writeFileSync(join3(nativeDir, "LocationRecordingService.kt"), serviceTemplate);
+  writeFileSync(join3(nativeDir, "LocationRecordingService.kt"), serviceTemplate.replace(/\{\{PACKAGE_NAME\}\}/g, finalPackageName));
   const healthTemplate = readFileSync2(join3(TEMPLATES_DIR, config.enableHealthConnect ? "CraftHealthConnect.kt.template" : "CraftHealthConnectStub.kt.template"), "utf-8");
   writeFileSync(join3(output, "app/src/main/java", packagePath, "CraftHealthConnect.kt"), healthTemplate.replace(/\{\{PACKAGE_NAME\}\}/g, finalPackageName));
   const manifestTemplate = readFileSync2(join3(TEMPLATES_DIR, "AndroidManifest.xml.template"), "utf-8");
-  const manifest = manifestTemplate.replace(/\{\{PACKAGE_NAME\}\}/g, finalPackageName).replace(/\{\{APP_NAME\}\}/g, name).replace(/\{\{PERMISSIONS\}\}/g, renderAndroidPermissions(config)).replace(/\{\{USES_CLEARTEXT\}\}/g, config.devServerURL?.startsWith("http://") || config.enableLocalNetwork ? "true" : "false").replace(/\{\{DEEP_LINK_INTENT_FILTERS\}\}/g, renderAndroidDeepLinks(config)).replace(/\{\{BACKGROUND_SERVICE\}\}/g, config.enableBackgroundLocation ? '        <service android:name="com.craft.runtime.LocationRecordingService" android:exported="false" android:foregroundServiceType="location" android:stopWithTask="false" />' : "").replace(/\{\{NATIVE_NOTIFICATION_RECEIVER\}\}/g, config.renderer === "native" ? renderNativeShellManifest(config) : "").replace(/\{\{CRASH_REPORTER_PROVIDER\}\}/g, `        <provider android:name=".CraftCrashReporterInit" android:authorities="\${applicationId}.craft-crash" android:exported="false" android:initOrder="1000" />`).replace(/\{\{GOOGLE_MAPS_API_KEY\}\}/g, config.mapsApiKey ? `        <meta-data android:name="com.google.android.geo.API_KEY" android:value="${escapeXml(config.mapsApiKey)}" />` : "").replace(/\{\{HEALTH_CONNECT_QUERIES\}\}/g, config.enableHealthConnect ? `    <queries>
+  const manifest = manifestTemplate.replace(/\{\{PACKAGE_NAME\}\}/g, finalPackageName).replace(/\{\{APP_NAME\}\}/g, name).replace(/\{\{PERMISSIONS\}\}/g, renderAndroidPermissions(config)).replace(/\{\{USES_CLEARTEXT\}\}/g, config.devServerURL?.startsWith("http://") || config.enableLocalNetwork ? "true" : "false").replace(/\{\{DEEP_LINK_INTENT_FILTERS\}\}/g, renderAndroidDeepLinks(config)).replace(/\{\{BACKGROUND_SERVICE\}\}/g, config.enableBackgroundLocation ? '        <service android:name="com.craft.runtime.LocationRecordingService" android:exported="false" android:foregroundServiceType="location" android:stopWithTask="false" />' : "").replace(/\{\{NATIVE_NOTIFICATION_RECEIVER\}\}/g, config.renderer === "native" ? renderNativeShellManifest(config) : "").replace(/\{\{CRASH_REPORTER_PROVIDER\}\}/g, `        <provider android:name=".CraftCrashReporterInit" android:authorities="\${applicationId}.craft-crash" android:exported="false" android:initOrder="1000" />`).replace(/\{\{GOOGLE_MAPS_API_KEY\}\}/g, config.mapProvider !== "maplibre" && config.mapsApiKey ? `        <meta-data android:name="com.google.android.geo.API_KEY" android:value="${escapeXml(config.mapsApiKey)}" />` : "").replace(/\{\{HEALTH_CONNECT_QUERIES\}\}/g, config.enableHealthConnect ? `    <queries>
         <package android:name="com.google.android.apps.healthdata" />
     </queries>` : "").replace(/\{\{HEALTH_CONNECT_RATIONALE\}\}/g, config.enableHealthConnect ? `            <intent-filter>
                 <action android:name="androidx.health.ACTION_SHOW_PERMISSIONS_RATIONALE" />
@@ -996,8 +1055,8 @@ async function init(options) {
   const projectGradleTemplate = readFileSync2(join3(TEMPLATES_DIR, "build.gradle.kts.project.template"), "utf-8");
   writeFileSync(join3(output, "build.gradle.kts"), projectGradleTemplate.replace(/\{\{GOOGLE_SERVICES_PLUGIN\}\}/g, hasGoogleServices ? '    id("com.google.gms.google-services") version "4.4.2" apply false' : ""));
   const appGradleTemplate = readFileSync2(join3(TEMPLATES_DIR, "build.gradle.kts.app.template"), "utf-8");
-  const appGradle = appGradleTemplate.replace(/\{\{PACKAGE_NAME\}\}/g, finalPackageName).replace(/\{\{VERSION_NAME\}\}/g, escapeKotlinString(config.version || "1.0.0")).replace(/\{\{VERSION_CODE\}\}/g, String(config.versionCode || 1)).replace(/\{\{MIN_SDK\}\}/g, String(config.minSdk ?? ANDROID_MIN_SDK)).replace(/\{\{COMPILE_SDK\}\}/g, String(config.compileSdk || 36)).replace(/\{\{TARGET_SDK\}\}/g, String(config.targetSdk || 35)).replace(/\{\{GOOGLE_SERVICES_PLUGIN\}\}/g, hasGoogleServices ? '    id("com.google.gms.google-services")' : "").replace(/\{\{FIREBASE_MESSAGING_DEPENDENCY\}\}/g, config.enablePushNotifications ? '    implementation("com.google.firebase:firebase-messaging:24.1.0")' : "").replace(/\{\{REFRESH_LAYOUT_DEPENDENCY\}\}/g, config.renderer === "native" ? '    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")' : "").replace(/\{\{GOOGLE_MAPS_DEPENDENCY\}\}/g, config.renderer === "native" ? `    // Native STX Map overlays and trail routes
-    implementation("com.google.android.gms:play-services-maps:18.2.0")` : "").replace(/\{\{HEALTH_CONNECT_DEPENDENCIES\}\}/g, config.enableHealthConnect ? `    implementation("androidx.health.connect:connect-client:1.1.0")
+  const appGradle = appGradleTemplate.replace(/\{\{PACKAGE_NAME\}\}/g, finalPackageName).replace(/\{\{VERSION_NAME\}\}/g, escapeKotlinString(config.version || "1.0.0")).replace(/\{\{VERSION_CODE\}\}/g, String(config.versionCode || 1)).replace(/\{\{MIN_SDK\}\}/g, String(config.minSdk ?? ANDROID_MIN_SDK)).replace(/\{\{COMPILE_SDK\}\}/g, String(config.compileSdk || 36)).replace(/\{\{TARGET_SDK\}\}/g, String(config.targetSdk || 35)).replace(/\{\{GOOGLE_SERVICES_PLUGIN\}\}/g, hasGoogleServices ? '    id("com.google.gms.google-services")' : "").replace(/\{\{FIREBASE_MESSAGING_DEPENDENCY\}\}/g, config.enablePushNotifications ? '    implementation("com.google.firebase:firebase-messaging:24.1.0")' : "").replace(/\{\{REFRESH_LAYOUT_DEPENDENCY\}\}/g, config.renderer === "native" ? '    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")' : "").replace(/\{\{NATIVE_MAP_DEPENDENCY\}\}/g, config.renderer === "native" ? `    // Native STX Map overlays and trail routes
+    implementation("${androidMapHost(config.mapProvider).dependency}")` : "").replace(/\{\{HEALTH_CONNECT_DEPENDENCIES\}\}/g, config.enableHealthConnect ? `    implementation("androidx.health.connect:connect-client:1.1.0")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1")` : "").replace(/\{\{JAVASCRIPT_ENGINE_DEPENDENCY\}\}/g, config.renderer === "native" ? `    implementation("androidx.javascriptengine:javascriptengine:1.1.0")
     // Native background refresh (WorkManager).
     implementation("androidx.work:work-runtime-ktx:2.9.1")` : "");
@@ -1036,6 +1095,8 @@ zipStorePath=wrapper/dists
     <color name="primary_dark">#16162b</color>
     <color name="accent">#4ade80</color>
     <color name="background">${config.backgroundColor}</color>
+    <!-- Transparent is NotificationCompat's COLOR_DEFAULT: the system picks. -->
+    <color name="craft_notification_color">${config.notificationColor ?? "#00000000"}</color>
 </resources>
 `;
   writeFileSync(join3(output, "app/src/main/res/values/colors.xml"), colorsXml);
@@ -1064,6 +1125,21 @@ zipStorePath=wrapper/dists
   } else {
     writeFileSync(join3(output, "app/src/main/res/drawable/craft_app_icon.xml"), appIconXml);
   }
+  for (const extension of [".png", ".xml"])
+    rmSync2(join3(output, `app/src/main/res/drawable/craft_notification_icon${extension}`), { force: true });
+  if (config.notificationIconPath) {
+    cpSync(config.notificationIconPath, join3(output, `app/src/main/res/drawable/craft_notification_icon${notificationIconExtension}`));
+  } else {
+    writeFileSync(join3(output, "app/src/main/res/drawable/craft_notification_icon.xml"), `<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M18,78L42,42l12,18l12,-12l24,30z" />
+</vector>
+`);
+  }
   const themesXml = `<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <style name="Theme.CraftApp" parent="Theme.Material3.DayNight.NoActionBar">
@@ -1286,6 +1362,7 @@ export {
   renderAndroidPermissions,
   renderAndroidDeepLinks,
   open,
+  nativeMapProviders,
   installRuntime,
   init,
   healthConnectPermissions,

package/dist/android/src/native-map.d.ts

@@ -0,0 +1,7 @@
+/** Build-time native map selection. Both providers are native Android views. */
+export type AndroidMapProvider = 'google' | 'maplibre';
+export declare function androidMapHost(provider?: AndroidMapProvider): {
+    template: string;
+    imports: string;
+    dependency: string;
+};

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

@@ -3475,7 +3475,8 @@ class CraftBridge(
             val notificationManager = activity.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 
             val builder = androidx.core.app.NotificationCompat.Builder(activity, notificationChannelId)
-                .setSmallIcon(android.R.drawable.ic_dialog_info)
+                .setSmallIcon(R.drawable.craft_notification_icon)
+                .setColor(ContextCompat.getColor(activity, R.color.craft_notification_color))
                 .setContentTitle(title)
                 .setContentText(body)
                 .setPriority(androidx.core.app.NotificationCompat.PRIORITY_DEFAULT)