@apexnative/navigation 1.0.0-alpha.1 → 1.0.0-alpha.2

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

@@ -2,7 +2,6 @@ package dev.apexnative.navigation.views.element
 
 import android.os.SystemClock
 import android.view.ViewGroup
-import com.facebook.react.uimanager.util.ReactFindViewUtil
 import dev.apexnative.navigation.options.LayoutAnimation
 import dev.apexnative.navigation.utils.DRAW_WAIT_LIMIT
 import dev.apexnative.navigation.viewcontrollers.component.ContentReadiness
@@ -38,13 +37,17 @@ private fun areReady(animation: LayoutAnimation, from: ViewController<*>, to: Vi
     val screen = to.shownScreen()
     val content = screen.view as? ViewGroup
     if (content != null && !ContentReadiness.isReady(screen)) return false
-    val sharedFound = animation.sharedElements.get().all { isIn(to, it.toId.get("")) }
-    return sharedFound && animation.elementTransitions.transitions.all { isIn(to, it.id) || isIn(from, it.id) }
+    // Each screen walked once for all the ids ([TransitionViews.findViews]); an element is looked for in the screen
+    // that goes only when the one that comes doesn't have it.
+    val targets = animation.sharedElements.get().map { it.toId.get("") }.filter { it.isNotEmpty() }
+    val elements = animation.elementTransitions.transitions.map { it.id }.filter { it.isNotEmpty() }
+    if (targets.isEmpty() && elements.isEmpty()) return true
+    val inTo = TransitionViews.findViews(to.view, (targets + elements).toSet())
+    if (!targets.all { it in inTo }) return false
+    val missing = elements.filterNot { it in inTo }.toSet()
+    return missing.isEmpty() || TransitionViews.findViews(from.view, missing).size == missing.size
 }
 
-private fun isIn(screen: ViewController<*>, nativeId: String) =
-    nativeId.isEmpty() || ReactFindViewUtil.findView(screen.view, nativeId) != null
-
 // The screen a layout shows: a modal of a stack shows the screen on its top.
 private fun ViewController<*>.shownScreen(): ViewController<*> {
     var controller: ViewController<*> = this

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

@@ -0,0 +1,100 @@
+package dev.apexnative.navigation.views.element
+
+import android.view.View
+import android.view.ViewGroup
+import com.facebook.react.R as ReactR
+import dev.apexnative.navigation.options.ElementTransitionOptions
+import dev.apexnative.navigation.options.SharedElementTransitionOptions
+
+/**
+ * The views of a transition's elements in its two screens: each screen is walked once, at its first lookup, for the ids
+ * looked for there — the screen that goes ([fromRoot]) for the pairs' `fromId`s and the elements' ids, the one that
+ * comes ([toRoot]) for the pairs' `toId`s and the elements' ids the other doesn't have. A lookup finds what
+ * `ReactFindViewUtil.findView` finds in that screen as it was at its walk (depth first, the first match). Main thread
+ * only.
+ */
+internal class TransitionViews(
+    pairs: List<SharedElementTransitionOptions>,
+    elements: List<ElementTransitionOptions>,
+    private val fromRoot: View?,
+    private val toRoot: View?,
+) {
+    // The ids each screen is walked for: the screen that goes for the sources and the elements, the one that comes for
+    // the targets (and the elements the other screen doesn't have, added at its walk).
+    private val leavingIds = HashSet<String>()
+    private val arrivingIds = HashSet<String>()
+    private val elementIds = ArrayList<String>()
+    private var leavingViews: Map<String, View>? = null
+    private var arrivingViews: Map<String, View>? = null
+
+    init {
+        for (pair in pairs) {
+            pair.fromId.get(null)?.takeIf { it.isNotEmpty() }?.let(leavingIds::add)
+            pair.toId.get(null)?.takeIf { it.isNotEmpty() }?.let(arrivingIds::add)
+        }
+        for (element in elements) {
+            if (element.id.isEmpty()) continue
+            leavingIds += element.id
+            elementIds += element.id
+        }
+    }
+
+    /** The view with [nativeId] in the screen that goes; none when none has it or it isn't one of the transition's. */
+    fun leaving(nativeId: String): View? {
+        val views = leavingViews ?: findViews(fromRoot, leavingIds).also { leavingViews = it }
+        return views[nativeId]
+    }
+
+    /** The view with [nativeId] in the screen that comes; none when none has it or it isn't one of the transition's. */
+    fun arriving(nativeId: String): View? {
+        val views = arrivingViews ?: run {
+            // An element is looked for here only when the screen that goes doesn't have it: the walk stops sooner.
+            for (id in elementIds) if (leaving(id) == null) arrivingIds += id
+            findViews(toRoot, arrivingIds).also { arrivingViews = it }
+        }
+        return views[nativeId]
+    }
+
+    companion object {
+        /** The views with the `nativeID`s of [nativeIds] under [root], in one walk ([firstByKey]). */
+        fun findViews(root: View?, nativeIds: Set<String>): Map<String, View> {
+            if (root == null || nativeIds.isEmpty()) return emptyMap()
+            return firstByKey(
+                root,
+                nativeIds,
+                keyOf = { it.getTag(ReactR.id.view_tag_native_id) as? String },
+                childCount = { (it as? ViewGroup)?.childCount ?: 0 },
+                childAt = { view, index -> (view as ViewGroup).getChildAt(index) },
+            )
+        }
+    }
+}
+
+/**
+ * For each key of [keys], the first node with it in a depth-first walk from [root] (the node, then its children in
+ * order): what a search for that one key finds, for all of them in one walk, which stops once every key is found. A key
+ * no node has is left out. Inline: the walk calls no function objects.
+ */
+internal inline fun <N : Any> firstByKey(
+    root: N,
+    keys: Set<String>,
+    keyOf: (N) -> String?,
+    childCount: (N) -> Int,
+    childAt: (N, Int) -> N,
+): Map<String, N> {
+    val found = HashMap<String, N>()
+    if (keys.isEmpty()) return found
+    // A stack of the nodes still to visit, the next one on top: the order of the recursive search without its depth.
+    val stack = ArrayList<N>()
+    stack.add(root)
+    while (stack.isNotEmpty()) {
+        val node = stack.removeAt(stack.size - 1)
+        val key = keyOf(node)
+        if (key != null && key in keys && key !in found) {
+            found[key] = node
+            if (found.size == keys.size) break
+        }
+        for (index in childCount(node) - 1 downTo 0) stack.add(childAt(node, index))
+    }
+    return found
+}

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

@@ -1,5 +1,7 @@
 package dev.apexnative.navigation.views.element.animators
 
+import android.animation.Animator
+import android.animation.AnimatorListenerAdapter
 import android.animation.TimeInterpolator
 import android.animation.ValueAnimator
 import android.graphics.Picture
@@ -7,6 +9,7 @@ import android.util.Log
 import android.view.View
 import android.view.animation.LinearInterpolator
 import dev.apexnative.navigation.utils.NavigationLog
+import dev.apexnative.navigation.views.element.elementStep
 
 /**
  * The view's own drawing with its children, as drawing commands: sharp at any scale. Its opacity and place belong to
@@ -28,14 +31,55 @@ internal fun recordPicture(view: View): Picture? = try {
 }
 
 // Runs in linear time and keeps the curve it is given for the move: an element moves along the transition's curve,
-// while what has to follow the clock (the pictures of a text changing over) can.
+// while what has to follow the clock (the pictures of a text changing over) can. Its start and its frames each run in
+// [elementStep]: one that fails stops the element — it is cancelled, so its ends put back what it changed and the
+// transition plays on without it.
 internal class MoveAnimator : ValueAnimator() {
     var curve: TimeInterpolator = LinearInterpolator()
         private set
 
+    /** The element's name in the log ([pairName]). */
+    var element = "''"
+
+    private val starts = ArrayList<() -> Unit>()
+    private val frames = ArrayList<(Float) -> Unit>()
+    private val ends = ArrayList<() -> Unit>()
+    private var failed = false
+
     init {
         setFloatValues(0f, 1f)
         super.setInterpolator(LinearInterpolator())
+        addListener(object : AnimatorListenerAdapter() {
+            override fun onAnimationStart(animation: Animator) = guarded { for (start in starts) start() }
+
+            override fun onAnimationEnd(animation: Animator) {
+                for (end in ends) elementStep(element) { end() }
+            }
+        })
+        addUpdateListener { animation ->
+            if (!failed) guarded { for (frame in frames) frame(animation.animatedFraction) }
+        }
+    }
+
+    /** At the start of the flight, after its delay. */
+    fun onStart(action: () -> Unit) {
+        starts += action
+    }
+
+    /** Each frame, with the fraction of the time, linear. */
+    fun onFrame(action: (fraction: Float) -> Unit) {
+        frames += action
+    }
+
+    /** At its end, also when it is cancelled or its start or a frame failed. */
+    fun onEnd(action: () -> Unit) {
+        ends += action
+    }
+
+    private fun guarded(work: () -> Unit) {
+        if (failed || elementStep(element, work = work)) return
+        failed = true
+        cancel()
     }
 
     override fun setInterpolator(value: TimeInterpolator?) {

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

@@ -5,8 +5,6 @@ import android.graphics.Matrix
 import android.view.View
 import android.view.ViewOutlineProvider
 import android.widget.ImageView
-import androidx.core.animation.doOnEnd
-import androidx.core.animation.doOnStart
 import com.facebook.react.views.view.ReactViewGroup
 import dev.apexnative.navigation.utils.borderRadius
 import dev.apexnative.navigation.views.animations.ValueInterpolation
@@ -78,7 +76,7 @@ internal class ImageMatrixAnimator(
                     to.imageMatrix = matrix
                 }
             }
-            doOnStart {
+            onStart {
                 savedProvider = to.outlineProvider
                 savedClip = to.clipToOutline
                 to.outlineProvider = outline
@@ -86,8 +84,8 @@ internal class ImageMatrixAnimator(
                 if (fits) to.scaleType = ImageView.ScaleType.MATRIX
                 frame(0f)
             }
-            addUpdateListener { frame(it.animatedFraction) }
-            doOnEnd {
+            onFrame { frame(it) }
+            onEnd {
                 if (fits) {
                     to.scaleType = toFit
                     to.imageMatrix = savedMatrix

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

@@ -3,8 +3,6 @@ package dev.apexnative.navigation.views.element.animators
 import android.animation.Animator
 import android.view.View
 import android.view.ViewOutlineProvider
-import androidx.core.animation.doOnEnd
-import androidx.core.animation.doOnStart
 import com.facebook.react.uimanager.BackgroundStyleApplicator
 import com.facebook.react.uimanager.style.BorderRadiusProp
 import dev.apexnative.navigation.utils.borderRadius
@@ -57,7 +55,7 @@ internal class PlainViewAnimator(
                 }
                 to.rotation = ValueInterpolation.number(fromRotation, toRotation, f, time)
             }
-            doOnStart {
+            onStart {
                 savedProvider = to.outlineProvider
                 savedClip = to.clipToOutline
                 if (ownRadius != null) BackgroundStyleApplicator.setBorderRadius(to, RADIUS, null)
@@ -66,9 +64,9 @@ internal class PlainViewAnimator(
                 layer.place(to, toRect.left.toInt(), toRect.top.toInt(), width, height)
                 frame(0f)
             }
-            addUpdateListener { frame(it.animatedFraction) }
+            onFrame { frame(it) }
             // A cancelled flight ends too: the view goes back whole.
-            doOnEnd {
+            onEnd {
                 to.translationX = 0f
                 to.translationY = 0f
                 to.rotation = toRotation

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

@@ -1,8 +1,6 @@
 package dev.apexnative.navigation.views.element.animators
 
 import android.animation.Animator
-import androidx.core.animation.doOnEnd
-import androidx.core.animation.doOnStart
 import com.facebook.drawee.drawable.ScalingUtils
 import com.facebook.react.views.image.ReactImageView
 import dev.apexnative.navigation.views.animations.ValueInterpolation
@@ -45,14 +43,14 @@ internal class ReactImageAnimator(
                 to.rotation = ValueInterpolation.number(fromRotation, toRotation, f, time)
                 to.invalidate()
             }
-            doOnStart {
+            onStart {
                 savedFade = to.hierarchy.fadeDuration
                 to.hierarchy.fadeDuration = 0
                 to.hierarchy.setActualImageScaleType(scale)
                 frame(0f)
             }
-            addUpdateListener { frame(it.animatedFraction) }
-            doOnEnd {
+            onFrame { frame(it) }
+            onEnd {
                 to.hierarchy.setActualImageScaleType(toType)
                 to.hierarchy.fadeDuration = savedFade
                 to.translationX = 0f

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

@@ -10,6 +10,7 @@ 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.pairName
 
 /**
  * The animator of a shared element by the kinds of its two views, chosen by explicit classes, never by reflection:
@@ -55,6 +56,7 @@ internal object SharedAnimatorFactory {
             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 duration = AnimationRules.durationOf(options.duration.get(null), fallbackDuration)
         animator.duration = duration
         animator.startDelay = AnimationRules.delayOf(options.startDelay.get(null))

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

@@ -11,8 +11,6 @@ import android.text.Layout
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
-import androidx.core.animation.doOnEnd
-import androidx.core.animation.doOnStart
 import com.facebook.react.views.text.ReactTextView
 import dev.apexnative.navigation.options.SharedElementTransitionOptions
 import dev.apexnative.navigation.utils.TextViewUtils
@@ -42,16 +40,16 @@ class TextChangeAnimator(from: View, to: View) : PropertyAnimatorCreator<ReactTe
         val drawable = TextMorphDrawable(start, end)
         // Everything changes between the start and the end of the animation: a cancelled one ends too.
         return MoveAnimator().apply {
-            doOnStart {
+            onStart {
                 drawable.setBounds(0, 0, layer.width, layer.height)
                 layer.overlay.add(drawable)
                 to.alpha = 0f
             }
-            addUpdateListener {
-                drawable.update(it.animatedFraction, curve.getInterpolation(it.animatedFraction))
+            onFrame {
+                drawable.update(it, curve.getInterpolation(it))
                 layer.invalidate()
             }
-            doOnEnd {
+            onEnd {
                 layer.overlay.remove(drawable)
                 layer.invalidate()
                 to.alpha = end.alpha

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

@@ -12,8 +12,6 @@ import android.graphics.RectF
 import android.graphics.drawable.Drawable
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.animation.doOnEnd
-import androidx.core.animation.doOnStart
 import com.facebook.react.views.view.ReactViewGroup
 import dev.apexnative.navigation.options.SharedElementTransitionOptions
 import dev.apexnative.navigation.utils.ViewUtils
@@ -38,16 +36,16 @@ class ViewChangeAnimator(from: View, to: View) : PropertyAnimatorCreator<ReactVi
         val drawable = ViewMorphDrawable(start, end)
         // Everything changes between the start and the end of the animation: a cancelled one ends too.
         return MoveAnimator().apply {
-            doOnStart {
+            onStart {
                 drawable.setBounds(0, 0, layer.width, layer.height)
                 layer.overlay.add(drawable)
                 to.alpha = 0f
             }
-            addUpdateListener {
-                drawable.progress = curve.getInterpolation(it.animatedFraction)
+            onFrame {
+                drawable.progress = curve.getInterpolation(it)
                 layer.invalidate()
             }
-            doOnEnd {
+            onEnd {
                 layer.overlay.remove(drawable)
                 layer.invalidate()
                 to.alpha = end.alpha

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

@@ -37,6 +37,7 @@ import dev.apexnative.navigation.utils.MaterialTheme
 import dev.apexnative.navigation.utils.TestIds
 import dev.apexnative.navigation.utils.UiUtils
 import java.util.WeakHashMap
+import kotlin.math.roundToInt
 
 /**
  * The buttons of one side of the bar in its toolbar: each button a menu item — a text, an icon (on its background), or
@@ -171,7 +172,7 @@ internal class ButtonBar(
                 options.fontSize.get(0.0).toFloat(),
                 context.resources.displayMetrics,
             )
-            spannable.setSpan(AbsoluteSizeSpan(size.toInt()), 0, text.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+            spannable.setSpan(AbsoluteSizeSpan(size.roundToInt()), 0, text.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
         }
         if (options.font.hasValue()) {
             val typeface = options.font.getTypeface(typefaces, Typeface.DEFAULT)
@@ -207,8 +208,8 @@ internal class ButtonBar(
             icon,
             color,
             UiUtils.dpToPx(context, background.cornerRadius.get(0.0).toFloat()),
-            UiUtils.dpToPx(context, background.width.get(0.0).toFloat()).toInt(),
-            UiUtils.dpToPx(context, background.height.get(0.0).toFloat()).toInt(),
+            UiUtils.dpToPx(context, background.width.get(0.0).toFloat()).roundToInt(),
+            UiUtils.dpToPx(context, background.height.get(0.0).toFloat()).roundToInt(),
         )
     }
 

package/cli/app.js

@@ -9,7 +9,7 @@ const { exec } = require('./exec');
 const MINIMUM = [0, 85];
 
 /** The newest React Native the navigation was checked with: `init` makes apps of its newest patch. */
-const TESTED = [0, 87];
+const TESTED = [0, 88];
 
 /** The name the navigation is installed under. */
 const PACKAGE = '@apexnative/navigation';

package/cli/project.js

@@ -8,8 +8,9 @@ const { exec } = require('./exec');
 /**
  * The files of the app the CLI sets up, checks and adds to, where the app has them; `undefined` for one it couldn't
  * find. `styles` is the file of the app's Android theme, `styles.xml` or `themes.xml`; `manifest` its
- * `AndroidManifest.xml`. `xcodeProject` is the app's `project.pbxproj`; `androidPackage` the package of its Kotlin code (the `namespace`
- * of `android/app/build.gradle`), and `androidSources` the folder it is in.
+ * `AndroidManifest.xml`. `sceneDelegate` is the `SceneDelegate.swift` next to `AppDelegate.swift`, which apps made
+ * from React Native 0.88's template have. `xcodeProject` is the app's `project.pbxproj`; `androidPackage` the package
+ * of its Kotlin code (the `namespace` of `android/app/build.gradle`), and `androidSources` the folder it is in.
  * @typedef {{
  *   root: string;
  *   mainApplication?: string;
@@ -17,6 +18,7 @@ const { exec } = require('./exec');
  *   styles?: string;
  *   manifest?: string;
  *   appDelegate?: string;
+ *   sceneDelegate?: string;
  *   infoPlist?: string;
  *   entry?: string;
  *   app?: string;
@@ -64,6 +66,8 @@ function findProject(root, run = exec) {
       existing(path.join(androidMain, 'res', 'values', 'themes.xml')),
     manifest: existing(path.join(androidMain, 'AndroidManifest.xml')),
     appDelegate,
+    sceneDelegate:
+      appDelegate && existing(path.join(path.dirname(appDelegate), 'SceneDelegate.swift')),
     infoPlist: appDelegate && existing(path.join(path.dirname(appDelegate), 'Info.plist')),
     entry: ['index.js', 'index.ts', 'index.tsx']
       .map((name) => path.join(root, name))

package/cli/setup/index.js

@@ -16,6 +16,7 @@ const { planEntry, navigationFile, HOW_TO: ENTRY_HOW_TO } = require('./steps/ent
 const { planEnv, targetOf } = require('./steps/env');
 const { planInfoPlist } = require('./steps/infoPlist');
 const { planMainActivity } = require('./steps/mainActivity');
+const { planSceneDelegate } = require('./steps/sceneDelegate');
 const { planMainApplication } = require('./steps/mainApplication');
 const { planManifest } = require('./steps/manifest');
 const { planStyles } = require('./steps/styles');
@@ -83,6 +84,18 @@ function planProject(project) {
       planAppDelegate,
       notFound('AppDelegate.swift')
     ),
+    // React Native 0.88's template starts React Native in its scene delegate; the earlier templates have none.
+    ...(project.sceneDelegate
+      ? [
+          planFile(
+            'SceneDelegate.swift',
+            'ios',
+            project.sceneDelegate,
+            planSceneDelegate,
+            notFound('SceneDelegate.swift')
+          ),
+        ]
+      : []),
     planFile('Info.plist', 'ios', project.infoPlist, planInfoPlist, notFound('Info.plist')),
     planFile('index.js', 'js', project.entry, planEntry, ENTRY_HOW_TO),
   ];

package/cli/setup/steps/appDelegate.js

@@ -19,7 +19,10 @@ its delegate (the bundle URL) before calling super.
       self.reactNativeDelegate = ReactNativeDelegate()
       return super.application(application, didFinishLaunchingWithOptions: launchOptions)
     }
-  }`;
+  }
+
+ReactNativeDelegate is the app's RCTDefaultReactNativeFactoryDelegate, which gives the bundle URL (bundleURL()); in
+React Native 0.88's template that method is in SceneDelegate.`;
 
 // Lines of the template's launch: ANNAppDelegate does all of it.
 const TEMPLATE_LINES = [
@@ -42,6 +45,20 @@ const LAUNCH_OVERRIDE =
 const DELEGATE = /^([ \t]*)let\s+delegate\s*=\s*ReactNativeDelegate\(\)[ \t]*$/m;
 const RETURN_TRUE = /^([ \t]*)return\s+true[ \t]*$/m;
 
+// React Native 0.88's template starts React Native in its scene delegate: the app delegate only returns true. The
+// bundle URL moves into a delegate of React Native's factory, as the earlier templates had it.
+const REACT_NATIVE_DELEGATE = `class ReactNativeDelegate: RCTDefaultReactNativeFactoryDelegate {
+  override func bundleURL() -> URL? {
+    #if DEBUG
+    RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: "index")
+    #else
+    Bundle.main.url(forResource: "main", withExtension: "jsbundle")
+    #endif
+  }
+}
+`;
+const RETURN_TRUE_OR_TRUE = /^([ \t]*)(?:return\s+)?true[ \t]*$/m;
+
 /**
  * AppDelegate.swift: the app delegate becomes an ANNAppDelegate.
  * @param {string} text
@@ -55,13 +72,30 @@ function planAppDelegate(text) {
     note: 'changed by hand, see below',
     howTo: HOW_TO,
   });
-  if (!HEADER.test(text) || !LAUNCH.test(text) || !DELEGATE.test(text)) return manual;
+  if (!HEADER.test(text) || !LAUNCH.test(text)) return manual;
+  let next = DELEGATE.test(text) ? fromFactoryLaunch(text) : fromSceneLaunch(text);
+  if (next === undefined) return manual;
 
+  // The dependency provider is ANNAppDelegate's now.
+  if (!/\bRCTAppDependencyProvider\b/.test(next)) {
+    next = next.replace(/^import\s+ReactAppDependencyProvider[ \t]*\n/m, '');
+  }
+  next = addImport(next, 'import ApexNavigation', { sorted: false });
+  return { status: 'change', next, note: 'ANNAppDelegate' };
+}
+
+/**
+ * The app delegate of the templates before React Native 0.88, which makes React Native's factory and window in its
+ * launch; undefined when the launch has code of the app's own that uses them.
+ * @param {string} text
+ * @returns {string | undefined}
+ */
+function fromFactoryLaunch(text) {
   let next = text
     .replace(HEADER, 'class $1: ANNAppDelegate {')
     .replace(LAUNCH, '$1override func$2');
   for (const line of TEMPLATE_LINES) {
-    if (!line.test(next)) return manual;
+    if (!line.test(next)) return undefined;
     next = next.replace(line, '');
   }
   next = next.replace(DELEGATE, '$1self.reactNativeDelegate = ReactNativeDelegate()');
@@ -69,10 +103,10 @@ function planAppDelegate(text) {
   // The launch now ends in super's, which starts React Native.
   const launchAt = next.search(LAUNCH_OVERRIDE);
   const returnAt = next.slice(launchAt).search(RETURN_TRUE);
-  if (returnAt < 0) return manual;
+  if (returnAt < 0) return undefined;
   const body = next.slice(launchAt, launchAt + returnAt).replace(/self\.reactNativeDelegate/g, '');
   // Code of the app's own that used the template's factory, delegate or window: it has to move by hand.
-  if (/\b(factory|delegate|window)\b/.test(body)) return manual;
+  if (/\b(factory|delegate|window)\b/.test(body)) return undefined;
   const rest = next
     .slice(launchAt + returnAt)
     .replace(
@@ -82,17 +116,38 @@ function planAppDelegate(text) {
   next = next.slice(0, launchAt + returnAt) + rest;
 
   // The blank lines the template's launch leaves behind.
-  next = next
+  return next
     .replace(/(class\s+\w+:\s*ANNAppDelegate\s*\{\n)(?:[ \t]*\n)+/, '$1')
     .replace(/(self\.reactNativeDelegate = ReactNativeDelegate\(\)\n)(?:[ \t]*\n)+/, '$1')
     .replace(/\n(?:[ \t]*\n)+([ \t]*return super\.application\()/, '\n$1');
+}
 
-  // The dependency provider is ANNAppDelegate's now.
-  if (!/\bRCTAppDependencyProvider\b/.test(next)) {
-    next = next.replace(/^import\s+ReactAppDependencyProvider[ \t]*\n/m, '');
+/**
+ * The app delegate of React Native 0.88's template, whose launch only returns true; undefined when the app delegate
+ * makes React Native or a window of its own.
+ * @param {string} text
+ * @returns {string | undefined}
+ */
+function fromSceneLaunch(text) {
+  if (/\b(RCTReactNativeFactory|ReactNativeDelegate|window)\b/.test(text)) return undefined;
+  let next = text
+    .replace(HEADER, 'class $1: ANNAppDelegate {')
+    .replace(LAUNCH, '$1override func$2');
+  const launchAt = next.search(LAUNCH_OVERRIDE);
+  const returnAt = next.slice(launchAt).search(RETURN_TRUE_OR_TRUE);
+  if (returnAt < 0) return undefined;
+  const rest = next
+    .slice(launchAt + returnAt)
+    .replace(
+      RETURN_TRUE_OR_TRUE,
+      '$1self.reactNativeDelegate = ReactNativeDelegate()\n' +
+        '$1return super.application(application, didFinishLaunchingWithOptions: launchOptions)'
+    );
+  next = `${next.slice(0, launchAt + returnAt)}${rest.trimEnd()}\n\n${REACT_NATIVE_DELEGATE}`;
+  for (const module of ['React', 'React_RCTAppDelegate']) {
+    next = addImport(next, `import ${module}`, { sorted: false });
   }
-  next = addImport(next, 'import ApexNavigation', { sorted: false });
-  return { status: 'change', next, note: 'ANNAppDelegate' };
+  return next;
 }
 
 module.exports = { planAppDelegate };