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

package/android/src/main/java/dev/apexnative/navigation/viewcontrollers/bottomtabs/BottomTabsController.kt

@@ -34,6 +34,7 @@ import dev.apexnative.navigation.viewcontrollers.stack.StackController
 import dev.apexnative.navigation.viewcontrollers.stack.fab.FabPlacement
 import dev.apexnative.navigation.viewcontrollers.viewcontroller.Presenter
 import dev.apexnative.navigation.viewcontrollers.viewcontroller.ViewController
+import dev.apexnative.navigation.views.animations.AnimationLayer
 import dev.apexnative.navigation.views.animations.FadeThrough
 import dev.apexnative.navigation.views.bottomtabs.BottomTabItem
 import dev.apexnative.navigation.views.bottomtabs.BottomTabsLayout
@@ -199,7 +200,9 @@ class BottomTabsController(
                 }
             })
             val set = AnimatorSet()
-            set.playTogether(exit, FadeThrough.enter(coming))
+            // Each tab fades whole through a hardware layer; a switch ended early ([set]'s end) gives them back too.
+            val enter = FadeThrough.enter(coming)
+            set.playTogether(AnimationLayer.during(going, exit), AnimationLayer.during(coming, enter))
             set.addListener(object : AnimatorListenerAdapter() {
                 override fun onAnimationEnd(animation: Animator) {
                     set.removeAllListeners()
@@ -350,8 +353,8 @@ class BottomTabsController(
 
     /**
      * Selects the tab at [index]: the bar shows it at once; on screen the tab it left fades through to it (Material's
-     * fade through), off screen one container becomes invisible and the other visible at once; then [switched]. The
-     * history of back follows.
+     * fade through); off screen, or when the new tab's `bottomTabs.switchAnimation` is `'none'`, one container becomes
+     * invisible and the other visible at once; then [switched]. The history of back follows.
      */
     private fun select(index: Int, how: How) {
         if (index == selectedIndex || index !in tabs.indices || isDestroyed) return
@@ -381,7 +384,7 @@ class BottomTabsController(
         // it must act in this tab, not in the one still fading out.
         if (how != How.Press) AppearanceDispatcher.reportState()
         if (views == null) return switched(index, previous, how, onScreen, hasViews = false)
-        endSwitch = views.switch(shown, left, animated = onScreen) {
+        endSwitch = views.switch(shown, left, animated = onScreen && fadesThrough(shown)) {
             endSwitch = null
             if (!isDestroyed) switched(index, previous, how, onScreen, hasViews = true)
         }
@@ -427,6 +430,11 @@ class BottomTabsController(
         if (screen == null) finish() else AppearanceDispatcher.afterDidAppear(screen, finish)
     }
 
+    // `bottomTabs.switchAnimation` of the tab that shows, its shown screen's over its own, the tabs' and the defaults:
+    // `'platform'`, the default, fades through; `'none'` switches at once.
+    private fun fadesThrough(tab: ViewController<*>): Boolean =
+        tab.resolveShownOptions(DefaultOptions.current).bottomTabs.switchAnimation.get(null) != "none"
+
     // A switch still running ends at once and a press's `ANN.BottomTabSelected` still waiting goes, before anything
     // newer on these tabs.
     private fun flushPendingSelected() {
@@ -548,9 +556,6 @@ class BottomTabsController(
         return TabsRoom.tabsTop(room(), screenOptions(screen), bottom)
     }
 
-    override fun leavesBottomEdgeFree(child: ViewController<*>, screen: ViewController<*>): Boolean =
-        TabsRoom.leavesBottomEdgeFree(screenOptions(screen)) || super.leavesBottomEdgeFree(child, screen)
-
     override fun tabsAtRestOf(child: ViewController<*>, screen: ViewController<*>): FabPlacement.Tabs? {
         if (peekView() == null) return super.tabsAtRestOf(child, screen)
         return TabsRoom.fabTabs(room(), screenOptions(screen))
@@ -631,7 +636,6 @@ class BottomTabsController(
         layout.row = row
         layout.bar.customRowOptionsListener = { applyRow(row, it) }
         layout.bar.customRowOptions = resolveShownOptions(DefaultOptions.current).bottomTabs.customRow.copy()
-        CustomTabRowPlacer.track(activity)
     }
 
     private fun applyRow(row: CustomTabRow, options: BottomTabsCustomRowOptions) {
@@ -683,7 +687,7 @@ class BottomTabsController(
 
     /**
      * Destroys the tabs once: every tab and the registry first, then the cells (each stops its root once), the row out
-     * of the window, the scroll it followed. A press's event still waiting goes with them.
+     * of the tabs' view, the scroll it followed. A press's event still waiting goes with them.
      */
     override fun destroy() {
         if (isDestroyed) return
@@ -694,7 +698,6 @@ class BottomTabsController(
         endSwitch?.invoke()
         peekView()?.let { layout ->
             layout.bar.destroyCustomItemViews()
-            layout.row?.let(CustomTabRowPlacer::forget)
             layout.row = null
         }
         cells = emptyList()

package/android/src/main/java/dev/apexnative/navigation/viewcontrollers/bottomtabs/CustomTabRowGeometry.kt

@@ -49,6 +49,22 @@ internal object CustomTabRowGeometry {
             content = content,
         )
 
+    /**
+     * The row over the bar as the tabs' view lays it out: the bar's [barLeft], [barRight] and [barBottom] in that
+     * view, whose height is [tabsHeight] and whose bottom [navigationBar] pixels lie under the navigation bar — the
+     * row's bottom never goes over them —, with [margin], [content] and [bottomMargin] as [place] takes them.
+     */
+    fun inTabs(
+        barLeft: Int,
+        barRight: Int,
+        barBottom: Int,
+        tabsHeight: Int,
+        navigationBar: Int,
+        margin: Int,
+        content: Int,
+        bottomMargin: Int,
+    ): Place = place(barLeft, barRight, minOf(barBottom, tabsHeight - navigationBar), margin, content, bottomMargin)
+
     /**
      * The part of the row's frame at [place] below its visible part, in pixels: `bottomMargin`. The row draws and takes
      * touches only above it.
@@ -61,6 +77,12 @@ internal object CustomTabRowGeometry {
      */
     fun needsPlacing(last: Place?, next: Place): Boolean = last != next
 
+    /**
+     * The row's own lift over its [elevation] while the bar's container stands at [barZ]: as high as the container, so
+     * the row, after it in the tabs' view, draws over it and takes the touches first even under a raised bar.
+     */
+    fun lift(barZ: Float, elevation: Float): Float = (barZ - elevation).coerceAtLeast(0f)
+
     /**
      * The row's background: `customRow.backgroundColor` ([color]; `null` and `'NoColor'` are none); without it
      * `backgroundEffect: 'none'` ([effect]) is clear, any other effect or none the theme's `android:colorBackground`

package/android/src/main/java/dev/apexnative/navigation/viewcontrollers/bottomtabs/TabsRoom.kt

@@ -58,11 +58,6 @@ internal object TabsRoom {
     fun tabsTop(bar: Bar, screen: Screen, tabsBottom: Int): Int? =
         if (screen.hidden) null else tabsBottom - bar.reach - bar.rowOvershoot
 
-    /**
-     * The safe area of the screen leaves its bottom edge free: the bar hides on scroll and shows for it.
-     */
-    fun leavesBottomEdgeFree(screen: Screen): Boolean = screen.hideOnScroll && !screen.hidden
-
     /**
      * The bar at rest under a stack's FAB: also when the screen is under it (`drawBehind`, `hideOnScroll`); none when
      * the screen hides it.

package/android/src/main/java/dev/apexnative/navigation/viewcontrollers/component/ComponentViewController.kt

@@ -8,9 +8,8 @@ import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import dev.apexnative.navigation.options.DefaultOptions
 import dev.apexnative.navigation.options.Options
-import dev.apexnative.navigation.react.ArrangementStates
 import dev.apexnative.navigation.react.ReactView
-import dev.apexnative.navigation.react.ScreenInsets
+import dev.apexnative.navigation.react.ScreenEnvironment
 import dev.apexnative.navigation.react.ScreenRegions
 import dev.apexnative.navigation.react.events.AppearanceDispatcher
 import dev.apexnative.navigation.react.events.ComponentType
@@ -157,7 +156,7 @@ class ComponentViewController(
             shown = layout.isShown || prepared,
             layoutPending = !prepared && isLayoutPending(content),
             topOfStack = parent?.isTopOfStack(this) ?: true,
-            hasSafeArea = ScreenInsets.padding(id) != null,
+            hasSafeArea = ScreenEnvironment.padding(id) != null,
         )
         if (!measures) return
         val windowInsets = ViewCompat.getRootWindowInsets(content) ?: return
@@ -176,11 +175,13 @@ class ComponentViewController(
         val edges = ScreenSafeArea.paddedEdges(
             safeAreaEdges = resolveCurrentOptions(DefaultOptions.current).layout.safeAreaEdges,
             topFree = parent?.leavesTopEdgeFree(this) == true,
-            bottomFree = parent?.leavesBottomEdgeFree(this) == true,
+            largeTitle = parent?.showsLargeTitleOver(this) == true,
         )
         // The events of the screen go to the JavaScript it was made for, and to no other.
         val emitter = EventEmitter.of(jsGeneration)
-        ScreenInsets.update(id, insets, ScreenSafeArea.padding(insets, edges), emitter)
+        val padding = ScreenSafeArea.padding(insets, edges)
+        val uncovered = ScreenSafeArea.uncovered(insets, padding)
+        ScreenEnvironment.setInsets(id, uncovered, padding, ScreenEnvironment.changesOf(emitter))
         val area = Rect(place.left, place.top, place.right, place.bottom)
         ScreenRegions.update(activity, id, area, windowInsets, emitter)
     }
@@ -245,9 +246,7 @@ class ComponentViewController(
         }
         setParentController(null)
         if (isIdTakenByAnother) return
-        ScreenInsets.remove(id)
-        ScreenRegions.remove(id)
-        ArrangementStates.remove(id)
+        ScreenEnvironment.remove(id)
         ScreenReadiness.remove(id)
     }
 

package/android/src/main/java/dev/apexnative/navigation/viewcontrollers/component/ScreenSafeArea.kt

@@ -1,6 +1,6 @@
 package dev.apexnative.navigation.viewcontrollers.component
 
-import dev.apexnative.navigation.react.ScreenInsets
+import dev.apexnative.navigation.react.ScreenEnvironment.Insets
 
 /**
  * The arithmetic of a screen's room, safe area and background on Android, without views: the screen nodes read the
@@ -19,6 +19,7 @@ internal object ScreenSafeArea {
     const val LEFT = "left"
 
     private val ALL_EDGES = setOf(TOP, RIGHT, BOTTOM, LEFT)
+    private val DEFAULT_EDGES = setOf(TOP, RIGHT, LEFT)
     private const val OPAQUE = 0xFF
 
     /**
@@ -57,10 +58,10 @@ internal object ScreenSafeArea {
         headerBottom: Int?,
         tabsTop: Int?,
         density: Float,
-    ): ScreenInsets.Insets {
+    ): Insets {
         val coveredAbove = maxOf(system.top, headerBottom ?: 0)
         val coveredBelow = minOf(windowHeight - system.bottom, tabsTop ?: windowHeight)
-        return ScreenInsets.Insets(
+        return Insets(
             top = dp((coveredAbove - root.top).coerceAtLeast(0), density),
             right = dp((root.right - (windowWidth - system.right)).coerceAtLeast(0), density),
             bottom = dp((root.bottom - coveredBelow).coerceAtLeast(0), density),
@@ -69,26 +70,43 @@ internal object ScreenSafeArea {
     }
 
     /**
-     * The edges the screen's safe area view keeps its content off: exactly [safeAreaEdges] when the options give them;
-     * else all four, but the top when the stack's header hides on scroll or a large title shows ([topFree]) and the
-     * bottom when the tabs hide on scroll ([bottomFree]).
+     * The edges the screen's safe area view keeps its content off: exactly [safeAreaEdges] when the options give them,
+     * but the top under a large title ([largeTitle]); else the top and the sides, but the top when the stack's header
+     * hides on scroll or a large title shows ([topFree]). The bottom is free by default: the content goes down to the
+     * bottom, and a list keeps its last rows clear of the navigation bar with `useSafeAreaInsets()`.
      */
-    fun paddedEdges(safeAreaEdges: List<String>?, topFree: Boolean, bottomFree: Boolean): Set<String> {
-        if (safeAreaEdges != null) return safeAreaEdges.filterTo(LinkedHashSet()) { it in ALL_EDGES }
-        val edges = LinkedHashSet(ALL_EDGES)
+    fun paddedEdges(safeAreaEdges: List<String>?, topFree: Boolean, largeTitle: Boolean): Set<String> {
+        if (safeAreaEdges != null) {
+            val edges = safeAreaEdges.filterTo(LinkedHashSet()) { it in ALL_EDGES }
+            // Under a large title the list keeps its first rows clear of the bar itself; a padded top would follow the
+            // header as it collapses and move the list with it.
+            if (largeTitle) edges -= TOP
+            return edges
+        }
+        val edges = LinkedHashSet(DEFAULT_EDGES)
         if (topFree) edges -= TOP
-        if (bottomFree) edges -= BOTTOM
         return edges
     }
 
     /** The padding of the safe area view: the [insets] on the [edges] it keeps, 0 on the others. */
-    fun padding(insets: ScreenInsets.Insets, edges: Set<String>): ScreenInsets.Insets = ScreenInsets.Insets(
+    fun padding(insets: Insets, edges: Set<String>): Insets = Insets(
         top = if (TOP in edges) insets.top else 0.0,
         right = if (RIGHT in edges) insets.right else 0.0,
         bottom = if (BOTTOM in edges) insets.bottom else 0.0,
         left = if (LEFT in edges) insets.left else 0.0,
     )
 
+    /**
+     * The insets JavaScript gets (`useSafeAreaInsets`): what of the [insets] still covers the content once the safe
+     * area view keeps it off its [padding], 0 on a padded edge.
+     */
+    fun uncovered(insets: Insets, padding: Insets) = Insets(
+        top = (insets.top - padding.top).coerceAtLeast(0.0),
+        right = (insets.right - padding.right).coerceAtLeast(0.0),
+        bottom = (insets.bottom - padding.bottom).coerceAtLeast(0.0),
+        left = (insets.left - padding.left).coerceAtLeast(0.0),
+    )
+
     /**
      * The inner padding of a screen's view: the side system bars ([systemBars]) at the sides; at the bottom the larger
      * of the navigation bar (none when the screen draws under it) and the keyboard ([imeBottom]; none with

package/android/src/main/java/dev/apexnative/navigation/viewcontrollers/externalcomponent/ExternalComponentViewController.kt

@@ -10,11 +10,9 @@ import dev.apexnative.navigation.layout.LayoutException
 import dev.apexnative.navigation.nativescreen.NativeScreenContext
 import dev.apexnative.navigation.options.DefaultOptions
 import dev.apexnative.navigation.options.Options
-import dev.apexnative.navigation.react.ArrangementStates
 import dev.apexnative.navigation.react.CommandScope
 import dev.apexnative.navigation.react.ErrorTexts
-import dev.apexnative.navigation.react.ScreenInsets
-import dev.apexnative.navigation.react.ScreenRegions
+import dev.apexnative.navigation.react.ScreenEnvironment
 import dev.apexnative.navigation.react.events.AppearanceDispatcher
 import dev.apexnative.navigation.react.events.ComponentType
 import dev.apexnative.navigation.react.events.ScreenAppearance
@@ -170,9 +168,7 @@ class ExternalComponentViewController internal constructor(
         peekView()?.let { (it.parent as? ViewGroup)?.removeView(it) }
         setParentController(null)
         if (isIdTakenByAnother) return
-        ScreenInsets.remove(id)
-        ScreenRegions.remove(id)
-        ArrangementStates.remove(id)
+        ScreenEnvironment.remove(id)
         ScreenReadiness.remove(id)
         if (!notMade) AppearanceDispatcher.nativeScreenReleased(this)
     }

package/android/src/main/java/dev/apexnative/navigation/viewcontrollers/modal/ModalCoordinator.kt

@@ -158,6 +158,9 @@ internal class ModalCoordinator(
 
         /** The record's views lay out again (the activity resumed). */
         fun requestLayout(record: ModalRecord) = Unit
+
+        /** The record's sheet as back sees it; none before its show and for a modal that isn't a sheet. */
+        fun sheetBack(record: ModalRecord): SheetBack? = null
     }
 
     /**
@@ -397,11 +400,26 @@ internal class ModalCoordinator(
     }
 
     /**
-     * The root of the modal that back goes to first; none without one. A back gesture previews only a pop in it: its
-     * dismissal has a preview of its own nowhere yet.
+     * The root of the modal that back goes to first; none without one. A back gesture previews a pop in it, or the
+     * modal's dismissal when it is a sheet ([backTargetSheet]).
      */
     fun backTargetRoot(): ViewController<*>? = backTarget()?.root
 
+    /**
+     * The sheet back would dismiss now, as [handleBack] would, and as a drag down of the user would: the top modal is
+     * a sheet that shows, its content can't go back (else back goes there, and a pop in it has its own preview),
+     * `modal.swipeToDismiss` isn't false, `hardwareBackButton.dismissModalOnPress` doesn't hold back, it isn't the only
+     * modal over no root, and its sheet would hide, not collapse, and isn't closing already ([SheetBack.hidesOnBack]).
+     * None otherwise. The back gesture previews its hide on Android 14+, and its release closes it as the user does.
+     */
+    fun backTargetSheet(): SheetBack? {
+        val record = backTarget()?.takeIf { it.isSheet && it.state == State.Shown } ?: return null
+        if (record.root.canHandleBack() || holdsBack(record) || isLastWithoutRoot(record)) return null
+        val options = record.root.resolveShownOptions(DefaultOptions.current)
+        if (options.modal.swipeToDismiss.isFalse) return null
+        return views.sheetBack(record)?.takeIf { it.hidesOnBack }
+    }
+
     /** The mirror of [handleBack], without acting; null without a modal to ask. */
     fun canHandleBack(): Boolean? {
         val record = backTarget() ?: return null