craft-native 0.0.172 → 0.0.174

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

@@ -52,6 +52,8 @@ export interface CraftAndroidConfig {
     trustedOrigins?: string[];
     appIconPath?: string;
     googleServicesFile?: string;
+    /** Google Maps Android SDK key used by native `Map` screens. */
+    mapsApiKey?: string;
     devServerURL?: string;
     hasBundledFallback?: boolean;
     /** Android API level, at least ANDROID_MIN_SDK (26). */

package/dist/android/src/index.js

@@ -271,6 +271,9 @@ function validateAndroidConfig(config) {
   if (config.backgroundColorDark !== undefined && !config.backgroundColorDark.match(/^#[\dA-F]{3,4}$|^#[\dA-F]{6}$|^#[\dA-F]{8}$/i)) {
     throw new Error(`Invalid Android dark background color: ${config.backgroundColorDark}`);
   }
+  if (config.mapsApiKey !== undefined && !config.mapsApiKey.trim()) {
+    throw new Error("Android mapsApiKey must not be empty");
+  }
   for (const [name, value] of [
     ["versionCode", config.versionCode],
     ["minSdk", config.minSdk],
@@ -570,7 +573,7 @@ async function init(options) {
   const healthTemplate = readFileSync(join(TEMPLATES_DIR, config.enableHealthConnect ? "CraftHealthConnect.kt.template" : "CraftHealthConnectStub.kt.template"), "utf-8");
   writeFileSync(join(output, "app/src/main/java", packagePath, "CraftHealthConnect.kt"), healthTemplate.replace(/\{\{PACKAGE_NAME\}\}/g, finalPackageName));
   const manifestTemplate = readFileSync(join(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(/\{\{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(/\{\{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>
         <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" />

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

@@ -30,6 +30,8 @@
         android:hardwareAccelerated="true"
         tools:targetApi="34">
 
+{{GOOGLE_MAPS_API_KEY}}
+
         <activity
             android:name=".MainActivity"
             android:exported="true"

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

@@ -13,8 +13,10 @@ import android.text.TextUtils
 import android.util.Log
 import android.util.TypedValue
 import android.view.Gravity
+import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
+import android.view.ViewConfiguration
 import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.LinearLayout
@@ -576,10 +578,19 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
     private val tabViews = mutableListOf<Pair<TextView, TextView>>()
     private val density = resources.displayMetrics.density
     private var selectedTab = 0
+    private var swipeTracking = false
+    private var swipeIntercepted = false
+    private var swipeDownX = 0f
+    private var swipeDownY = 0f
+    private val swipeSlop = ViewConfiguration.get(context).scaledTouchSlop
 
     var onBack: (() -> Unit)? = null
     var onButton: ((String) -> Unit)? = null
     var onTab: ((Int) -> Unit)? = null
+    var onTabSwipeStart: ((Float, Float, Float) -> Boolean)? = null
+    var onTabSwipeMove: ((Float) -> Unit)? = null
+    var onTabSwipeEnd: ((Float, Boolean) -> Unit)? = null
+    var tabSwipeEnabled = true
 
     init {
         orientation = VERTICAL
@@ -640,6 +651,44 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
         refreshColors()
     }
 
+    override fun onInterceptTouchEvent(event: MotionEvent): Boolean {
+        when (event.actionMasked) {
+            MotionEvent.ACTION_DOWN -> {
+                swipeTracking = tabs.size > 1 && tabSwipeEnabled && tabBar.visibility == View.VISIBLE && event.y < tabBar.top
+                swipeIntercepted = false
+                swipeDownX = event.x
+                swipeDownY = event.y
+            }
+            MotionEvent.ACTION_MOVE -> if (swipeTracking && !swipeIntercepted) {
+                val dx = event.x - swipeDownX
+                val dy = event.y - swipeDownY
+                if (kotlin.math.abs(dx) > swipeSlop && kotlin.math.abs(dx) > kotlin.math.abs(dy)) {
+                    swipeTracking = false
+                    swipeIntercepted = onTabSwipeStart?.invoke(dx, event.x, event.y) == true
+                    return swipeIntercepted
+                }
+            }
+            MotionEvent.ACTION_CANCEL, MotionEvent.ACTION_UP -> swipeTracking = false
+        }
+        return swipeIntercepted
+    }
+
+    override fun onTouchEvent(event: MotionEvent): Boolean {
+        if (!swipeIntercepted) return super.onTouchEvent(event)
+        when (event.actionMasked) {
+            MotionEvent.ACTION_MOVE -> onTabSwipeMove?.invoke(event.x - swipeDownX)
+            MotionEvent.ACTION_UP -> {
+                onTabSwipeEnd?.invoke(event.x - swipeDownX, false)
+                swipeIntercepted = false
+            }
+            MotionEvent.ACTION_CANCEL -> {
+                onTabSwipeEnd?.invoke(event.x - swipeDownX, true)
+                swipeIntercepted = false
+            }
+        }
+        return true
+    }
+
     /** Draws `options` (a screen's `setOptions`) for a screen `depth` deep in its stack. */
     fun apply(options: JSONObject, depth: Int, fallbackTitle: String?) {
         val hidden = options.optBoolean("hidden", false)
@@ -659,6 +708,7 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
         }
         val tabBarHidden = options.optBoolean("tabBarHidden", false) || depth > 0 && options.optBoolean("tabBarHiddenWhenPushed", false)
         tabBar.visibility = if (tabs.isEmpty() || tabBarHidden) View.GONE else View.VISIBLE
+        tabSwipeEnabled = options.optBoolean("tabSwipeEnabled", true)
     }
 
     fun selectTab(index: Int) {