craft-native 0.0.187 → 0.0.191

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

@@ -341,6 +341,18 @@ object CraftNative {
         nodeData: FloatArray,
         treeMeta: FloatArray,
     ): FloatArray?
+    private external fun nativeLayoutTreeV2(
+        width: Float,
+        height: Float,
+        nodeData: FloatArray,
+        treeMeta: FloatArray,
+    ): FloatArray?
+    private external fun nativeLayoutTreeV3(
+        width: Float,
+        height: Float,
+        nodeData: FloatArray,
+        treeMeta: FloatArray,
+    ): FloatArray?
     private external fun nativeClipboardRead(activity: Activity): String?
     private external fun nativeClipboardWrite(activity: Activity, text: String): Boolean
     private external fun nativeOpenUrl(activity: Activity, url: String): Boolean
@@ -601,6 +613,28 @@ object CraftNative {
         }
     }
 
+    /** Resolve a reverse-aware tree in Zig, or null for Kotlin fallback. */
+    fun layoutTreeV2(width: Float, height: Float, nodeData: FloatArray, treeMeta: FloatArray): FloatArray? {
+        if (!isAvailable || nodeData.isEmpty() || treeMeta.isEmpty()) return null
+        return try {
+            nativeLayoutTreeV2(width, height, nodeData, treeMeta)
+                ?.takeIf { it.size >= treeMeta.size / 2 * 4 && it.all { value -> value.isFinite() } }
+        } catch (e: UnsatisfiedLinkError) {
+            null
+        }
+    }
+
+    /** Resolve a wrap-reverse-aware tree in Zig, or null for Kotlin fallback. */
+    fun layoutTreeV3(width: Float, height: Float, nodeData: FloatArray, treeMeta: FloatArray): FloatArray? {
+        if (!isAvailable || nodeData.isEmpty() || treeMeta.isEmpty()) return null
+        return try {
+            nativeLayoutTreeV3(width, height, nodeData, treeMeta)
+                ?.takeIf { it.size >= treeMeta.size / 2 * 4 && it.all { value -> value.isFinite() } }
+        } catch (e: UnsatisfiedLinkError) {
+            null
+        }
+    }
+
     /**
      * The clipboard's text, or null to use the Kotlin implementation.
      *

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

@@ -104,6 +104,7 @@ internal class CraftNativeCapabilities(
         val maxPixels: Int,
         val quality: Float,
         val completion: (CraftNativeCapabilityResult) -> Unit,
+        val videoLimit: Long = 0,
     )
 
     init {
@@ -166,6 +167,7 @@ internal class CraftNativeCapabilities(
             }
             "Files" -> when (method) {
                 "pickImage" -> pickImage(requestToken, args, completion)
+                "pickVideo" -> pickVideo(requestToken, args, completion)
                 "download", "write", "remove" -> networkExecutor.execute {
                     complete(requestToken, files(requestToken, method, args), completion)
                 }
@@ -238,21 +240,28 @@ internal class CraftNativeCapabilities(
                     }
                 }
                 if (body != null || multipart is FileResult.Multipart) doOutput = true
-                if (multipart is FileResult.Multipart) setRequestProperty("Content-Type", "multipart/form-data; boundary=${multipart.boundary}")
+                if (multipart is FileResult.Multipart) {
+                    setRequestProperty("Content-Type", "multipart/form-data; boundary=${multipart.boundary}")
+                    setFixedLengthStreamingMode(multipart.body.length())
+                    readTimeout = 600_000
+                }
             }
         } catch (error: IllegalArgumentException) {
+            if (multipart is FileResult.Multipart) multipart.body.parentFile?.deleteRecursively()
             return failure("INVALID_ARGUMENT", error.message ?: "fetch request is invalid")
         } catch (error: Exception) {
+            if (multipart is FileResult.Multipart) multipart.body.parentFile?.deleteRecursively()
             return failure("NETWORK_ERROR", error.message ?: "Network request failed")
         }
         fetchConnections[requestToken] = connection
         if (cancelled.contains(requestToken)) {
             fetchConnections.remove(requestToken)?.disconnect()
+            if (multipart is FileResult.Multipart) multipart.body.parentFile?.deleteRecursively()
             return failure("CANCELLED", "Network request was cancelled")
         }
         return try {
             if (body != null) connection.outputStream.use { it.write(body.toByteArray(Charsets.UTF_8)) }
-            if (multipart is FileResult.Multipart) connection.outputStream.use { it.write(multipart.body) }
+            if (multipart is FileResult.Multipart) connection.outputStream.use { output -> multipart.body.inputStream().use { it.copyTo(output, 64 * 1024) } }
             val status = connection.responseCode
             val input = if (status >= 400) connection.errorStream else connection.inputStream
             val output = ByteArrayOutputStream()
@@ -283,17 +292,21 @@ internal class CraftNativeCapabilities(
             failure("NETWORK_ERROR", error.message ?: "Network request failed")
         } finally {
             fetchConnections.remove(requestToken)?.disconnect()
+            if (multipart is FileResult.Multipart) multipart.body.parentFile?.deleteRecursively()
         }
     }
 
     private sealed interface FileResult {
-        data class Multipart(val body: ByteArray, val boundary: String) : FileResult
+        data class Multipart(val body: File, val boundary: String) : FileResult
         data class Failure(val code: String, val message: String) : FileResult
     }
 
     private fun multipart(parts: JSONArray): FileResult {
         val boundary = "craft-${UUID.randomUUID()}"
-        val body = ByteArrayOutputStream()
+        val file = File(fileRoot, UUID.randomUUID().toString()).apply { mkdirs() }.resolve("upload.multipart")
+        var kept = false
+        try {
+        FileOutputStream(file).use { body ->
         fun append(value: String) { body.write(value.toByteArray(Charsets.UTF_8)) }
         for (index in 0 until parts.length()) {
             val part = parts.optJSONObject(index) ?: return FileResult.Failure("INVALID_ARGUMENT", "A form part must be an object")
@@ -303,14 +316,11 @@ internal class CraftNativeCapabilities(
             val path = part.optString("path")
             if (path.isNotBlank()) {
                 val file = ownedFile(path) ?: return FileResult.Failure("INVALID_ARGUMENT", "A form file must be one craft.files made, and still there")
-                val bytes = runCatching { file.readBytes() }.getOrElse {
-                    return FileResult.Failure("INVALID_ARGUMENT", "A form file could not be read")
-                }
                 val filename = safeFileName(part.optString("filename").ifBlank { file.name })
                 val type = part.optString("type").ifBlank { URLConnection.guessContentTypeFromName(filename) ?: "application/octet-stream" }
                 append("Content-Disposition: form-data; name=\"${quoted(name)}\"; filename=\"${quoted(filename)}\"\r\n")
                 append("Content-Type: ${headerValue(type)}\r\n\r\n")
-                body.write(bytes)
+                file.inputStream().use { it.copyTo(body, 64 * 1024) }
                 append("\r\n")
             } else {
                 append("Content-Disposition: form-data; name=\"${quoted(name)}\"\r\n\r\n")
@@ -319,7 +329,14 @@ internal class CraftNativeCapabilities(
             }
         }
         append("--$boundary--\r\n")
-        return FileResult.Multipart(body.toByteArray(), boundary)
+        }
+        kept = true
+        return FileResult.Multipart(file, boundary)
+        } catch (error: Exception) {
+            return FileResult.Failure("WRITE_ERROR", error.message ?: "A form file could not be read")
+        } finally {
+            if (!kept) file.parentFile?.deleteRecursively()
+        }
     }
 
     private fun files(requestToken: String, method: String, args: JSONArray): CraftNativeCapabilityResult {
@@ -417,6 +434,64 @@ internal class CraftNativeCapabilities(
         return success(JSONObject().put("ok", false).put("status", status).put("body", body.toString(Charsets.UTF_8.name())))
     }
 
+    private fun pickVideo(requestToken: String, args: JSONArray, completion: (CraftNativeCapabilityResult) -> Unit) {
+        mainHandler.post {
+            val host = activity ?: return@post complete(requestToken, failure("NEEDS_ACTIVITY", "No screen is showing to pick from"), completion)
+            if (pendingFilePick != null) {
+                complete(requestToken, failure("BUSY", "Another file picker is already open"), completion)
+                return@post
+            }
+            val options = args.optJSONObject(0) ?: JSONObject()
+            val limit = options.optLong("maxBytes", 512L * 1024 * 1024).coerceIn(1, 512L * 1024 * 1024)
+            pendingFilePick = PendingFilePick(requestToken, "video", 0, 1f, completion, limit)
+            val photos = options.optString("source", "library") != "files" && Build.VERSION.SDK_INT >= 33
+            val intent = Intent(if (photos) MediaStore.ACTION_PICK_IMAGES else Intent.ACTION_OPEN_DOCUMENT).apply {
+                type = "video/*"
+                if (!photos) addCategory(Intent.CATEGORY_OPENABLE)
+                addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+            }
+            try { host.startActivityForResult(intent, CRAFT_NATIVE_FILE_PICK_REQUEST) }
+            catch (error: Exception) {
+                pendingFilePick = null
+                complete(requestToken, failure("PICKER_UNAVAILABLE", error.message ?: "Video picker could not be opened"), completion)
+            }
+        }
+    }
+
+    /** Copy with a bound even when a cloud provider does not report its size. */
+    private fun copyVideo(uri: Uri, limit: Long): CraftNativeCapabilityResult {
+        var target: File? = null
+        return try {
+            val name = context.contentResolver.query(uri, arrayOf(android.provider.OpenableColumns.DISPLAY_NAME), null, null, null)?.use {
+                if (it.moveToFirst()) it.getString(0) else null
+            } ?: "video.mp4"
+            val types = mapOf("mp4" to "video/mp4", "m4v" to "video/x-m4v", "mov" to "video/quicktime", "webm" to "video/webm")
+            val type = types[name.substringAfterLast('.', "").lowercase()]
+                ?: return failure("INVALID_VIDEO", "Choose an MP4, MOV or WebM video.")
+            val destination = File(fileRoot, UUID.randomUUID().toString()).apply { mkdirs() }.resolve(safeFileName(name))
+            target = destination
+            val input = context.contentResolver.openInputStream(uri) ?: throw IllegalArgumentException("The video could not be read")
+            var size = 0L
+            input.use { source ->
+                destination.outputStream().use { output ->
+                    val buffer = ByteArray(64 * 1024)
+                    while (true) {
+                        val count = source.read(buffer)
+                        if (count < 0) break
+                        size += count
+                        require(size <= limit) { "Choose a video under ${limit / 1024 / 1024}MB." }
+                        output.write(buffer, 0, count)
+                    }
+                }
+            }
+            require(size > 0) { "Choose a nonempty video." }
+            success(descriptor(destination, type))
+        } catch (error: Exception) {
+            target?.parentFile?.deleteRecursively()
+            failure("READ_ERROR", error.message ?: "The video could not be read")
+        }
+    }
+
     private fun pickImage(
         requestToken: String,
         args: JSONArray,
@@ -465,6 +540,14 @@ internal class CraftNativeCapabilities(
             complete(pending.requestToken, success(JSONObject.NULL), pending.completion)
             return true
         }
+        if (pending.source == "video") {
+            networkExecutor.execute {
+                val result = data?.data?.let { copyVideo(it, pending.videoLimit) }
+                    ?: failure("PICKER_FAILED", "The selected video could not be read")
+                complete(pending.requestToken, result, pending.completion)
+            }
+            return true
+        }
         val descriptor = if (pending.source == "camera") {
             val bitmap = data?.extras?.get("data") as? Bitmap
             bitmap?.let { writeImage(it, pending.maxPixels, pending.quality, "photo.jpg") }

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

@@ -576,10 +576,14 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
     private val buttons = LinearLayout(context)
     private val tabBar = LinearLayout(context)
     private val tabViews = mutableListOf<Pair<TextView, TextView>>()
+    private val tabIconText = mutableMapOf<String, String>()
+    private val tabImageURLs = mutableMapOf<String, String>()
+    private val tabImages = mutableMapOf<String, android.graphics.drawable.Drawable>()
     private val density = resources.displayMetrics.density
     private var selectedTab = 0
     private var swipeTracking = false
     private var swipeIntercepted = false
+    private var horizontalScrollDeferred = false
     private var swipeDownX = 0f
     private var swipeDownY = 0f
     private val swipeSlop = ViewConfiguration.get(context).scaledTouchSlop
@@ -590,6 +594,8 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
     var onTabSwipeStart: ((Float, Float, Float) -> Boolean)? = null
     var onTabSwipeMove: ((Float) -> Unit)? = null
     var onTabSwipeEnd: ((Float, Boolean) -> Unit)? = null
+    /** Lets a native horizontal scroller own the gesture from its first down. */
+    var onTabSwipeShouldDefer: ((Float, Float) -> Boolean)? = null
     var tabSwipeEnabled = true
 
     init {
@@ -654,7 +660,10 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
     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
+                val overHorizontalScroll = onTabSwipeShouldDefer?.invoke(event.x, event.y) == true
+                horizontalScrollDeferred = overHorizontalScroll
+                if (overHorizontalScroll) parent?.requestDisallowInterceptTouchEvent(true)
+                swipeTracking = tabs.size > 1 && tabSwipeEnabled && !overHorizontalScroll && tabBar.visibility == View.VISIBLE && event.y < tabBar.top
                 swipeIntercepted = false
                 swipeDownX = event.x
                 swipeDownY = event.y
@@ -668,7 +677,13 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
                     return swipeIntercepted
                 }
             }
-            MotionEvent.ACTION_CANCEL, MotionEvent.ACTION_UP -> swipeTracking = false
+            MotionEvent.ACTION_CANCEL, MotionEvent.ACTION_UP -> {
+                swipeTracking = false
+                if (horizontalScrollDeferred) {
+                    horizontalScrollDeferred = false
+                    parent?.requestDisallowInterceptTouchEvent(false)
+                }
+            }
         }
         return swipeIntercepted
     }
@@ -691,6 +706,7 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
 
     /** Draws `options` (a screen's `setOptions`) for a screen `depth` deep in its stack. */
     fun apply(options: JSONObject, depth: Int, fallbackTitle: String?) {
+        options.optJSONObject("tabItem")?.let(::updateTab)
         val hidden = options.optBoolean("hidden", false)
         val large = options.optBoolean("largeTitle", false) && depth == 0
         val title = options.optString("title").takeIf { options.has("title") } ?: fallbackTitle.orEmpty()
@@ -716,6 +732,42 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
         refreshColors()
     }
 
+    private fun updateTab(item: JSONObject) {
+        val id = item.optString("id")
+        val index = tabs.indexOfFirst { it.id == id }
+        if (index < 0) return
+        val cell = tabBar.getChildAt(index)
+        if (item.has("accessibilityLabel")) cell.contentDescription = item.optString("accessibilityLabel").takeUnless { item.isNull("accessibilityLabel") || it.isBlank() } ?: tabs[index].title
+        if (item.has("iconText")) {
+            tabIconText.remove(id)
+            item.optString("iconText").takeUnless { item.isNull("iconText") || it.isBlank() }?.let { tabIconText[id] = it.take(8) }
+        }
+        if (item.has("image")) {
+            val address = item.optString("image").takeIf { !item.isNull("image") && it.startsWith("https://") }
+            if (address != tabImageURLs[id]) {
+                tabImages.remove(id)
+                tabImageURLs.remove(id)
+                if (address != null) {
+                    tabImageURLs[id] = address
+                    Thread {
+                        val image = runCatching {
+                            val connection = java.net.URL(address).openConnection().apply { connectTimeout = 5000; readTimeout = 5000 }
+                            val bitmap = connection.getInputStream().use { android.graphics.BitmapFactory.decodeStream(it) } ?: return@runCatching null
+                            androidx.core.graphics.drawable.RoundedBitmapDrawableFactory.create(resources, android.graphics.Bitmap.createScaledBitmap(bitmap, dp(27), dp(27), true)).apply { isCircular = true }
+                        }.getOrNull()
+                        post {
+                            if (tabImageURLs[id] == address && image != null) {
+                                tabImages[id] = image
+                                refreshColors()
+                            }
+                        }
+                    }.start()
+                }
+            }
+        }
+        refreshColors()
+    }
+
     /** Light or dark changed: the bars follow the screen's background. */
     fun refreshColors() {
         val background = ContextCompat.getColor(context, R.color.background)
@@ -737,11 +789,12 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
         )).apply { setLayerInset(1, 0, maxOf(1, (density / 2).toInt()), 0, 0) }
         tabViews.forEachIndexed { index, (icon, label) ->
             val color = if (index == selectedTab) accent else muted
-            icon.setTextColor(color)
+            val number = tabIconText[tabs[index].id]
+            icon.setTextColor(if (number != null) Color.parseColor("#FF2D55") else color)
             label.setTextColor(color)
-            val vector = CraftNativeIcons.drawable(context, null, tabs[index].symbol, color)
+            val vector = tabImages[tabs[index].id] ?: if (number == null) CraftNativeIcons.drawable(context, null, tabs[index].symbol, color) else null
             icon.foreground = vector
-            if (vector != null) icon.text = ""
+            icon.text = if (vector != null) "" else number ?: CraftNativeSymbols.glyph(tabs[index].symbol)
         }
         for (index in 0 until buttons.childCount) (buttons.getChildAt(index) as? TextView)?.setTextColor(accent)
     }