@apexnative/navigation 1.0.0-alpha.0 → 1.0.0-alpha.10

package/android/src/main/java/dev/apexnative/navigation/views/element/ElementTransitions.kt

@@ -2,126 +2,78 @@ package dev.apexnative.navigation.views.element
 
 import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
-import android.graphics.Rect
 import android.os.Build
 import android.util.Log
 import android.view.View
 import android.view.ViewGroup
-import com.facebook.react.uimanager.util.ReactFindViewUtil
-import com.facebook.react.views.view.ReactViewGroup
 import dev.apexnative.navigation.options.ElementTransitionOptions
 import dev.apexnative.navigation.options.LayoutAnimation
 import dev.apexnative.navigation.options.SharedElementTransitionOptions
 import dev.apexnative.navigation.react.events.AppearanceDispatcher
 import dev.apexnative.navigation.utils.DevelopmentLog
 import dev.apexnative.navigation.utils.NavigationLog
+import dev.apexnative.navigation.utils.SystemAnimations
 import dev.apexnative.navigation.viewcontrollers.viewcontroller.ViewController
+import dev.apexnative.navigation.views.animations.AnimationLayer
 import dev.apexnative.navigation.views.animations.SideAnimator
 import dev.apexnative.navigation.views.element.animators.SharedAnimatorFactory
+import java.util.Collections
+import java.util.WeakHashMap
 
 /**
- * The elements of one transition: the element transitions and the targets of the shared elements found by their
- * `nativeID` (depth first, the first match) in the whole view of the screen each side shows — an element in the screen
- * that goes first, then in the one that comes; a pair's `fromId` in the screen that goes, its `toId` in the one that
- * comes. What isn't found, what is in another transition's layer and an image that isn't loaded is skipped; the rest
- * plays. Each view found moves into a [TransitionLayer] at its place on the screen, in the order its hierarchy draws
- * it, and an [ElementStub] takes its index in its parent. A pair's `from` stays where it is, hidden while its copy
- * flies. [finish] puts every view back at its index with its layout, its pivot and the values of its properties read
- * before — unless React removed its stub meanwhile: then it is gone for good —, shows the `from`s again and takes the
- * layer away. Main thread only.
+ * The elements of one transition: the element transitions and the shared pairs found by their `nativeID` (depth first,
+ * the first match) in the whole view of the screen each side shows — an element in the screen that goes first, then in
+ * the one that comes; a pair's `fromId` in the screen that goes, its `toId` in the one that comes; each screen is
+ * walked once for all of them ([TransitionViews]). What isn't found, what another transition plays now and an image
+ * that isn't loaded is skipped; so is an element whose start fails ([elementStep]): it gets its values back at once and
+ * the rest plays. No view leaves its parent, as on iOS. An element plays where it is, in its screen: its properties
+ * animate about its center and it moves with its screen. A pair flies as a copy drawn in a [TransitionLayer] over the
+ * screens, the copies in the order their targets are drawn; its `to` is hidden from the start, its `from` from the
+ * start of its flight. [finish] gives every element the values of its properties read before, shows the pairs' views
+ * again and takes the layer away. Main thread only.
  */
-internal class ElementTransition private constructor(private val layer: TransitionLayer) {
-    // A view in the layer: where it came from and what it was.
-    private class Moved(
-        val view: View,
-        val stub: ElementStub,
-        val params: ViewGroup.LayoutParams,
-        val frame: Rect,
-        val values: FloatArray,
-        val pivotSet: Boolean,
-        // Where its parent's origin is in the layer: what `x` and `y` are counted from.
-        val originX: Int,
-        val originY: Int,
-    )
+internal class ElementTransition private constructor(
+    private val layer: TransitionLayer?,
+    // The views of the screens, as far as the parents that cut a pair's views count.
+    private val fromRoot: View?,
+    private val toRoot: View?,
+) {
+    // An element playing where it is: what it was.
+    private class InPlace(val view: View, val values: FloatArray, val pivotSet: Boolean)
 
-    private val moved = ArrayList<Moved>()
-    private val hidden = ArrayList<Pair<View, Float>>()
+    private val inPlace = ArrayList<InPlace>()
+    private val taken = ArrayList<View>()
+    // The views of the pairs hidden while their copies fly, with the alpha each had.
+    private val hidden = LinkedHashMap<View, Float>()
     private var finished = false
 
     /** The animators of the elements and of the shared elements, each with its own time. */
     val animators = ArrayList<Animator>()
 
-    /** Every view back, the `from`s seen, the layer gone; at the end of the transition and at any stop. Once. */
+    /**
+     * Every element's values back, the pairs' views seen, the layer gone; at the end of the transition and at any stop.
+     * Once.
+     */
     fun finish() {
         if (finished) return
         finished = true
-        for ((view, alpha) in hidden) view.alpha = alpha
+        for ((view, alpha) in hidden) show(view, alpha)
         hidden.clear()
-        // Each view goes back on its own: one that can't (its parent gone wrong) doesn't keep the others in the layer.
-        for (item in moved.asReversed()) {
+        // Each element on its own: one that can't get its values back doesn't keep the others from theirs.
+        for (item in inPlace.asReversed()) {
             try {
-                giveBack(item)
+                restore(item.view, item.values, item.pivotSet)
             } catch (e: RuntimeException) {
-                Log.w(NavigationLog.TAG, "[ApexNavigation] An element of a transition couldn't go back", e)
+                Log.w(NavigationLog.TAG, "[ApexNavigation] An element of a transition couldn't get its values back", e)
             }
         }
-        moved.clear()
-        layer.detach()
+        inPlace.clear()
+        playing -= taken.toSet()
+        taken.clear()
+        layer?.detach()
     }
 
-    private fun moveIntoLayer(view: View): Moved? {
-        val parent = view.parent as? ViewGroup ?: return null
-        // A parent that clips its subviews keeps its own list of children, which a stub swapped in would leave
-        // behind: its element stays where it is.
-        if ((parent as? ReactViewGroup)?.removeClippedSubviews == true) return null
-        val index = parent.indexOfChild(view)
-        if (index < 0) return null
-        val onScreen = IntArray(2)
-        parent.getLocationOnScreen(onScreen)
-        val origin = layer.originOnScreen
-        val originX = onScreen[0] - parent.scrollX - origin.x
-        val originY = onScreen[1] - parent.scrollY - origin.y
-        val frame = Rect(view.left, view.top, view.right, view.bottom)
-        val params = view.layoutParams ?: ViewGroup.LayoutParams(view.width, view.height)
-        val pivotSet = Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && view.isPivotSet
-        val values = floatArrayOf(
-            view.alpha, view.translationX, view.translationY, view.scaleX, view.scaleY, view.rotation,
-            view.rotationX, view.rotationY, view.pivotX, view.pivotY,
-        )
-        val stub = ElementStub(view.context, view)
-        parent.removeViewAt(index)
-        parent.addView(stub, index, params)
-        stub.layout(frame.left, frame.top, frame.right, frame.bottom)
-        val left = originX + frame.left
-        val top = originY + frame.top
-        layer.put(view, left, top, frame.width(), frame.height())
-        // Scale and rotations turn about the center.
-        view.pivotX = frame.width() / 2f
-        view.pivotY = frame.height() / 2f
-        return Moved(view, stub, params, frame, values, pivotSet, originX, originY).also { moved += it }
-    }
-
-    private fun giveBack(item: Moved) {
-        val view = item.view
-        // A commit of Fabric meanwhile laid it out in its parent's coordinates: the newest such frame holds.
-        val reactFrame = if (view.parent === layer) layer.frameFromReact(view) else null
-        if (view.parent === layer) layer.removeView(view)
-        restore(view, item)
-        val parent = item.stub.parent as? ViewGroup ?: return
-        val index = parent.indexOfChild(item.stub)
-        if (index < 0) return
-        parent.removeViewAt(index)
-        parent.addView(view, index, item.params)
-        val frame = reactFrame ?: item.frame
-        view.measure(
-            View.MeasureSpec.makeMeasureSpec(frame.width(), View.MeasureSpec.EXACTLY),
-            View.MeasureSpec.makeMeasureSpec(frame.height(), View.MeasureSpec.EXACTLY),
-        )
-        view.layout(frame.left, frame.top, frame.right, frame.bottom)
-    }
-
-    private fun restore(view: View, item: Moved) {
-        val values = item.values
+    private fun restore(view: View, values: FloatArray, pivotSet: Boolean) {
         view.alpha = values[ALPHA]
         view.translationX = values[TRANSLATION_X]
         view.translationY = values[TRANSLATION_Y]
@@ -130,7 +82,7 @@ internal class ElementTransition private constructor(private val layer: Transiti
         view.rotation = values[ROTATION]
         view.rotationX = values[ROTATION_X]
         view.rotationY = values[ROTATION_Y]
-        if (!item.pivotSet && Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+        if (!pivotSet && Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             view.resetPivot()
         } else {
             view.pivotX = values[PIVOT_X]
@@ -138,34 +90,74 @@ internal class ElementTransition private constructor(private val layer: Transiti
         }
     }
 
-    private fun addElement(options: ElementTransitionOptions, item: Moved) {
-        val base = SideAnimator.Base(xOffset = item.originX.toFloat(), yOffset = item.originY.toFloat())
-        SideAnimator.build(item.view, options, base)?.let(animators::add)
+    // An element with views in it fades through a hardware layer only where its alpha would draw it into an offscreen
+    // buffer at every frame (AnimationLayer: its rendering overlaps). React's views overlap only with
+    // `needsOffscreenAlphaCompositing`, so most elements fade without one and nothing they draw outside their bounds (a
+    // box shadow) is clipped. A view without children fades its own drawing at no extra cost. Scale and rotations turn
+    // about the element's center; `x` and `y` are its place in its own parent.
+    private fun addElement(options: ElementTransitionOptions, view: View) {
+        inPlace += InPlace(view, valuesOf(view), pivotSetOf(view))
+        view.pivotX = view.width / 2f
+        view.pivotY = view.height / 2f
+        val animator = SideAnimator.build(view, options, SideAnimator.Base()) ?: return
+        if (view is ViewGroup) AnimationLayer.during(view, animator)
+        animators += animator
     }
 
-    // The pair's flight: `to` hidden until it starts, `from` hidden from its start; false when it doesn't fly.
+    // An element whose start failed gets its values back now.
+    private fun giveValuesBack(view: View) {
+        val item = inPlace.lastOrNull { it.view === view } ?: return
+        inPlace -= item
+        try {
+            restore(view, item.values, item.pivotSet)
+        } catch (e: RuntimeException) {
+            Log.w(NavigationLog.TAG, "[ApexNavigation] An element of a transition couldn't get its values back", e)
+        }
+    }
+
+    // The pair's flight: `to` hidden from now, `from` from its start, both seen again when it stops or its copy can't
+    // be drawn. Nothing changes when it doesn't fly.
     private fun addPair(
         options: SharedElementTransitionOptions,
         from: View,
-        item: Moved,
-        toParent: View?,
+        to: View,
+        name: String,
         fallbackDuration: Long,
-    ): Boolean {
-        val to = item.view
+    ) {
+        val layer = layer ?: return
         val flight = SharedAnimatorFactory.create(
-            from, to, toParent, layer, options, fallbackDuration, DevelopmentLog::warn,
-        ) ?: return false
-        val alpha = item.values[ALPHA]
-        to.alpha = 0f
-        hidden += from to from.alpha
+            from, to, fromRoot, toRoot, layer, options, fallbackDuration, DevelopmentLog::warn,
+        ) ?: return
+        val fromAlpha = from.alpha
+        val seenAgain = {
+            flight.picture.shown = false
+            hidden.remove(from)?.let { show(from, it) }
+            hidden.remove(to)?.let { show(to, it) }
+            layer.invalidate()
+        }
+        flight.picture.onFailed = { e ->
+            elementSkipped(name, e.toString())
+            seenAgain()
+        }
         flight.animator.addListener(object : AnimatorListenerAdapter() {
+            private var stopped = false
+
             override fun onAnimationStart(animation: Animator) {
+                if (stopped || finished) return
+                hidden[from] = fromAlpha
                 from.alpha = 0f
-                if (!flight.drawsPictures) to.alpha = alpha
+            }
+
+            // A flight whose start or frame failed stops (`MoveAnimator`), maybe inside its own start.
+            override fun onAnimationCancel(animation: Animator) {
+                stopped = true
+                seenAgain()
             }
         })
+        layer.add(flight.picture)
+        hidden[to] = to.alpha
+        to.alpha = 0f
         animators += flight.animator
-        return true
     }
 
     companion object {
@@ -180,10 +172,26 @@ internal class ElementTransition private constructor(private val layer: Transiti
         private const val PIVOT_X = 8
         private const val PIVOT_Y = 9
 
+        // The views the transitions that run now play: another transition leaves them alone.
+        private val playing: MutableSet<View> = Collections.newSetFromMap(WeakHashMap())
+
+        private fun valuesOf(view: View) = floatArrayOf(
+            view.alpha, view.translationX, view.translationY, view.scaleX, view.scaleY, view.rotation,
+            view.rotationX, view.rotationY, view.pivotX, view.pivotY,
+        )
+
+        private fun pivotSetOf(view: View) = Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && view.isPivotSet
+
+        // A view hidden for a flight shows again with its alpha, unless React gave it another one meanwhile. React
+        // writes the same alpha: an opacity it commits during the flight shows the view beside its copy until the end.
+        private fun show(view: View, alpha: Float) {
+            if (view.alpha == 0f) view.alpha = alpha
+        }
+
         /**
-         * The elements of [animation] from [from] to [to], moved into a layer that joins [host] at [layerIndex] (its
-         * top without one); none when none of them is found. A shared element without a duration takes
-         * [fallbackDuration], the screen's fade.
+         * The elements of [animation] from [from] to [to]; the copies of the pairs in a layer that joins [host] at
+         * [layerIndex] (its top without one). None when none of them is found or the system's animations are off. A
+         * shared element without a duration takes [fallbackDuration], the screen's fade.
          */
         fun start(
             animation: LayoutAnimation,
@@ -193,33 +201,38 @@ internal class ElementTransition private constructor(private val layer: Transiti
             layerIndex: Int?,
             fallbackDuration: Long,
         ): ElementTransition? {
+            if (SystemAnimations.areOff(host.context)) return null
             val fromView = from?.let { AppearanceDispatcher.visibleNode(it).peekView() }
             val toView = AppearanceDispatcher.visibleNode(to).peekView()
+            val transitions = animation.elementTransitions.transitions
+            val shared = animation.sharedElements.get()
+            val views = TransitionViews(shared, transitions, fromView, toView)
             val taken = HashSet<View>()
             val elements = ArrayList<Pair<ElementTransitionOptions, View>>()
-            for (element in animation.elementTransitions.transitions) {
+            for (element in transitions) {
                 if (element.id.isEmpty()) continue
-                val view = find(fromView, element.id) ?: find(toView, element.id) ?: continue
-                if (TransitionLayer.holds(view) || !taken.add(view)) continue
+                val view = views.leaving(element.id) ?: views.arriving(element.id) ?: continue
+                if (view in playing || !taken.add(view)) continue
                 elements += element to view
             }
             val pairs = ArrayList<Triple<SharedElementTransitionOptions, View, View>>()
-            for (pair in animation.sharedElements.get()) {
+            for (pair in shared) {
                 val fromId = pair.fromId.get(null) ?: continue
                 val toId = pair.toId.get(null) ?: continue
-                val source = find(fromView, fromId) ?: continue
-                val target = find(toView, toId) ?: continue
-                if (source === target || TransitionLayer.holds(source) || TransitionLayer.holds(target)) continue
+                val source = views.leaving(fromId) ?: continue
+                val target = views.arriving(toId) ?: continue
+                if (source === target || source in playing || target in playing) continue
                 if (target in taken || source in taken) continue
                 if (!loaded(source, fromId) || !loaded(target, toId)) continue
+                taken += source
                 taken += target
                 pairs += Triple(pair, source, target)
             }
             if (elements.isEmpty() && pairs.isEmpty()) return null
-            val layer = TransitionLayer(host.context)
-            val transition = ElementTransition(layer)
+            val layer = if (pairs.isEmpty()) null else TransitionLayer(host.context)
+            val transition = ElementTransition(layer, fromView, toView)
             try {
-                layer.attachTo(host, layerIndex ?: host.childCount)
+                layer?.attachTo(host, layerIndex ?: host.childCount)
                 transition.fill(host, elements, pairs, fallbackDuration)
             } catch (e: RuntimeException) {
                 transition.finish()
@@ -229,8 +242,8 @@ internal class ElementTransition private constructor(private val layer: Transiti
         }
 
         /**
-         * [start], and when that fails, a line in the log and none: the screens play without their elements; every view
-         * moved is back already.
+         * [start], and when that fails, a line in the log and none: the screens play without their elements; every
+         * element has its values back already.
          */
         fun startOrLog(
             animation: LayoutAnimation,
@@ -246,9 +259,6 @@ internal class ElementTransition private constructor(private val layer: Transiti
             null
         }
 
-        private fun find(root: View?, nativeId: String): View? =
-            root?.let { ReactFindViewUtil.findView(it, nativeId) }?.takeUnless { it is ElementStub }
-
         // An image not loaded drops out of the transition; its wait logged it already, else it is logged now.
         private fun loaded(view: View, id: String): Boolean {
             if (ImageLoads.isLoaded(view)) return true
@@ -257,25 +267,23 @@ internal class ElementTransition private constructor(private val layer: Transiti
         }
     }
 
-    // The views into the layer in the order they are drawn, then their animators; a pair that doesn't fly goes back at
-    // once.
+    // The elements' animators where they are, then the pairs' flights, their copies in the order their targets are
+    // drawn. Each element's steps run on their own ([elementStep]): one that fails is left as it was, the others play.
     private fun fill(
         host: ViewGroup,
         elements: List<Pair<ElementTransitionOptions, View>>,
         pairs: List<Triple<SharedElementTransitionOptions, View, View>>,
         fallbackDuration: Long,
     ) {
-        val views = elements.map { it.second } + pairs.map { it.third }
-        val parents = views.associateWith { it.parent as? View }
-        val placed = HashMap<View, Moved>()
-        for (view in DrawOrder.sorted(views, host) { it }) moveIntoLayer(view)?.let { placed[view] = it }
-        for ((options, view) in elements) placed[view]?.let { addElement(options, it) }
-        for ((options, source, target) in pairs) {
-            val item = placed[target] ?: continue
-            if (!addPair(options, source, item, parents[target], fallbackDuration)) {
-                moved -= item
-                giveBack(item)
-            }
+        for ((_, view) in elements) taken += view
+        for ((_, source, target) in pairs) taken += listOf(source, target)
+        playing += taken
+        for ((options, view) in elements) {
+            if (!elementStep(elementName(options.id)) { addElement(options, view) }) giveValuesBack(view)
+        }
+        for ((options, source, target) in DrawOrder.sorted(pairs, host) { it.third }) {
+            val name = pairName(options.fromId.get(""), options.toId.get(""))
+            elementStep(name) { addPair(options, source, target, name, fallbackDuration) }
         }
     }
 }

package/android/src/main/java/dev/apexnative/navigation/views/element/TargetsWait.kt

@@ -3,11 +3,11 @@ package dev.apexnative.navigation.views.element
 import android.util.Log
 import android.view.Choreographer
 import android.view.View
-import com.facebook.react.uimanager.util.ReactFindViewUtil
 import dev.apexnative.navigation.options.LayoutAnimation
 import dev.apexnative.navigation.react.events.AppearanceDispatcher
 import dev.apexnative.navigation.utils.DevelopmentLog
 import dev.apexnative.navigation.utils.NavigationLog
+import dev.apexnative.navigation.utils.SystemAnimations
 import dev.apexnative.navigation.viewcontrollers.viewcontroller.ViewController
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
@@ -18,7 +18,8 @@ import kotlinx.coroutines.launch
 /**
  * The wait of a forward transition with elements for its targets: the module's frames (`awaitTransitionTargets`, 0.5 s
  * at most, then one frame more), then the images of the shared elements found ([ImageWait], 1 s at most each). It ends
- * early when the screen that goes is destroyed. A failure in it is logged and the transition starts. Main thread only.
+ * early when the screen that goes is destroyed, and doesn't wait with the system's animations off. A failure in it is
+ * logged and the transition starts. Main thread only.
  */
 internal object TargetsWait {
     // The waits run on the main thread's frames; each is cancelled on its own.
@@ -32,6 +33,11 @@ internal object TargetsWait {
         waiting: () -> Boolean,
         done: () -> Unit,
     ): () -> Unit {
+        // With the system's animations off no element moves ([ElementTransition.start]): nothing to wait for.
+        if (SystemAnimations.areOff(to.peekView()?.context)) {
+            guarded { done() }
+            return NOTHING
+        }
         var stopped = false
         var stopImages: () -> Unit = NOTHING
         val still = { !stopped && waiting() && from?.isDestroyed != true }
@@ -72,12 +78,14 @@ internal object TargetsWait {
     ): () -> Unit {
         val fromView = from?.let { AppearanceDispatcher.visibleNode(it).peekView() }
         val toView = AppearanceDispatcher.visibleNode(to).peekView()
+        val pairs = animation.sharedElements.get()
+        val views = TransitionViews(pairs, emptyList(), fromView, toView)
         val images = ArrayList<ImageWait.Image?>()
-        for (pair in animation.sharedElements.get()) {
+        for (pair in pairs) {
             val fromId = pair.fromId.get(null) ?: continue
             val toId = pair.toId.get(null) ?: continue
-            val source = fromView?.let { ReactFindViewUtil.findView(it, fromId) } ?: continue
-            val target = toView?.let { ReactFindViewUtil.findView(it, toId) } ?: continue
+            val source = views.leaving(fromId) ?: continue
+            val target = views.arriving(toId) ?: continue
             images += imageOf(source, fromId)
             images += imageOf(target, toId)
         }

package/android/src/main/java/dev/apexnative/navigation/views/element/TransitionLayer.kt

@@ -2,45 +2,35 @@ package dev.apexnative.navigation.views.element
 
 import android.annotation.SuppressLint
 import android.content.Context
-import android.graphics.Point
-import android.graphics.Rect
+import android.graphics.Canvas
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
+import dev.apexnative.navigation.views.element.animators.FlightPicture
 
 /**
- * The layer of a transition's elements: full size over the screens' common parent (a stack's view; for a modal, between
- * the modals layer and the overlays layer), there only while the transition runs. Each view in it lies where its layout
- * params say — `leftMargin`, `topMargin` and its size, in the layer's pixels — and nothing re-places it: Fabric's views
- * carry no margins of their own. Nothing in it is clipped by the parents it came from, it takes no touches,
- * accessibility doesn't see it. Main thread only.
+ * The layer the copies of a transition's shared elements fly in: full size over the screens' common parent (a stack's
+ * view; for a modal, between the modals layer and the overlays layer), there only while the transition runs. It holds
+ * no views: it draws the pictures of the flights ([FlightPicture]) in the order they are added, each while it is shown,
+ * on every frame while one of them is [FlightPicture.live]. A picture whose drawing fails draws no more, and its
+ * [FlightPicture.onFailed] runs after the frame. It takes no touches, accessibility doesn't see it. Main thread only.
  */
 @SuppressLint("ViewConstructor")
-internal class TransitionLayer(context: Context) : ViewGroup(context) {
-    // The newest frame Fabric gave a view while it was here (a commit lays it out in its parent's coordinates).
-    private val reactFrames = HashMap<View, Rect>()
+internal class TransitionLayer(context: Context) : View(context) {
+    private val pictures = ArrayList<FlightPicture>()
 
     init {
-        clipChildren = false
-        clipToPadding = false
-        importantForAccessibility = IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS
+        importantForAccessibility = IMPORTANT_FOR_ACCESSIBILITY_NO
+        setWillNotDraw(false)
     }
 
-    /** The layer's top left corner on the screen, in pixels: what the views in it are placed from. */
-    val originOnScreen: Point
-        get() {
-            val location = IntArray(2)
-            getLocationOnScreen(location)
-            return Point(location[0], location[1])
-        }
-
     /**
-     * Joins [parent] at [index] (its top without one), laid out at once at the parent's size: its views are in their
-     * places on the frame the transition starts.
+     * Joins [parent] at [index] (its top without one), laid out at once at the parent's size: the places of the views
+     * are measured from it on the frame the transition starts.
      */
     fun attachTo(parent: ViewGroup, index: Int = parent.childCount) {
         // The parent turns these into its own kind of params.
-        parent.addView(this, index.coerceIn(0, parent.childCount), LayoutParams(MATCH, MATCH))
+        parent.addView(this, index.coerceIn(0, parent.childCount), ViewGroup.LayoutParams(MATCH, MATCH))
         measure(
             MeasureSpec.makeMeasureSpec(parent.width, MeasureSpec.EXACTLY),
             MeasureSpec.makeMeasureSpec(parent.height, MeasureSpec.EXACTLY),
@@ -48,51 +38,10 @@ internal class TransitionLayer(context: Context) : ViewGroup(context) {
         layout(0, 0, parent.width, parent.height)
     }
 
-    /** [view] lies at [left], [top] (the layer's pixels) at the size [width] × [height], laid out at once. */
-    fun put(view: View, left: Int, top: Int, width: Int, height: Int) {
-        val params = MarginLayoutParams(width, height).apply {
-            leftMargin = left
-            topMargin = top
-        }
-        addView(view, params)
-        layOut(view, left, top, width, height)
-    }
-
-    /** [view], in the layer, lies at [left], [top] at the size [width] × [height] from now on. */
-    fun place(view: View, left: Int, top: Int, width: Int, height: Int) {
-        noteReactFrame(view)
-        (view.layoutParams as? MarginLayoutParams)?.let {
-            it.leftMargin = left
-            it.topMargin = top
-            it.width = width
-            it.height = height
-        }
-        layOut(view, left, top, width, height)
-    }
-
-    private fun layOut(view: View, left: Int, top: Int, width: Int, height: Int) {
-        view.measure(
-            MeasureSpec.makeMeasureSpec(width.coerceAtLeast(0), MeasureSpec.EXACTLY),
-            MeasureSpec.makeMeasureSpec(height.coerceAtLeast(0), MeasureSpec.EXACTLY),
-        )
-        view.layout(left, top, left + width, top + height)
-    }
-
-    /**
-     * The newest frame React gave [view] while it was in the layer, in its parent's coordinates; none when React
-     * didn't lay it out meanwhile. A frame other than the one the layer gave it can only be React's.
-     */
-    fun frameFromReact(view: View): Rect? {
-        noteReactFrame(view)
-        return reactFrames.remove(view)
-    }
-
-    // The view's frame isn't where the layer put it: React laid it out since.
-    private fun noteReactFrame(view: View) {
-        val params = view.layoutParams as? MarginLayoutParams ?: return
-        val placed = view.left == params.leftMargin && view.top == params.topMargin &&
-            view.width == params.width && view.height == params.height
-        if (!placed) reactFrames[view] = Rect(view.left, view.top, view.right, view.bottom)
+    /** [picture] is drawn over those added before it. */
+    fun add(picture: FlightPicture) {
+        pictures += picture
+        invalidate()
     }
 
     /** The layer leaves its parent. */
@@ -100,53 +49,29 @@ internal class TransitionLayer(context: Context) : ViewGroup(context) {
         (parent as? ViewGroup)?.removeView(this)
     }
 
-    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-        setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec), MeasureSpec.getSize(heightMeasureSpec))
-        for (index in 0 until childCount) {
-            val child = getChildAt(index)
-            val params = child.layoutParams
-            child.measure(
-                MeasureSpec.makeMeasureSpec(params.width.coerceAtLeast(0), MeasureSpec.EXACTLY),
-                MeasureSpec.makeMeasureSpec(params.height.coerceAtLeast(0), MeasureSpec.EXACTLY),
-            )
-        }
-    }
-
-    override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
-        for (index in 0 until childCount) {
-            val child = getChildAt(index)
-            val params = child.layoutParams as? MarginLayoutParams ?: continue
-            noteReactFrame(child)
-            child.layout(
-                params.leftMargin,
-                params.topMargin,
-                params.leftMargin + child.measuredWidth,
-                params.topMargin + child.measuredHeight,
-            )
+    override fun onDraw(canvas: Canvas) {
+        var live = false
+        for (picture in pictures) {
+            if (!picture.shown) continue
+            live = live || picture.live
+            val count = canvas.save()
+            try {
+                picture.draw(canvas)
+            } catch (e: RuntimeException) {
+                picture.shown = false
+                post { picture.onFailed(e) }
+            } finally {
+                canvas.restoreToCount(count)
+            }
         }
+        // A landed copy gets no more frames from its flight: one that changes by itself asks for them.
+        if (live) postInvalidateOnAnimation()
     }
 
-    override fun checkLayoutParams(params: LayoutParams?): Boolean = params is MarginLayoutParams
-
-    override fun generateDefaultLayoutParams(): LayoutParams = MarginLayoutParams(0, 0)
-
-    override fun generateLayoutParams(params: LayoutParams?): LayoutParams = MarginLayoutParams(params)
-
+    @SuppressLint("ClickableViewAccessibility")
     override fun dispatchTouchEvent(event: MotionEvent?): Boolean = false
 
-    override fun shouldDelayChildPressedState(): Boolean = false
-
-    companion object {
-        private const val MATCH = LayoutParams.MATCH_PARENT
-
-        /** Whether [view] is in a transition's layer now (an element of another transition). */
-        fun holds(view: View): Boolean {
-            var parent = view.parent
-            while (parent != null) {
-                if (parent is TransitionLayer) return true
-                parent = parent.parent
-            }
-            return false
-        }
+    private companion object {
+        const val MATCH = ViewGroup.LayoutParams.MATCH_PARENT
     }
 }