@apexnative/navigation 1.0.0-alpha.5 → 1.0.0-alpha.7

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

@@ -1,72 +1,85 @@
 package dev.apexnative.navigation.views.element.animators
 
-import android.animation.Animator
 import android.view.View
 import android.widget.ImageView
-import com.facebook.react.views.image.ReactImageView
 import com.facebook.react.views.text.ReactTextView
-import com.facebook.react.views.view.ReactViewGroup
 import dev.apexnative.navigation.options.SharedElementTransitionOptions
 import dev.apexnative.navigation.views.animations.AnimationRules
 import dev.apexnative.navigation.views.animations.Curves
-import dev.apexnative.navigation.views.element.TransitionLayer
+import dev.apexnative.navigation.views.element.elementSkipped
 import dev.apexnative.navigation.views.element.pairName
 
 /**
- * The animator of a shared element by the kinds of its two views, chosen by explicit classes, never by reflection:
- * texts (`TextChangeAnimator`, the module), React views with children (`ViewChangeAnimator`, the module; a failed
- * picture flies as a view without children), React images ([ReactImageAnimator]), other images ([ImageMatrixAnimator]),
- * any other view ([PlainViewAnimator]). The animator gets the pair's duration (else the fallback, the screen's fade),
- * its delay and its curve here, each of its own (a spring in real time); an `AnimatorSet` around it never sets them.
- * Main thread only.
+ * The flight of a shared pair, as on iOS: a copy drawn in the transition's layer, chosen by the kinds of the two views,
+ * by explicit classes, never by reflection — texts ([TextMorph]), images ([ImageMorph]; one without an image to fit
+ * flies as a view), any other views ([ViewMorph]). The views themselves are neither moved nor changed. The animator
+ * gets the pair's duration (else the fallback, the screen's fade), its delay and its curve here, each of its own (a
+ * spring in real time); an `AnimatorSet` around it never sets them. Main thread only.
  */
 internal object SharedAnimatorFactory {
-    /**
-     * A pair's animator, and how it shows the pair: by pictures in the layer's overlay while `to` is hidden (the
-     * modules), or by moving `to` itself, which shows from the start of the flight.
-     */
-    class Flight(val animator: Animator, val drawsPictures: Boolean)
+    /** A pair's animator and the copy it moves. */
+    class Flight(val animator: MoveAnimator, val picture: FlightPicture)
 
     /**
-     * The flight of the pair [from] → [to]; [to] is in [layer] at its margins, at its real alpha (the pictures are
-     * taken now). [toParent] is the parent [to] had in its screen. None: the pair doesn't fly (a text that didn't
-     * change, a picture that can't be taken, no place).
+     * The flight of the pair [from] → [to] in [layer], its pictures taken now; a view or an image shows only the part
+     * its parents up to the view of its screen ([fromRoot], [toRoot]) leave visible, a text shows whole, as on iOS.
+     * None: the pair doesn't fly — a text that doesn't change, or, with a line in [log], a view without a size or a
+     * picture that can't be taken.
      */
     fun create(
         from: View,
         to: View,
-        toParent: View?,
-        layer: TransitionLayer,
+        fromRoot: View?,
+        toRoot: View?,
+        layer: View,
         options: SharedElementTransitionOptions,
         fallbackDuration: Long,
         log: (String) -> Unit,
     ): Flight? {
-        val flight = when {
-            from is ReactTextView && to is ReactTextView -> pictures(
-                TextChangeAnimator(from, to).takeIf { it.shouldAnimate() }?.create(options),
-            )
-            hasChildren(from) || hasChildren(to) -> pictures(
-                ViewChangeAnimator(from, to).takeIf { it.shouldAnimate() }?.create(options),
-            ) ?: moves(PlainViewAnimator(from, to, layer).create())
-            from is ReactImageView && to is ReactImageView -> moves(ReactImageAnimator(from, to, layer).create())
-            from is ImageView && to is ImageView -> moves(
-                ImageMatrixAnimator(from, to, layer, from.parent as? View, toParent, options.toId.get(""), log)
-                    .create(),
-            )
-            else -> moves(PlainViewAnimator(from, to, layer).create())
-        } ?: return null
-        val animator = flight.animator
-        (animator as? MoveAnimator)?.element = pairName(options.fromId.get(""), options.toId.get(""))
+        val name = pairName(options.fromId.get(""), options.toId.get(""))
+        if (from.width <= 0 || from.height <= 0 || to.width <= 0 || to.height <= 0) {
+            elementSkipped(name, "a view of the pair has no size, it isn't laid out", log)
+            return null
+        }
+        val picture = if (from is ReactTextView && to is ReactTextView) {
+            val text = TextMorph.of(from, to, layer) ?: return noPicture(name, log)
+            if (!text.changes) return null
+            text
+        } else {
+            val image = if (from is ImageView && to is ImageView) {
+                ImageMorph.of(from, to, fromRoot, toRoot, layer)
+            } else {
+                null
+            }
+            image ?: ViewMorph.of(from, to, fromRoot, toRoot, layer) ?: return noPicture(name, log)
+        }
+        val animator = MoveAnimator().apply {
+            element = name
+            onStart {
+                picture.shown = true
+                picture.update(0f, curve.getInterpolation(0f))
+                layer.invalidate()
+            }
+            onFrame {
+                picture.update(it, curve.getInterpolation(it))
+                layer.invalidate()
+            }
+            // A flight that landed keeps its last frame until the transition takes the layer away: the screens may
+            // still move. A stopped one draws nothing more.
+            onEnd {
+                if (!landed) picture.shown = false
+                layer.invalidate()
+            }
+        }
         val duration = AnimationRules.durationOf(options.duration.get(null), fallbackDuration)
         animator.duration = duration
         animator.startDelay = AnimationRules.delayOf(options.startDelay.get(null))
         animator.interpolator = Curves.of(options.interpolation, duration)
-        return flight
+        return Flight(animator, picture)
     }
 
-    private fun pictures(animator: Animator?): Flight? = animator?.let { Flight(it, drawsPictures = true) }
-
-    private fun moves(animator: Animator?): Flight? = animator?.let { Flight(it, drawsPictures = false) }
-
-    private fun hasChildren(view: View): Boolean = view is ReactViewGroup && view.childCount > 0
+    private fun noPicture(name: String, log: (String) -> Unit): Flight? {
+        elementSkipped(name, "no picture of a view of the pair can be taken", log)
+        return null
+    }
 }

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

@@ -0,0 +1,176 @@
+package dev.apexnative.navigation.views.element.animators
+
+import android.graphics.Canvas
+import android.graphics.Picture
+import android.graphics.PointF
+import android.text.Layout
+import android.view.View
+import android.widget.TextView
+import com.facebook.react.views.text.ReactTextView
+import dev.apexnative.navigation.utils.TextViewUtils
+import dev.apexnative.navigation.views.animations.ValueInterpolation
+import kotlin.math.abs
+import kotlin.math.min
+import kotlin.math.roundToInt
+
+/**
+ * The text moves as two pictures of itself, of the text that goes away and of the text that comes, the same text or
+ * another. Both keep their proportions, scaled by the font size from a point of the first line, and one turns into the
+ * other in a quarter of the move: at its start when the text grows, at its end when it shrinks, so the larger picture
+ * shows most of the way (as on iOS). Each text is where it is drawn, at the scale and angle its parents and its own
+ * properties give it; the angle goes along the shorter arc ([FlightGeometry]). The pictures are drawing commands, not
+ * pixels: they stay sharp at any scale and keep the colors, emoji and background of the text.
+ */
+internal class TextMorph private constructor(private val start: TextPicture, private val end: TextPicture) :
+    FlightPicture() {
+    /** Whether the text changes on the way: another text, another size, or drawn elsewhere. */
+    val changes: Boolean
+        get() = start.text != end.text || start.fontSize != end.fontSize || start.drawnElsewhere(end)
+
+    private val grows = end.shownSize >= start.shownSize
+    private var progress = 0f
+    private var time = 0f
+    private var changeOver = 0f
+    private var mirrorX = 1f
+    private var mirrorY = 1f
+
+    override fun update(time: Float, progress: Float) {
+        this.progress = progress
+        this.time = time
+        val changeOverStart = if (grows) 0f else 1f - CHANGE_OVER
+        changeOver = ((time - changeOverStart) / CHANGE_OVER).coerceIn(0f, 1f)
+    }
+
+    override fun draw(canvas: Canvas) {
+        val x = start.position.x + (end.position.x - start.position.x) * progress
+        val y = start.position.y + (end.position.y - start.position.y) * progress
+        val fontSize = start.shownSize + (end.shownSize - start.shownSize) * progress
+        val rotation = ValueInterpolation.angle(start.rotation, end.rotation, progress, time)
+        mirrorX = ValueInterpolation.number(start.mirrorX, end.mirrorX, progress, time)
+        mirrorY = ValueInterpolation.number(start.mirrorY, end.mirrorY, progress, time)
+        draw(canvas, start, x, y, fontSize, rotation, 1f - changeOver)
+        draw(canvas, end, x, y, fontSize, rotation, changeOver)
+    }
+
+    private fun draw(
+        canvas: Canvas,
+        text: TextPicture,
+        x: Float,
+        y: Float,
+        fontSize: Float,
+        rotation: Float,
+        shown: Float,
+    ) {
+        val alpha = (shown * text.alpha * 255).roundToInt().coerceIn(0, 255)
+        if (alpha == 0) return
+        val scale = fontSize / text.fontSize
+        val count = canvas.save()
+        canvas.translate(x, y)
+        canvas.rotate(rotation)
+        canvas.scale(scale * mirrorX, scale * mirrorY)
+        canvas.translate(-text.anchor.x, -text.anchor.y)
+        // The picture fades as a whole: its letters and background don't show through each other.
+        if (alpha < 255) {
+            canvas.saveLayerAlpha(0f, 0f, text.picture.width.toFloat(), text.picture.height.toFloat(), alpha)
+        }
+        canvas.drawPicture(text.picture)
+        canvas.restoreToCount(count)
+    }
+
+    companion object {
+        private const val CHANGE_OVER = 0.25f
+
+        /**
+         * The morph of [from] into [to] in [layer]; none when a text isn't laid out or its picture can't be taken.
+         * Texts that line up the same way go from that point of their first lines (the same text lies over itself);
+         * others from the start of the line, as on iOS: a centered text no longer sticks out of a text at the start.
+         */
+        fun of(from: ReactTextView, to: ReactTextView, layer: View): TextMorph? {
+            val fromLayout = from.layout ?: return null
+            val toLayout = to.layout ?: return null
+            val edge = lineEdge(fromLayout).takeIf { it == lineEdge(toLayout) } ?: LineEdge.START
+            val start = TextPicture.of(from, LayerPlace.of(from, layer), edge) ?: return null
+            val end = TextPicture.of(to, LayerPlace.of(to, layer), edge) ?: return null
+            return TextMorph(start, end)
+        }
+    }
+}
+
+// A text's picture and its text, the point of its first line it is scaled from (in the view) and where that point is
+// drawn in the transition layer, its font size, the scale and angle it is drawn at, and its opacity.
+private class TextPicture(
+    val text: String,
+    val picture: Picture,
+    val anchor: PointF,
+    val position: PointF,
+    val fontSize: Float,
+    val scale: Float,
+    val rotation: Float,
+    val mirrorX: Float,
+    val mirrorY: Float,
+    val alpha: Float
+) {
+    /** The font size it shows at. */
+    val shownSize: Float get() = fontSize * scale
+
+    /** Whether [other] is drawn elsewhere, larger or smaller, or turned. */
+    fun drawnElsewhere(other: TextPicture): Boolean =
+        abs(position.x - other.position.x) > SAME_PLACE || abs(position.y - other.position.y) > SAME_PLACE ||
+            abs(scale - other.scale) > SAME_SCALE || abs(rotation - other.rotation) > SAME_ANGLE ||
+            mirrorX != other.mirrorX || mirrorY != other.mirrorY
+
+    companion object {
+        // Within half a pixel, a thousandth of the scale and a tenth of a degree: the same.
+        private const val SAME_PLACE = 0.5f
+        private const val SAME_SCALE = 0.001f
+        private const val SAME_ANGLE = 0.1f
+
+        fun of(view: TextView, place: LayerPlace, edge: LineEdge): TextPicture? {
+            val layout = view.layout ?: return null
+            val fontSize = TextViewUtils.getTextSize(view).takeIf { it > 0 } ?: view.textSize
+            if (view.width <= 0 || view.height <= 0 || layout.lineCount == 0 || fontSize <= 0) return null
+            // Without a picture (recording failed) the text goes to its place at once, as a different text does.
+            val picture = recordPicture(view) ?: return null
+            val anchor = PointF(
+                view.totalPaddingLeft + edgeX(layout, edge),
+                view.totalPaddingTop + layout.getLineBaseline(0).toFloat()
+            )
+            val position = place.point(anchor.x, anchor.y)
+            val scale = min(abs(place.scaleX), abs(place.scaleY))
+            return TextPicture(
+                view.text.toString(), picture, anchor, PointF(position[0], position[1]), fontSize, scale,
+                place.rotation,
+                mirrorX = if (place.scaleX < 0) -1f else 1f,
+                mirrorY = if (place.scaleY < 0) -1f else 1f,
+                alpha = view.alpha,
+            )
+        }
+
+        // That point of the first line, in the direction of the text.
+        private fun edgeX(layout: Layout, edge: LineEdge): Float {
+            val left = layout.getLineLeft(0)
+            val right = layout.getLineRight(0)
+            val rightToLeft = layout.getParagraphDirection(0) == Layout.DIR_RIGHT_TO_LEFT
+            return when (edge) {
+                LineEdge.CENTER -> (left + right) / 2
+                LineEdge.START -> if (rightToLeft) right else left
+                LineEdge.END -> if (rightToLeft) left else right
+            }
+        }
+    }
+}
+
+// Where the lines of a text line up: their start, center or end, in the direction of the text.
+private enum class LineEdge { START, CENTER, END }
+
+// ALIGN_LEFT and ALIGN_RIGHT are hidden constants, for Gravity.LEFT and RIGHT.
+private fun lineEdge(layout: Layout): LineEdge {
+    val rightToLeft = layout.getParagraphDirection(0) == Layout.DIR_RIGHT_TO_LEFT
+    return when (layout.getParagraphAlignment(0).name) {
+        "ALIGN_CENTER" -> LineEdge.CENTER
+        "ALIGN_OPPOSITE" -> LineEdge.END
+        "ALIGN_LEFT" -> if (rightToLeft) LineEdge.END else LineEdge.START
+        "ALIGN_RIGHT" -> if (rightToLeft) LineEdge.START else LineEdge.END
+        else -> LineEdge.START
+    }
+}

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

@@ -0,0 +1,108 @@
+package dev.apexnative.navigation.views.element.animators
+
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.graphics.Picture
+import android.graphics.PorterDuff
+import android.graphics.PorterDuffXfermode
+import android.graphics.RectF
+import android.view.View
+import dev.apexnative.navigation.utils.borderRadius
+import kotlin.math.roundToInt
+
+/**
+ * A shared view moves as two pictures of itself, as on iOS: of the view that goes away and of the one that comes, each
+ * with its children. The copy goes from where the one is drawn — its center, its size at the scale it is drawn at, its
+ * angle and corner radius — to where the other is drawn in its screen ([FlightGeometry]), the angle along the shorter
+ * arc; both pictures fill it, and the picture of the destination shows over the other on the way. Where a parent cuts
+ * a view (`overflow: hidden`, a scroll view, the screen's edge), only the part that shows flies, the mask going from
+ * one end's part to the other's ([FlightMask]), as on iOS. The pictures are drawing commands, taken before the views
+ * hide: an avatar's letter grows sharp, and what changes in the views meanwhile shows when they are back.
+ */
+internal class ViewMorph private constructor(
+    private val start: ViewPicture,
+    private val end: ViewPicture,
+) : FlightPicture() {
+    private val flight = FlightGeometry(start.end, end.end)
+    private val cut = FlightMask.of(start.visible, end.visible)?.let(::MaskCut)
+    private var at = start.end
+    private var progress = 0f
+    private val rect = RectF()
+    private val maskPaint = Paint(Paint.ANTI_ALIAS_FLAG)
+    // What is drawn over the mask keeps only the mask's pixels: the corners stay smooth (a clip path on the hardware
+    // canvas is not anti-aliased).
+    private val contentPaint = Paint().apply { xfermode = PorterDuffXfermode(PorterDuff.Mode.SRC_IN) }
+
+    override fun update(time: Float, progress: Float) {
+        this.progress = progress
+        at = flight.at(progress, time)
+        cut?.update(time, progress)
+    }
+
+    override fun draw(canvas: Canvas) {
+        rect.set(-at.width / 2, -at.height / 2, at.width / 2, at.height / 2)
+        if (rect.isEmpty) return
+        val radius = lerp(start.radius, end.radius)
+        // The copy turns about its center, mirrored where a view is.
+        canvas.translate(at.centerX, at.centerY)
+        canvas.rotate(at.rotation)
+        canvas.scale(at.mirrorX, at.mirrorY)
+        canvas.saveLayer(rect, null)
+        canvas.drawRoundRect(rect, radius, radius, maskPaint)
+        cut?.draw(canvas, rect)
+        canvas.saveLayer(rect, contentPaint)
+        draw(canvas, start, start.alpha)
+        draw(canvas, end, end.alpha * progress)
+    }
+
+    // A picture fills the copy, as on iOS.
+    private fun draw(canvas: Canvas, view: ViewPicture, shown: Float) {
+        val alpha = (shown * 255).roundToInt().coerceIn(0, 255)
+        if (alpha == 0) return
+        val width = view.picture.width.toFloat()
+        val height = view.picture.height.toFloat()
+        val count = canvas.save()
+        canvas.translate(rect.left, rect.top)
+        canvas.scale(rect.width() / width, rect.height() / height)
+        // The picture fades as a whole: its children and background don't show through each other.
+        if (alpha < 255) canvas.saveLayerAlpha(0f, 0f, width, height, alpha)
+        canvas.drawPicture(view.picture)
+        canvas.restoreToCount(count)
+    }
+
+    private fun lerp(from: Float, to: Float) = from + (to - from) * progress
+
+    companion object {
+        /**
+         * The morph of [from] into [to] in [layer], each cut by its parents up to the view of its screen ([fromRoot],
+         * [toRoot]); none when a picture of either can't be taken.
+         */
+        fun of(from: View, to: View, fromRoot: View?, toRoot: View?, layer: View): ViewMorph? {
+            val start = ViewPicture.of(from, LayerPlace.of(from, layer, fromRoot)) ?: return null
+            val end = ViewPicture.of(to, LayerPlace.of(to, layer, toRoot)) ?: return null
+            return ViewMorph(start, end)
+        }
+    }
+}
+
+// A view's picture, where it is drawn in the transition layer, its corner radius there, its opacity and the part of it
+// that shows.
+private class ViewPicture(
+    val picture: Picture,
+    val end: FlightEnd,
+    val radius: Float,
+    val alpha: Float,
+    val visible: VisiblePart,
+) {
+    companion object {
+        fun of(view: View, place: LayerPlace): ViewPicture? {
+            if (view.width <= 0 || view.height <= 0) return null
+            val picture = recordPicture(view) ?: return null
+            val end = place.end(view.width, view.height)
+            val radius = view.borderRadius
+            return ViewPicture(
+                picture, end, radius * end.scale, view.alpha, place.visible(view.width, view.height, radius),
+            )
+        }
+    }
+}

package/android/src/main/java/dev/apexnative/navigation/views/stack/fab/FabCopy.kt

@@ -0,0 +1,85 @@
+package dev.apexnative.navigation.views.stack.fab
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Outline
+import android.graphics.Picture
+import android.os.Build
+import android.view.Gravity
+import android.view.View
+import android.view.ViewGroup
+import android.view.ViewOutlineProvider
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import dev.apexnative.navigation.views.element.animators.recordPicture
+
+/**
+ * The picture of a FAB that leaves with its screen while the new top's FAB arrives: drawn as the button was, with the
+ * shadow of its shape, taking no touches and hidden from accessibility. The live button goes from its parent at once.
+ */
+@SuppressLint("ViewConstructor")
+internal class FabCopy private constructor(
+    context: Context,
+    private val picture: Picture,
+    shape: Outline,
+) : View(context) {
+    init {
+        importantForAccessibility = IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS
+        outlineProvider = object : ViewOutlineProvider() {
+            override fun getOutline(view: View, outline: Outline) = outline.set(shape)
+        }
+    }
+
+    override fun onDraw(canvas: Canvas) {
+        canvas.drawPicture(picture)
+    }
+
+    companion object {
+        /**
+         * A copy of [button] in [container], a child of [parent] (the button itself, or its menu), as it shows now: in
+         * its place in [parent], moved, scaled and faded as it is. None when it doesn't show or can't be recorded (a
+         * hardware bitmap in its icon before Android 9).
+         */
+        fun of(button: View, container: View, parent: ViewGroup): FabCopy? {
+            if (container.parent !== parent || !button.isAttachedToWindow) return null
+            if (button.width <= 0 || button.height <= 0) return null
+            if (container.visibility != VISIBLE || button.visibility != VISIBLE) return null
+            val inner = button !== container
+            val alpha = container.alpha * if (inner) button.alpha else 1f
+            val scale = container.scaleX * if (inner) button.scaleX else 1f
+            if (alpha <= 0f || scale <= 0f) return null
+            val picture = recordPicture(button) ?: return null
+            val shape = Outline().apply {
+                // As the view counts its own outline: opaque unless the provider says otherwise.
+                this.alpha = 1f
+                button.outlineProvider?.getOutline(button, this)
+            }
+            val copy = FabCopy(button.context, picture, shape)
+            val left = container.left + if (inner) button.left else 0
+            val top = container.top + if (inner) button.top else 0
+            copy.translationX = container.translationX + if (inner) button.translationX else 0f
+            copy.translationY = container.translationY + if (inner) button.translationY else 0f
+            copy.scaleX = scale
+            copy.scaleY = scale
+            copy.alpha = alpha
+            copy.elevation = button.elevation
+            copy.translationZ = button.translationZ
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                copy.outlineAmbientShadowColor = button.outlineAmbientShadowColor
+                copy.outlineSpotShadowColor = button.outlineSpotShadowColor
+            }
+            parent.addView(copy, CoordinatorLayout.LayoutParams(button.width, button.height).apply {
+                gravity = Gravity.TOP or Gravity.LEFT
+                leftMargin = left
+                topMargin = top
+            })
+            // In its place before the next layout, so its first frame draws.
+            copy.measure(
+                MeasureSpec.makeMeasureSpec(button.width, MeasureSpec.EXACTLY),
+                MeasureSpec.makeMeasureSpec(button.height, MeasureSpec.EXACTLY),
+            )
+            copy.layout(left, top, left + button.width, top + button.height)
+            return copy
+        }
+    }
+}

package/android/src/main/java/dev/apexnative/navigation/views/stack/fab/FabMenu.kt

@@ -120,6 +120,19 @@ class FabMenu(context: Context, val fabId: String) : LinearLayout(context), FabA
         (view.parent as? ViewGroup)?.removeView(view)
     }
 
+    /**
+     * The menu closes and leaves its parent next: a scrim that shows fades out by itself and goes from the parent at
+     * the end of its fade, which the menu no longer owns; it takes no touches meanwhile, which belong to the new screen.
+     */
+    fun closeToLeave() {
+        close()
+        scrim?.apply {
+            setOnClickListener(null)
+            isClickable = false
+        }
+        scrim = null
+    }
+
     override fun show() = main.show()
 
     override fun hide() {

package/android/src/main/java/dev/apexnative/navigation/views/stack/topbar/TitleBar.kt

@@ -7,15 +7,14 @@ import android.util.TypedValue
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.widget.AppCompatTextView
-import com.google.android.material.appbar.MaterialToolbar
-import dev.apexnative.navigation.utils.MaterialTheme
 import dev.apexnative.navigation.utils.UiUtils
+import dev.apexnative.navigation.views.stack.topbar.titlebar.ButtonRow
 import kotlin.math.max
 import kotlin.math.min
 
 /**
  * The row of the bar: the left buttons with the back button at the start ([leftButtonBar]), the right buttons and "⋮"
- * at the end ([rightButtonBar]), both Material 3 toolbars, and between them the title and the subtitle, or a React
+ * at the end ([rightButtonBar]), each a [ButtonRow], and between them the title and the subtitle, or a React
  * title ([titleComponent]). It lays them out in its own coordinates, so a shift of the row (`topBar.title.topMargin`)
  * moves them all; [sideInsets] keep them off the system bars and the cutout at the sides. Right to left, everything
  * mirrors. Main thread only.
@@ -26,10 +25,10 @@ class TitleBar(context: Context) : ViewGroup(context) {
     enum class Alignment { Start, Center, Fill }
 
     /** The back button (its navigation button) and the left buttons. */
-    val leftButtonBar = MaterialToolbar(context).also(::plain)
+    val leftButtonBar = ButtonRow(context)
 
     /** The right buttons, the search's magnifier and "⋮". */
-    val rightButtonBar = MaterialToolbar(context).also(::plain)
+    val rightButtonBar = ButtonRow(context)
 
     /** The title's text: one line, cut with "…" at its end (`topBar.title.text`). */
     val titleView = AppCompatTextView(context).apply {
@@ -118,8 +117,6 @@ class TitleBar(context: Context) : ViewGroup(context) {
         val height = MeasureSpec.getSize(heightMeasureSpec)
         val inner = max(width - sideInsetsBox[0] - sideInsetsBox[1], 0)
         val exactHeight = MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
-        alignButtons(leftButtonBar, height)
-        alignButtons(rightButtonBar, height)
         leftButtonBar.measure(MeasureSpec.makeMeasureSpec(inner, MeasureSpec.AT_MOST), exactHeight)
         val rightRoom = max(inner - leftButtonBar.measuredWidth, 0)
         rightButtonBar.measure(MeasureSpec.makeMeasureSpec(rightRoom, MeasureSpec.AT_MOST), exactHeight)
@@ -154,7 +151,7 @@ class TitleBar(context: Context) : ViewGroup(context) {
             view.layout(x, top, x + w, top + view.measuredHeight)
         }
         // The back button and the left buttons at the start of the line, the right buttons at its end: right to left
-        // the whole row mirrors, and each toolbar mirrors what it holds.
+        // the whole row mirrors, and each side mirrors what it holds.
         val startBar = leftButtonBar.measuredWidth
         val endBar = rightButtonBar.measuredWidth
         place(leftButtonBar, 0, 0)
@@ -194,22 +191,6 @@ class TitleBar(context: Context) : ViewGroup(context) {
         return min(max(middle, startBar), max(inner - endBar - width, startBar))
     }
 
-    // A toolbar stands its back button and its menu at the top of its minimum height, centered in it (`buttonGravity`
-    // is top): with the row's height as that minimum, they stand in the middle of the row, as the title does.
-    private fun alignButtons(toolbar: MaterialToolbar, height: Int) {
-        if (toolbar.minimumHeight != height) toolbar.minimumHeight = height
-    }
-
-    // A toolbar that holds only buttons: no insets of its own around them (the row places them).
-    private fun plain(toolbar: MaterialToolbar) {
-        // Before the toolbar makes its menu, which takes the popup theme once: "⋮" in the current mode.
-        toolbar.popupTheme = MaterialTheme.popupTheme(toolbar.context)
-        toolbar.setContentInsetsRelative(0, 0)
-        toolbar.contentInsetStartWithNavigation = 0
-        toolbar.contentInsetEndWithActions = 0
-        toolbar.setPadding(0, 0, 0, 0)
-    }
-
     private companion object {
         const val GAP_DP = 16
         const val TITLE_SIZE_SP = 22f