@craft-native/android 0.0.141 → 0.0.143

package/README.md

@@ -120,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.141",
+  "version": "0.0.143",
   "homepage": "https://github.com/craft-native/craft/tree/main/packages/android#readme",
   "repository": {
     "type": "git",

package/templates/MainActivityNative.kt.template

@@ -13,6 +13,7 @@ import android.graphics.BitmapFactory
 import android.graphics.Canvas
 import android.graphics.Color
 import android.graphics.DashPathEffect
+import android.graphics.Matrix
 import android.graphics.Paint
 import android.graphics.Path
 import android.graphics.Typeface
@@ -217,16 +218,36 @@ private class CraftNativeSvgView(context: Context) : View(context) {
         setMeasuredDimension(resolveSize(width, widthMeasureSpec), resolveSize(height, heightMeasureSpec))
     }
 
+    /** viewBox units to the view's pixels, set by each draw. */
+    private val viewTransform = Matrix()
+    private val inverseTransform = Matrix()
+
     override fun onDraw(canvas: Canvas) {
         super.onDraw(canvas)
         val box = viewBox() ?: return
         if (box.first <= 0 || box.second <= 0) return
-        val scale = min(width.toFloat() / box.first, height.toFloat() / box.second)
-        if (!scale.isFinite() || scale <= 0f) return
+        // Centred at one scale (SVG's default, `xMidYMid meet`), or each axis
+        // stretched to fill (`preserveAspectRatio="none"`).
+        val stretch = drawing.optJSONObject("props")?.optString("preserveAspectRatio")?.trim() == "none"
+        var sx = width.toFloat() / box.first
+        var sy = height.toFloat() / box.second
+        var dx = 0f
+        var dy = 0f
+        if (!stretch) {
+            val scale = min(sx, sy)
+            sx = scale
+            sy = scale
+            dx = (width - box.first * scale) / 2f
+            dy = (height - box.second * scale) / 2f
+        }
+        if (!sx.isFinite() || !sy.isFinite() || sx <= 0f || sy <= 0f) return
+        viewTransform.reset()
+        viewTransform.postTranslate(-box.third, -box.fourth)
+        viewTransform.postScale(sx, sy)
+        viewTransform.postTranslate(dx, dy)
+        viewTransform.invert(inverseTransform)
         canvas.save()
-        canvas.translate((width - box.first * scale) / 2f, (height - box.second * scale) / 2f)
-        canvas.scale(scale, scale)
-        canvas.translate(-box.third, -box.fourth)
+        canvas.concat(viewTransform)
         drawNodes(canvas, drawing.optJSONArray("children") ?: JSONArray(), SvgPaint().merge(drawing))
         canvas.restore()
     }
@@ -310,7 +331,17 @@ private class CraftNativeSvgView(context: Context) : View(context) {
                     }
                 }
             }
-            canvas.drawPath(path, stroke)
+            // `vector-effect="non-scaling-stroke"`: the stroke is in the view's
+            // pixels, so a stretched chart's line keeps its width.
+            if (props.optString("vectorEffect") == "non-scaling-stroke") {
+                val line = Path(path).apply { transform(viewTransform) }
+                canvas.save()
+                canvas.concat(inverseTransform)
+                canvas.drawPath(line, stroke)
+                canvas.restore()
+            } else {
+                canvas.drawPath(path, stroke)
+            }
         }
     }
 
@@ -443,7 +474,8 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
             }.toFloatArray()
             val sharedLineIds = CraftNative.flexLines(availableMain.toFloat(), gap.toFloat(), wrap, basis, margins)
             val lineIds = sharedLineIds?.takeIf { ids ->
-                ids.size >= pending.size && ids.firstOrNull() == 0 && ids.zipWithNext().all { (left, right) -> right >= left }
+                ids.size >= pending.size && ids.firstOrNull() == 0 &&
+                    ids.indices.drop(1).all { index -> ids[index] >= ids[index - 1] }
             }
             var line = Line()
             pending.forEachIndexed { index, entry ->
@@ -1896,6 +1928,7 @@ class MainActivity : AppCompatActivity() {
             if (!screen.controls.containsKey("id:$target")) return false
             makeView(screen, document, target, screen.controls)
             val updated = screen.controls["id:$target"] ?: return false
+            screen.lastLayoutBounds.remove(updated)
             if (!updateParentLayoutStyle(updated, document.optJSONObject("style") ?: JSONObject())) return false
         }
         if (applied.isNotEmpty()) {
@@ -1908,14 +1941,16 @@ class MainActivity : AppCompatActivity() {
         if (!screen.active) return
         val observer = screen.view.viewTreeObserver
         if (observer.isAlive) {
-            val listener = object : ViewTreeObserver.OnGlobalLayoutListener {
-                override fun onGlobalLayout() {
-                    if (observer.isAlive) observer.removeOnGlobalLayoutListener(this)
+            val listener = object : ViewTreeObserver.OnPreDrawListener {
+                override fun onPreDraw(): Boolean {
+                    if (observer.isAlive) observer.removeOnPreDrawListener(this)
                     if (screen.active) emitLayoutEvents(screen)
+                    return true
                 }
             }
-            observer.addOnGlobalLayoutListener(listener)
+            observer.addOnPreDrawListener(listener)
         }
+        screen.view.forceLayout()
         screen.view.requestLayout()
         // A tree that is already settled may not produce a global-layout
         // callback; keep the event path live for that case as well.
@@ -1929,15 +1964,23 @@ class MainActivity : AppCompatActivity() {
      */
     private fun updateParentLayoutStyle(view: View, style: JSONObject): Boolean {
         var parent = view.parent
+        var found = false
         while (parent != null) {
-            if (parent is CraftNativeFlexLayout) {
-                parent.setChildStyle(view, style, resources.displayMetrics.density)
-                parent.requestLayout()
-                return true
+            when (parent) {
+                is CraftNativeFlexLayout -> {
+                    if (!found) parent.setChildStyle(view, style, resources.displayMetrics.density)
+                    parent.forceLayout()
+                    parent.requestLayout()
+                    found = true
+                }
+                is CraftNativeScrollView -> {
+                    parent.forceLayout()
+                    parent.requestLayout()
+                }
             }
             parent = parent.parent
         }
-        return false
+        return found
     }
 
     private fun renderCommitted(screen: Screen, document: JSONObject) {