@craft-native/android 0.0.160 → 0.0.161

package/README.md

@@ -98,7 +98,11 @@ craft android build --native-bundle ../native-screen.js
 
 Native mode maps STX `View`, `SafeAreaView`, `Text`, `Button`, `Link`, `Icon`,
 `Pressable`, `TouchableOpacity`, `TouchableHighlight`, `Checkbox`, `TextInput`, `Picker`, `DatePicker`, `Modal`, `Switch`, `Slider`, `ActivityIndicator`, `Image`, `Video`, `ScrollView`,
-and `FlatList` to Android views. `Picker` renders `<select>`/`<option>` values
+`SectionList`, and `FlatList` to Android views. `SectionList` uses the same
+native scroll host for ordinary `.stx` slot children; grouped section data
+should use `FlatList` until the section-data protocol is available. The
+generated host routes both list names through `CraftNativeScrollView` for this
+slot-based contract. `Picker` renders `<select>`/`<option>` values
 with `onValueChange` or `onChange`. `DatePicker` uses the platform `DatePicker`
 and `TimePicker` controls for date, time, datetime, and countdown modes and
 emits local `value`, ISO, and millisecond `timestamp` fields. `Modal` is parent-scoped and supports

package/package.json

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

package/templates/CraftNative.kt.template

@@ -298,6 +298,43 @@ object CraftNative {
         margins: FloatArray,
         flags: FloatArray,
     ): FloatArray?
+    private external fun nativeGridAligned(
+        availableWidth: Float,
+        availableHeight: Float,
+        columns: Int,
+        columnGap: Float,
+        rowGap: Float,
+        alignContent: Int,
+        intrinsicWidth: FloatArray,
+        intrinsicHeight: FloatArray,
+        explicitWidth: FloatArray,
+        explicitHeight: FloatArray,
+        minWidth: FloatArray,
+        maxWidth: FloatArray,
+        minHeight: FloatArray,
+        maxHeight: FloatArray,
+        margins: FloatArray,
+        flags: FloatArray,
+    ): FloatArray?
+    private external fun nativeGridAutoRowsAligned(
+        availableWidth: Float,
+        availableHeight: Float,
+        columns: Int,
+        columnGap: Float,
+        rowGap: Float,
+        alignContent: Int,
+        autoRowHeight: 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
@@ -532,13 +569,14 @@ object CraftNative {
         margins: FloatArray,
         flags: FloatArray,
         autoRowHeight: Float? = null,
+        alignContent: Int = 0,
     ): FloatArray? {
         if (!isAvailable) return null
         return try {
             if (autoRowHeight != null) {
-                nativeGridAutoRows(availableWidth, availableHeight, columns, columnGap, rowGap, autoRowHeight, intrinsicWidth, intrinsicHeight, explicitWidth, explicitHeight, minWidth, maxWidth, minHeight, maxHeight, margins, flags)
+                nativeGridAutoRowsAligned(availableWidth, availableHeight, columns, columnGap, rowGap, alignContent, autoRowHeight, intrinsicWidth, intrinsicHeight, explicitWidth, explicitHeight, minWidth, maxWidth, minHeight, maxHeight, margins, flags)
             } else {
-                nativeGrid(availableWidth, availableHeight, columns, columnGap, rowGap, intrinsicWidth, intrinsicHeight, explicitWidth, explicitHeight, minWidth, maxWidth, minHeight, maxHeight, margins, flags)
+                nativeGridAligned(availableWidth, availableHeight, columns, columnGap, rowGap, alignContent, intrinsicWidth, intrinsicHeight, explicitWidth, explicitHeight, minWidth, maxWidth, minHeight, maxHeight, margins, flags)
             }
                 ?.takeIf { it.size >= intrinsicWidth.size * 4 && it.all { value -> value.isFinite() } }
         } catch (e: UnsatisfiedLinkError) {

package/templates/CraftNativeCapabilities.kt.template

@@ -303,7 +303,8 @@ internal class CraftNativeCapabilities(
         return FileResult.Multipart(body.toByteArray(), boundary)
     }
 
-    private fun files(requestToken: String, method: String, args: JSONArray): CraftNativeCapabilityResult = when (method) {
+    private fun files(requestToken: String, method: String, args: JSONArray): CraftNativeCapabilityResult {
+        return when (method) {
         "write" -> {
             val name = args.optString(0).trim()
             if (name.isBlank()) return failure("INVALID_ARGUMENT", "files.write needs a file name")
@@ -322,7 +323,8 @@ internal class CraftNativeCapabilities(
             success(file.delete())
         }
         "download" -> download(requestToken, args)
-        else -> failure("UNKNOWN_ACTION", "Unsupported Files method")
+            else -> failure("UNKNOWN_ACTION", "Unsupported Files method")
+        }
     }
 
     private fun download(requestToken: String, args: JSONArray): CraftNativeCapabilityResult {

package/templates/MainActivityNative.kt.template

@@ -115,6 +115,7 @@ private data class CraftNativeLength(
 private data class CraftNativeLayoutStyle(
     val width: CraftNativeLength? = null,
     val height: CraftNativeLength? = null,
+    val aspectRatio: Double? = null,
     val minWidth: CraftNativeLength? = null,
     val maxWidth: CraftNativeLength? = null,
     val minHeight: CraftNativeLength? = null,
@@ -143,6 +144,7 @@ private data class CraftNativeLayoutStyle(
             val flex = decimal("flex")
             return CraftNativeLayoutStyle(
                 width = length("width"), height = length("height"),
+                aspectRatio = decimal("aspectRatio")?.takeIf { it.isFinite() && it > 0.0 },
                 minWidth = length("minWidth"), maxWidth = length("maxWidth"),
                 minHeight = length("minHeight"), maxHeight = length("maxHeight"),
                 position = raw.opt("position")
@@ -583,7 +585,8 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
         // The STX style is authoritative. A reused View may still carry a
         // previous fixed LayoutParams width after a reactive width is removed;
         // using that value here prevents intrinsic sizing from being restored.
-        val explicit = style.width?.resolve(base) ?: flexBasis
+        val authored = style.width?.resolve(base)
+        val explicit = authored ?: style.aspectRatio?.let { ratio -> style.height?.resolve(base)?.times(ratio)?.roundToInt() } ?: flexBasis
         if (explicit != null) {
             child.measure(
                 View.MeasureSpec.makeMeasureSpec(explicit, View.MeasureSpec.EXACTLY),
@@ -613,7 +616,8 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
         val flexBasis = if (orientation == VERTICAL) style.flexBasis?.resolve(base) else null
         // Match width measurement: do not let stale native LayoutParams keep
         // a removed reactive height fixed.
-        val explicit = style.height?.resolve(base) ?: flexBasis
+        val authored = style.height?.resolve(base)
+        val explicit = authored ?: style.aspectRatio?.let { ratio -> style.width?.resolve(base)?.div(ratio)?.roundToInt() } ?: flexBasis
         val target = explicit ?: base
         val spec = if (explicit != null) View.MeasureSpec.makeMeasureSpec(target, View.MeasureSpec.EXACTLY)
         else View.MeasureSpec.makeMeasureSpec(base, View.MeasureSpec.AT_MOST)
@@ -772,6 +776,7 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
                     listOf(if (align == "stretch") 1f else 0f, if (align == "center") 1f else if (align == "flex-end") 2f else 0f)
                 }.toFloatArray(),
                 gridAutoRows?.resolve(contentHeight)?.toFloat(),
+                alignContentCode(),
             )
             if (sharedFrames != null) {
                 for ((index, entry) in flow.withIndex()) {
@@ -783,9 +788,26 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
                     entry.view.layout(x, y, x + childWidth, y + childHeight)
                 }
             } else {
-                var rowTop = paddingTop
+                val totalRows = layout.rowHeights.sum()
+                val rowGaps = max(0, layout.rowHeights.size - 1) * rowGap
+                val freeRows = max(0, contentHeight - totalRows - rowGaps)
+                val rowCount = max(1, layout.rowHeights.size)
+                var rowLeading = 0
+                var rowBetween = rowGap
+                var rowExtra = 0
+                when (alignContentCode()) {
+                    1 -> rowLeading = freeRows / 2
+                    2 -> rowLeading = freeRows
+                    3 -> if (rowCount > 1) rowBetween += freeRows / (rowCount - 1)
+                    4 -> {
+                        rowLeading = freeRows / (rowCount * 2)
+                        rowBetween += freeRows / rowCount
+                    }
+                    5 -> rowExtra = freeRows / rowCount
+                }
+                var rowTop = paddingTop + rowLeading
                 for ((rowIndex, row) in layout.rows.withIndex()) {
-                    val rowHeight = layout.rowHeights[rowIndex]
+                    val rowHeight = layout.rowHeights[rowIndex] + rowExtra
                     for ((column, entry) in row.withIndex()) {
                         val align = entry.style.alignSelf ?: alignItems
                         val lp = entry.view.layoutParams as? MarginLayoutParams
@@ -809,7 +831,7 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
                         }
                         entry.view.layout(x, y, x + childWidth, y + childHeight)
                     }
-                    rowTop += rowHeight + rowGap
+                    rowTop += rowHeight + rowBetween
                 }
             }
             for (entry in layout.absolute) {
@@ -2803,7 +2825,7 @@ class MainActivity : AppCompatActivity() {
             "Svg" -> (previous as? CraftNativeSvgView ?: CraftNativeSvgView(this)).apply {
                 drawing = node
             }
-            "ScrollView" -> (previous as? CraftNativeScrollView ?: CraftNativeScrollView(this)).apply {
+            "ScrollView", "SectionList" -> (previous as? CraftNativeScrollView ?: CraftNativeScrollView(this)).apply {
                 val horizontal = props.optBoolean("horizontal", false) || style.optString("flexDirection") in setOf("row", "row-reverse")
                 setHorizontal(horizontal)
                 setNativeNestedScrollingEnabled(true)
@@ -3064,6 +3086,7 @@ class MainActivity : AppCompatActivity() {
         "video" -> "Video"
         "icon" -> "Icon"
         "scrollview" -> "ScrollView"
+        "sectionlist" -> "SectionList"
         "flatlist" -> "FlatList"
         "svg" -> "Svg"
         "touchableopacity" -> "TouchableOpacity"
@@ -3477,7 +3500,9 @@ class MainActivity : AppCompatActivity() {
             else -> null
         }
         view.tooltipText = props.optString("accessibilityHint").takeIf { it.isNotBlank() }
-        val role = props.optString("accessibilityRole").ifBlank { type.lowercase() }
+        val role = props.optString("accessibilityRole").ifBlank {
+            if (type == "Icon") "image" else type.lowercase()
+        }
         val state = props.optJSONObject("accessibilityState")
         val disabled = props.optBoolean("disabled", false) || state?.optBoolean("disabled", false) == true
         if (type !in setOf("Button", "Link", "Checkbox", "TextInput", "Picker", "DatePicker", "Modal", "Switch", "Slider", "ActivityIndicator")) {