@craft-native/android 0.0.161 → 0.0.163

package/README.md

@@ -135,7 +135,13 @@ When `flexShrink` is omitted, horizontal text labels and scroll hosts use the
 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.
+`space-between`, `space-around`, `space-evenly`, and `stretch`) consistently
+across hosts.
+The Android local fallback keeps fractional line and grid spacing until each
+child frame is rounded, matching the shared layout ABI when an older runtime
+does not expose its optional alignment symbols.
+Its flex main-axis fallback applies the same fractional treatment to
+`space-around` and `space-evenly` before rounding positions.
 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

package/package.json

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

package/templates/MainActivityNative.kt.template

@@ -653,6 +653,7 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
         "space-between" -> 3
         "space-around" -> 4
         "stretch" -> 5
+        "space-evenly" -> 6
         else -> 0
     }
 
@@ -790,24 +791,28 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
             } else {
                 val totalRows = layout.rowHeights.sum()
                 val rowGaps = max(0, layout.rowHeights.size - 1) * rowGap
-                val freeRows = max(0, contentHeight - totalRows - rowGaps)
+                val freeRows = max(0, contentHeight - totalRows - rowGaps).toFloat()
                 val rowCount = max(1, layout.rowHeights.size)
-                var rowLeading = 0
-                var rowBetween = rowGap
-                var rowExtra = 0
+                var rowLeading = 0f
+                var rowBetween = rowGap.toFloat()
+                var rowExtra = 0f
                 when (alignContentCode()) {
-                    1 -> rowLeading = freeRows / 2
+                    1 -> rowLeading = freeRows / 2f
                     2 -> rowLeading = freeRows
-                    3 -> if (rowCount > 1) rowBetween += freeRows / (rowCount - 1)
+                    3 -> if (rowCount > 1) rowBetween += freeRows / (rowCount - 1).toFloat()
                     4 -> {
-                        rowLeading = freeRows / (rowCount * 2)
-                        rowBetween += freeRows / rowCount
+                        rowLeading = freeRows / (rowCount * 2).toFloat()
+                        rowBetween += freeRows / rowCount.toFloat()
                     }
-                    5 -> rowExtra = freeRows / rowCount
+                    6 -> {
+                        rowLeading = freeRows / (rowCount + 1).toFloat()
+                        rowBetween += freeRows / (rowCount + 1).toFloat()
+                    }
+                    5 -> rowExtra = freeRows / rowCount.toFloat()
                 }
-                var rowTop = paddingTop + rowLeading
+                var rowTop = paddingTop.toFloat() + rowLeading
                 for ((rowIndex, row) in layout.rows.withIndex()) {
-                    val rowHeight = layout.rowHeights[rowIndex] + rowExtra
+                    val rowHeight = layout.rowHeights[rowIndex].toFloat() + rowExtra
                     for ((column, entry) in row.withIndex()) {
                         val align = entry.style.alignSelf ?: alignItems
                         val lp = entry.view.layoutParams as? MarginLayoutParams
@@ -816,7 +821,7 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
                         val marginTop = lp?.topMargin ?: 0
                         val marginBottom = lp?.bottomMargin ?: 0
                         val availableWidth = max(0, layout.cellWidth - marginLeft - marginRight)
-                        val availableHeight = max(0, rowHeight - marginTop - marginBottom)
+                        val availableHeight = max(0, (rowHeight - marginTop - marginBottom).roundToInt())
                         val childWidth = if (align == "stretch" && entry.style.width == null) availableWidth else min(availableWidth, entry.width)
                         val childHeight = if (align == "stretch" && entry.style.height == null) availableHeight else min(availableHeight, entry.height)
                         val x = paddingLeft + column * (layout.cellWidth + columnGap) + marginLeft + when (align) {
@@ -824,11 +829,11 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
                             "flex-end" -> availableWidth - childWidth
                             else -> 0
                         }
-                        val y = rowTop + marginTop + when (align) {
+                        val y = (rowTop + marginTop + when (align) {
                             "center" -> (availableHeight - childHeight) / 2
                             "flex-end" -> availableHeight - childHeight
                             else -> 0
-                        }
+                        }).roundToInt()
                         entry.view.layout(x, y, x + childWidth, y + childHeight)
                     }
                     rowTop += rowHeight + rowBetween
@@ -871,6 +876,10 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
                     crossBetween = crossFree / lines.size + crossGap
                     crossLeading = crossFree / (lines.size * 2)
                 }
+                "space-evenly" -> {
+                    crossBetween = crossFree / (lines.size + 1) + crossGap
+                    crossLeading = crossFree / (lines.size + 1)
+                }
                 "stretch" -> {
                     val extra = crossFree / lines.size
                     lines.forEach { it.cross += extra }
@@ -921,8 +930,7 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
             }
             val free = max(0, availableMain - distributedMain)
             val (leading, between) = distribution(free, line.entries.size)
-            var mainOffset = if (orientation == HORIZONTAL) paddingLeft else paddingTop
-            mainOffset += leading
+            var mainOffset = (if (orientation == HORIZONTAL) paddingLeft else paddingTop).toFloat() + leading
             for ((index, entry) in line.entries.withIndex()) {
                 val lp = entry.view.layoutParams as? MarginLayoutParams
                 val marginStart = if (orientation == HORIZONTAL) lp?.leftMargin ?: 0 else lp?.topMargin ?: 0
@@ -949,10 +957,10 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
                 // local main-axis rule remains the fallback for old runtimes
                 // that return widths only.
                 val sharedPosition = if (!reverse) sharedPositions?.get(index)?.roundToInt() else null
-                val positionedMain = sharedPosition?.let { (if (orientation == HORIZONTAL) paddingLeft else paddingTop) + it }
+                val positionedMain = sharedPosition?.let { (if (orientation == HORIZONTAL) paddingLeft else paddingTop).toFloat() + it }
                     ?: mainOffset + marginStart
-                val x = if (orientation == HORIZONTAL) positionedMain else lineOffset + crossPosition
-                val y = if (orientation == HORIZONTAL) lineOffset + crossPosition else positionedMain
+                val x = if (orientation == HORIZONTAL) positionedMain.roundToInt() else lineOffset + crossPosition
+                val y = if (orientation == HORIZONTAL) lineOffset + crossPosition else positionedMain.roundToInt()
                 val distributedPrimary = sharedPrimary?.get(index)?.roundToInt() ?: fallbackWidths[index]
                 val w = if (orientation == HORIZONTAL) distributedPrimary else crossSize
                 val h = if (orientation == HORIZONTAL) crossSize else distributedPrimary
@@ -972,13 +980,16 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
         onLayoutChanged?.invoke()
     }
 
-    private fun distribution(free: Int, count: Int): Pair<Int, Int> = when (justifyContent) {
-        "center" -> free / 2 to 0
-        "flex-end" -> free to 0
-        "space-between" -> 0 to if (count > 1) free / (count - 1) else 0
-        "space-around" -> free / (count * 2) to free / count
-        "space-evenly" -> free / (count + 1) to free / (count + 1)
-        else -> 0 to 0
+    private fun distribution(free: Int, count: Int): Pair<Float, Float> {
+        val available = free.toFloat()
+        return when (justifyContent) {
+            "center" -> available / 2f to 0f
+            "flex-end" -> available to 0f
+            "space-between" -> 0f to if (count > 1) available / (count - 1).toFloat() else 0f
+            "space-around" -> available / (count * 2).toFloat() to available / count.toFloat()
+            "space-evenly" -> available / (count + 1).toFloat() to available / (count + 1).toFloat()
+            else -> 0f to 0f
+        }
     }
 }