@craft-native/android 0.0.140 → 0.0.142

package/README.md

@@ -97,13 +97,17 @@ craft android build --native-bundle ../native-screen.js
 ```
 
 Native mode maps STX `View`, `SafeAreaView`, `Text`, `Button`, `Link`,
-`Pressable`, `TouchableOpacity`, `TouchableHighlight`, `TextInput`, `Picker`, `Modal`, `Switch`, `Slider`, `ActivityIndicator`, `Image`, `ScrollView`,
+`Pressable`, `TouchableOpacity`, `TouchableHighlight`, `TextInput`, `Picker`, `Modal`, `Switch`, `Slider`, `ActivityIndicator`, `Image`, `Video`, `ScrollView`,
 and `FlatList` to Android views. `Picker` renders `<select>`/`<option>` values
 with `onValueChange` or `onChange`. `Modal` is parent-scoped and supports
 `visible`, `transparent`, `animationType`, `onShow`, `onDismiss`, and
 `onRequestClose` for Android back handling. `Switch` supports state-aware `trackColor`
 and `thumbColor`, while `Slider` supports track/thumb tint props and `step`
-snapping. `Image` reports load lifecycle events and structured failures.
+snapping. `ActivityIndicator` keeps a visible stopped indicator genuinely
+non-animated when `animating={false}` and `hidesWhenStopped={false}`. `Image`
+reports load lifecycle events and structured failures. `Video` uses the native
+`VideoView` for URI playback with autoplay, pause, looping, mute, controls, and
+resize-mode props.
 `FlatList` uses
 `RecyclerView`, stable IDs, and `DiffUtil` for keyed recycling, grids,
 horizontal and inverted layouts, list chrome, and end-reached pagination.
@@ -116,6 +120,8 @@ same shrink defaults as the iOS renderer; buttons and editable fields retain
 their intrinsic width unless explicitly configured.
 Wrapped containers also honor `alignContent` (`center`, `flex-end`,
 `space-between`, `space-around`, and `stretch`) consistently across hosts.
+Shared wrapped-line IDs are accepted only when they are complete and monotonic;
+invalid bridge data falls back to the host layout implementation.
 Push, replace, and back preserve the
 previous screen's views and JavaScript state; Android's system back button pops
 the route. Native mode accepts neither `--html-path` nor `--dev-server`. Its

package/package.json

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

package/templates/CraftNative.kt.template

@@ -35,6 +35,7 @@ import com.google.mlkit.vision.objects.defaults.ObjectDetectorOptions
 import com.google.mlkit.vision.text.TextRecognition
 import com.google.mlkit.vision.text.latin.TextRecognizerOptions
 import org.json.JSONArray
+import kotlin.math.roundToInt
 import androidx.biometric.BiometricManager
 import androidx.biometric.BiometricPrompt
 import androidx.fragment.app.FragmentActivity
@@ -231,6 +232,54 @@ object CraftNative {
     private external fun nativeGetDeviceInfo(activity: Activity): String?
     private external fun nativeGetMemoryUsage(): String?
     private external fun nativeLog(message: String): Boolean
+    private external fun nativeFlexRow(
+        available: Float,
+        gap: Float,
+        justify: Int,
+        basis: FloatArray,
+        grow: FloatArray,
+        shrink: FloatArray,
+        min: FloatArray,
+        max: FloatArray,
+        margins: FloatArray,
+    ): FloatArray?
+    private external fun nativeFlexLineBreaks(
+        available: Float,
+        gap: Float,
+        wrap: Int,
+        basis: FloatArray,
+        margins: FloatArray,
+    ): FloatArray?
+    private external fun nativeFlexLineDistribution(
+        available: Float,
+        gap: Float,
+        alignment: Int,
+        lineCrosses: FloatArray,
+    ): FloatArray?
+    private external fun nativeCrossAxisPosition(
+        available: Float,
+        size: Float,
+        leading: Float,
+        trailing: Float,
+        alignment: Int,
+    ): Float
+    private external fun nativeGrid(
+        availableWidth: Float,
+        availableHeight: Float,
+        columns: Int,
+        columnGap: Float,
+        rowGap: Float,
+        intrinsicWidth: FloatArray,
+        intrinsicHeight: FloatArray,
+        explicitWidth: FloatArray,
+        explicitHeight: FloatArray,
+        minWidth: FloatArray,
+        maxWidth: FloatArray,
+        minHeight: FloatArray,
+        maxHeight: FloatArray,
+        margins: FloatArray,
+        flags: 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
@@ -386,6 +435,94 @@ object CraftNative {
         }
     }
 
+    /** Resolve a flex line in Zig, or null for the Kotlin fallback. */
+    fun flexRow(
+        available: Float,
+        gap: Float,
+        justify: Int,
+        basis: FloatArray,
+        grow: FloatArray,
+        shrink: FloatArray,
+        min: FloatArray,
+        max: FloatArray,
+        margins: FloatArray,
+    ): FloatArray? {
+        if (!isAvailable) return null
+        return try {
+            // The shared result stores widths in the first half and the
+            // corresponding main-axis positions in the second half.
+            nativeFlexRow(available, gap, justify, basis, grow, shrink, min, max, margins)
+                ?.takeIf { it.size >= basis.size && it.all { value -> value.isFinite() } }
+        } catch (e: UnsatisfiedLinkError) {
+            null
+        }
+    }
+
+    /** Form wrapped flex lines in Zig, or null for the Kotlin fallback. */
+    fun flexLines(available: Float, gap: Float, wrap: Boolean, basis: FloatArray, margins: FloatArray): IntArray? {
+        if (!isAvailable) return null
+        return try {
+            nativeFlexLineBreaks(available, gap, if (wrap) 1 else 0, basis, margins)
+                ?.takeIf { it.size >= basis.size && it.all { value -> value.isFinite() } }
+                ?.map { it.roundToInt() }
+                ?.toIntArray()
+        } catch (e: UnsatisfiedLinkError) {
+            null
+        }
+    }
+
+    /** Distribute wrapped flex lines in Zig, or null for the Kotlin fallback. */
+    fun flexLineDistribution(available: Float, gap: Float, alignment: Int, lineCrosses: FloatArray): Pair<FloatArray, FloatArray>? {
+        if (!isAvailable || lineCrosses.isEmpty()) return null
+        return try {
+            nativeFlexLineDistribution(available, gap, alignment, lineCrosses)
+                ?.takeIf { it.size >= lineCrosses.size * 2 && it.all { value -> value.isFinite() } }
+                ?.let { flattened ->
+                    flattened.copyOfRange(0, lineCrosses.size) to flattened.copyOfRange(lineCrosses.size, lineCrosses.size * 2)
+                }
+        } catch (e: UnsatisfiedLinkError) {
+            null
+        }
+    }
+
+    /** Resolve one flex item's cross-axis offset in Zig, or null for fallback. */
+    fun crossAxisPosition(available: Float, size: Float, leading: Float, trailing: Float, alignment: Int): Float? {
+        if (!isAvailable) return null
+        return try {
+            nativeCrossAxisPosition(available, size, leading, trailing, alignment)
+                .takeIf { it.isFinite() }
+        } catch (e: UnsatisfiedLinkError) {
+            null
+        }
+    }
+
+    /** Resolve equal-track grid frames in Zig, or null for Kotlin fallback. */
+    fun grid(
+        availableWidth: Float,
+        availableHeight: Float,
+        columns: Int,
+        columnGap: Float,
+        rowGap: Float,
+        intrinsicWidth: FloatArray,
+        intrinsicHeight: FloatArray,
+        explicitWidth: FloatArray,
+        explicitHeight: FloatArray,
+        minWidth: FloatArray,
+        maxWidth: FloatArray,
+        minHeight: FloatArray,
+        maxHeight: FloatArray,
+        margins: FloatArray,
+        flags: FloatArray,
+    ): FloatArray? {
+        if (!isAvailable) return null
+        return try {
+            nativeGrid(availableWidth, availableHeight, columns, columnGap, rowGap, intrinsicWidth, intrinsicHeight, explicitWidth, explicitHeight, minWidth, maxWidth, minHeight, maxHeight, margins, flags)
+                ?.takeIf { it.size >= intrinsicWidth.size * 4 && it.all { value -> value.isFinite() } }
+        } catch (e: UnsatisfiedLinkError) {
+            null
+        }
+    }
+
     /**
      * The clipboard's text, or null to use the Kotlin implementation.
      *