@craft-native/android 0.0.202 → 0.0.203

package/templates/MainActivityNative.kt.template

@@ -2020,6 +2020,9 @@ private class CraftNativeKeyboardAvoidingView(context: Context) : FrameLayout(co
 
 private class CraftNativeScrollView(context: Context) : SwipeRefreshLayout(context) {
     val content = CraftNativeFlexLayout(context)
+    // Keep one refresh target across axis changes. Replacing all children of
+    // SwipeRefreshLayout would also detach its own animated indicator.
+    private val scrollContainer = FrameLayout(context)
     private val vertical = ScrollView(context)
     private val horizontal = HorizontalScrollView(context)
     private var horizontalMode: Boolean? = null
@@ -2029,12 +2032,18 @@ private class CraftNativeScrollView(context: Context) : SwipeRefreshLayout(conte
     private var alwaysBounceHorizontal = true
     private var keyboardShouldPersistTaps = "never"
     private var refreshHandler: (() -> Unit)? = null
+    private var authoredRefreshing: Boolean? = null
+    private val defaultProgressStart = progressViewStartOffset
+    private val defaultProgressEnd = progressViewEndOffset
+    private var configuredProgressOffset: Int? = null
 
     init {
         vertical.isNestedScrollingEnabled = true
         horizontal.isNestedScrollingEnabled = true
         vertical.isFillViewport = true
         horizontal.isFillViewport = true
+        addView(scrollContainer, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT))
+        setOnChildScrollUpCallback { _, _ -> horizontalMode != true && vertical.canScrollVertically(-1) }
         setOnRefreshListener { refreshHandler?.invoke() }
         // The outer refresh host must stay touch-enabled so its real scroll
         // child can receive gestures even when no pull-to-refresh handler is
@@ -2103,8 +2112,13 @@ private class CraftNativeScrollView(context: Context) : SwipeRefreshLayout(conte
     fun setRefreshHandler(handler: (() -> Unit)?, refreshing: Boolean) {
         refreshHandler = handler
         isEnabled = true
-        isRefreshing = handler != null && refreshing
-        if (handler == null) isRefreshing = false
+        val requested = handler != null && refreshing
+        // An unchanged false prop must not cancel a native pull before its
+        // onRefresh callback has reached the script.
+        if (handler == null || authoredRefreshing != requested) {
+            authoredRefreshing = requested
+            isRefreshing = requested
+        }
     }
 
     fun setRefreshAppearance(props: JSONObject, density: Float) {
@@ -2115,21 +2129,28 @@ private class CraftNativeScrollView(context: Context) : SwipeRefreshLayout(conte
         if (background != null) setProgressBackgroundColorSchemeColor(craftNativeColor(background))
         else setProgressBackgroundColorSchemeColor(Color.TRANSPARENT)
         val offset = props.optDouble("progressViewOffset", Double.NaN)
-        if (offset.isFinite()) setProgressViewOffset(true, 0, (offset * density).roundToInt())
-        else setProgressViewOffset(false, 0, 0)
+        val requested = if (offset.isFinite()) (offset * density).roundToInt() else null
+        if (configuredProgressOffset != requested) {
+            val wasRefreshing = isRefreshing
+            val shift = requested ?: 0
+            setProgressViewOffset(false, defaultProgressStart + shift, defaultProgressEnd + shift)
+            configuredProgressOffset = requested
+            if (wasRefreshing) isRefreshing = true
+        }
     }
 
-    override fun onDetachedFromWindow() {
-        refreshHandler = null
-        isRefreshing = false
-        super.onDetachedFromWindow()
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        // Navigation may detach and reattach a retained screen. Its handler
+        // belongs to the screen; releaseViewState clears it on disposal.
+        if (authoredRefreshing == true) isRefreshing = true
     }
 
     fun setHorizontal(value: Boolean) {
         if (horizontalMode == value) return
         horizontalMode = value
         (content.parent as? ViewGroup)?.removeView(content)
-        removeAllViews()
+        scrollContainer.removeAllViews()
         val scroller: ViewGroup = if (value) horizontal else vertical
         scroller.removeAllViews()
         content.orientation = if (value) LinearLayout.HORIZONTAL else LinearLayout.VERTICAL
@@ -2137,7 +2158,7 @@ private class CraftNativeScrollView(context: Context) : SwipeRefreshLayout(conte
         scroller.addView(content, if (value)
             ViewGroup.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.MATCH_PARENT)
         else ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT))
-        addView(scroller, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT))
+        scrollContainer.addView(scroller, FrameLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT))
     }
 
     /**
@@ -3337,28 +3358,59 @@ class MainActivity : AppCompatActivity() {
         val capabilityTimeouts = mutableMapOf<String, Runnable>()
         val audio = CraftNativeAudio()
         var active = true
-
-        fun close() {
-            if (!active) return
+        var closing = false
+            private set
+        private var closed = false
+        private val closeWaiters = mutableListOf<() -> Unit>()
+        private val closeHandler = Handler(Looper.getMainLooper())
+        private val closeDeadline = Runnable { finishClose() }
+
+        fun close(done: () -> Unit = {}) {
+            if (closed) { done(); return }
+            closeWaiters.add(done)
+            if (closing) return
             active = false
+            closing = true
             audio.close()
-            val finish = {
-                port?.close()
-                isolate.close()
-            }
+            // Evaluation completion does not mean its outbound messages have
+            // reached the host. Close only after the ordered channel barrier,
+            // so onDestroy's final writes run before navigation continues.
+            closeHandler.postDelayed(closeDeadline, CRAFT_NATIVE_CAPABILITY_TIMEOUT_MS)
             val teardown = runCatching {
                 isolate.evaluateJavaScriptAsync(
-                    "globalThis.__stxNativeUnmount && globalThis.__stxNativeUnmount()"
+                    """
+                    (function() {
+                      var bridge = globalThis.__stxNativeBridge;
+                      if (!bridge || typeof bridge.postMessage !== 'function') return 'unavailable';
+                      try { globalThis.__stxNativeUnmount && globalThis.__stxNativeUnmount(); }
+                      catch (error) { console.error('Screen teardown failed: ' + error); }
+                      bridge.postMessage(JSON.stringify({ type: 'SCREEN_DISPOSED', payload: {} }));
+                      return 'sent';
+                    })()
+                    """.trimIndent()
                 )
             }.getOrNull()
             if (teardown == null) {
-                finish()
+                finishClose()
                 return
             }
             teardown.addListener({
                 runCatching { teardown.get() }
-                finish()
-            }, java.util.concurrent.Executor { command -> command.run() })
+                    .onSuccess { if (it == "unavailable") finishClose() }
+                    .onFailure { finishClose() }
+            }, ContextCompat.getMainExecutor(view.context))
+        }
+
+        fun finishClose() {
+            if (!closing) return
+            closing = false
+            closed = true
+            closeHandler.removeCallbacks(closeDeadline)
+            port?.close()
+            isolate.close()
+            val waiters = closeWaiters.toList()
+            closeWaiters.clear()
+            waiters.forEach { it() }
         }
     }
 
@@ -3745,9 +3797,15 @@ class MainActivity : AppCompatActivity() {
         // Already in this stack (perhaps under others): back to it, with the params it was opened with now.
         val existing = screens.lastOrNull { it.path == match.path }
         if (existing != null) {
-            while (screens.lastOrNull() !== existing) closeScreen(screens.removeAt(screens.lastIndex))
-            show(existing)
-            send(existing, "ROUTE_PARAMS", JSONObject().put("params", match.params))
+            val stack = screens
+            val removed = mutableListOf<Screen>()
+            while (stack.lastOrNull() !== existing) removed.add(stack.removeAt(stack.lastIndex))
+            closeScreens(removed) {
+                if (screens === stack && stack.lastOrNull() === existing) {
+                    show(existing)
+                    send(existing, "ROUTE_PARAMS", JSONObject().put("params", match.params))
+                }
+            }
             return
         }
         openScreen(match.screen, match.params)?.path = match.path
@@ -3772,14 +3830,14 @@ class MainActivity : AppCompatActivity() {
         val port = if (useMessagePorts) {
             isolate.createMessageChannel("craft", executor, MessagePortClient { message ->
                 val current = screen ?: return@MessagePortClient
-                if (current.active && message.type == Message.TYPE_STRING) receiveSafely(current, message.string)
+                if ((current.active || current.closing) && message.type == Message.TYPE_STRING) receiveSafely(current, message.string)
             })
         } else {
             isolate.setConsoleCallback(executor, JavaScriptConsoleCallback { entry ->
                 val current = screen ?: return@JavaScriptConsoleCallback
-                if (current.active && entry.message.startsWith(prefix)) {
+                if ((current.active || current.closing) && entry.message.startsWith(prefix)) {
                     current.chunks.accept(entry.message.removePrefix(prefix))?.let { receiveSafely(current, it) }
-                } else if (current.active) {
+                } else if (current.active || current.closing) {
                     Log.i(TAG, "[${current.route ?: "home"}] ${entry.message}")
                 }
             })
@@ -4228,11 +4286,13 @@ class MainActivity : AppCompatActivity() {
         }
         val payload = message.optJSONObject("payload") ?: JSONObject()
         val type = message.optString("type")
+        if (!screen.active && (!screen.closing || type !in setOf("API_REQUEST", "API_CANCEL", "SYNC_WRITE", "SCREEN_DISPOSED"))) return
         // Timers and frames come many times a second: not worth a log line each.
         if (type != "TIMER" && type != "TIMER_CLEAR" && type != "FRAME" && Log.isLoggable(TAG, Log.DEBUG)) {
             Log.d(TAG, "Native STX $type (${raw.length} chars) for ${screen.route ?: "home"}")
         }
         when (message.optString("type")) {
+            "SCREEN_DISPOSED" -> if (screen.closing) screen.finishClose()
             "RENDER" -> payload.optJSONObject("document")?.let { render(screen, it) }
             "MUTATE" -> try {
                 val result = applyMutation(screen, payload)
@@ -4290,9 +4350,13 @@ class MainActivity : AppCompatActivity() {
                 if (visibleScreen !== screen) return
                 val route = payload.optString("screen").takeIf { it.isNotBlank() } ?: return
                 if (message.optString("type") == "NAVIGATE_REPLACE") {
-                    closeScreen(screens.removeAt(screens.lastIndex))
-                }
-                openScreen(route, payload.optJSONObject("params") ?: JSONObject())
+                    val stack = screens
+                    val removed = stack.removeAt(stack.lastIndex)
+                    val previous = stack.lastOrNull()
+                    closeScreen(removed) {
+                        if (screens === stack && stack.lastOrNull() === previous) openScreen(route, payload.optJSONObject("params") ?: JSONObject())
+                    }
+                } else openScreen(route, payload.optJSONObject("params") ?: JSONObject())
             }
             "NAVIGATE_BACK" -> if (visibleScreen === screen) back()
             "NAVIGATE_POP_TO_ROOT" -> if (visibleScreen === screen) popToRoot()
@@ -4301,9 +4365,9 @@ class MainActivity : AppCompatActivity() {
                 val id = payload.optString("requestId")
                 if (id.isNotBlank()) {
                     val token = "${screen.capabilityScope}/$id"
-                    screen.pendingCapabilities.remove(token)
+                    val pending = screen.pendingCapabilities.remove(token)
                     screen.capabilityTimeouts.remove(token)?.let(capabilityHandler::removeCallbacks)
-                    capabilities.cancel(token)
+                    if (pending) capabilities.cancel(token)
                 }
             }
             "AUDIO" -> screen.audio.handle(payload)
@@ -4483,6 +4547,8 @@ class MainActivity : AppCompatActivity() {
         val children = node.optJSONArray("children") ?: JSONArray()
         val protocolId = node.optString("id").takeIf { it.isNotBlank() }
         val explicitKey = authoredKey(node, props)
+        // Descendants are scoped to this retained identity, not its sibling
+        // position. Moving a keyed parent must retain its nested inputs too.
         val identity = explicitKey?.let { "${path.substringBeforeLast('.', "")}/$it" }
             ?: protocolId?.let { "id:$it" }
             ?: path
@@ -4581,8 +4647,7 @@ class MainActivity : AppCompatActivity() {
                     }
                 }
             }
-            "TextInput" -> (reusableInput?.takeIf { it.isSingleLine == !props.optBoolean("multiline", false) }
-                ?: EditText(this)).apply {
+            "TextInput" -> (reusableInput ?: EditText(this)).apply {
                 // Setting filters, the input type or single-line mode makes
                 // TextView set its text again, which puts the caret back at
                 // the start: typing then came out backwards. Each is set only
@@ -4762,7 +4827,7 @@ class MainActivity : AppCompatActivity() {
             "Modal" -> (previous as? CraftNativeModalView ?: CraftNativeModalView(this)).apply {
                 transparent = props.optBoolean("transparent", false)
                 content.configure(style, resources.displayMetrics.density)
-                reconcileChildren(screen, content, children, path, next, style, previousControls)
+                reconcileChildren(screen, content, children, identity, next, style, previousControls)
                 // Dynamic :visible bindings arrive as a display style mutation;
                 // static visible props remain authoritative when present.
                 val visible = if (props.has("visible") && !props.isNull("visible")) {
@@ -4807,7 +4872,7 @@ class MainActivity : AppCompatActivity() {
                 configureContainer(this, style)
                 screen.pressActiveOpacities[this] = craftNativeFiniteFloat(props, "activeOpacity", 0.5f)
                 screen.pressBaseOpacities[this] = craftNativeFiniteFloat(style, "opacity", 1f)
-                reconcileChildren(screen, this, children, path, next, style, previousControls)
+                reconcileChildren(screen, this, children, identity, next, style, previousControls)
             }
             "Switch" -> (previous as? Switch ?: Switch(this)).apply {
                 setOnCheckedChangeListener(null)
@@ -4956,7 +5021,7 @@ class MainActivity : AppCompatActivity() {
                 if (onError.isNotBlank()) screen.imageErrorHandlers[image] = onError else screen.imageErrorHandlers.remove(image)
                 updateImage(screen, image, props.opt("source"), props.opt("defaultSource"))
                 configureContainer(content, style)
-                reconcileChildren(screen, content, children, path, next, style, previousControls)
+                reconcileChildren(screen, content, children, identity, next, style, previousControls)
             }
             "Video" -> (previous as? CraftNativeVideoView ?: CraftNativeVideoView(this)).apply {
                 handlers = events
@@ -5077,7 +5142,7 @@ class MainActivity : AppCompatActivity() {
                     val child = children.opt(index)
                     if (child !is JSONObject || canonicalType(child.optString("type")) != "RefreshControl") contentChildren.put(child)
                 }
-                reconcileChildren(screen, content, contentChildren, path, next, contentStyle, previousControls)
+                reconcileChildren(screen, content, contentChildren, identity, next, contentStyle, previousControls)
             }
             "FlatList" -> (previous as? CraftNativeRefreshableFlatList ?: CraftNativeRefreshableFlatList(this)).apply {
                 val nativeList = list
@@ -5091,21 +5156,21 @@ class MainActivity : AppCompatActivity() {
                         ?.hideSoftInputFromWindow(windowToken, 0)
                 }
                 nativeList.overScrollMode = if (props.optBoolean("bounces", true)) View.OVER_SCROLL_ALWAYS else View.OVER_SCROLL_NEVER
-                reconcileFlatList(screen, nativeList, children, path, protocolId ?: path, props, events)
+                reconcileFlatList(screen, nativeList, children, identity, protocolId ?: identity, props, events)
             }
             "View", "SafeAreaView" -> (previous as? CraftNativeFlexLayout ?: CraftNativeFlexLayout(this)).apply {
                 configureContainer(this, style)
                 if (type == "SafeAreaView") setSafeAreaEdges(props.optJSONArray("edges"))
-                reconcileChildren(screen, this, children, path, next, style, previousControls)
+                reconcileChildren(screen, this, children, identity, next, style, previousControls)
             }
             "KeyboardAvoidingView" -> (previous as? CraftNativeKeyboardAvoidingView ?: CraftNativeKeyboardAvoidingView(this)).apply {
                 configure(props, style, resources.displayMetrics.density)
                 setKeyboardInset(keyboardInset)
-                reconcileChildren(screen, content, children, path, next, style, previousControls)
+                reconcileChildren(screen, content, children, identity, next, style, previousControls)
             }
             else -> (previous as? CraftNativeFlexLayout ?: CraftNativeFlexLayout(this)).apply {
                 configureContainer(this, style)
-                reconcileChildren(screen, this, children, path, next, style, previousControls)
+                reconcileChildren(screen, this, children, identity, next, style, previousControls)
             }
         }
         if (control is CraftNativeFlexLayout) {
@@ -5286,6 +5351,8 @@ class MainActivity : AppCompatActivity() {
         "sectionlist" -> "SectionList"
         "flatlist" -> "FlatList"
         "svg" -> "Svg"
+        "g" -> "G"
+        "svgtext", "svg-text" -> "SvgText"
         "touchableopacity" -> "TouchableOpacity"
         "touchablehighlight" -> "TouchableHighlight"
         "pressable" -> "Pressable"
@@ -5974,15 +6041,17 @@ class MainActivity : AppCompatActivity() {
     private fun inputTypeFor(props: JSONObject): Int {
         val base = if (props.optBoolean("multiline", false)) InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_MULTI_LINE
         else InputType.TYPE_CLASS_TEXT
+        // Text variations do not carry their input class or multiline flag.
+        // Preserve both when selecting an email, URL, or search keyboard.
         val keyboard = when (props.optString("keyboardType")) {
-            "email-address" -> InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS
-            "url" -> InputType.TYPE_TEXT_VARIATION_URI
+            "email-address" -> base or InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS
+            "url" -> base or InputType.TYPE_TEXT_VARIATION_URI
             "numeric", "number-pad" -> InputType.TYPE_CLASS_NUMBER
             "decimal-pad" -> InputType.TYPE_CLASS_NUMBER or InputType.TYPE_NUMBER_FLAG_DECIMAL
             "phone-pad" -> InputType.TYPE_CLASS_PHONE
-            "web-search" -> InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT
-            "visible-password" -> InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD
-            else -> 0
+            "web-search" -> base or InputType.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT
+            "visible-password" -> base or InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD
+            else -> base
         }
         val capitalization = when (props.optString("autoCapitalize")) {
             "characters" -> InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS
@@ -5992,7 +6061,7 @@ class MainActivity : AppCompatActivity() {
         }
         val correction = if (props.optBoolean("autoCorrect", true)) InputType.TYPE_TEXT_FLAG_AUTO_CORRECT else 0
         val secure = if (props.optBoolean("secureTextEntry", false)) InputType.TYPE_TEXT_VARIATION_PASSWORD else 0
-        return (if (keyboard == 0) base else keyboard) or capitalization or correction or secure
+        return keyboard or capitalization or correction or secure
     }
 
     /// The autofill hint for `textContentType` (iOS's names) or `autoComplete`
@@ -6081,7 +6150,7 @@ class MainActivity : AppCompatActivity() {
             }
         }
         perform { result ->
-            if (!screen.active || !screen.pendingCapabilities.remove(token)) return@perform
+            if ((!screen.active && !screen.closing) || !screen.pendingCapabilities.remove(token)) return@perform
             screen.capabilityTimeouts.remove(token)?.let(capabilityHandler::removeCallbacks)
             val response = JSONObject()
                 .put("version", CRAFT_NATIVE_CAPABILITY_PROTOCOL_VERSION)
@@ -6316,15 +6385,26 @@ class MainActivity : AppCompatActivity() {
 
     /** Back to the first screen in one move. */
     private fun popToRoot() {
-        while (screens.size > 1) closeScreen(screens.removeAt(screens.lastIndex))
-        screens.lastOrNull()?.let(::show)
+        val stack = screens
+        val removed = mutableListOf<Screen>()
+        while (stack.size > 1) removed.add(stack.removeAt(stack.lastIndex))
+        val target = stack.lastOrNull()
+        closeScreens(removed) {
+            if (target != null && screens === stack && stack.lastOrNull() === target) show(target)
+        }
     }
 
     /** Back: the screen below in this tab, then the first tab, then out of the app. */
     private fun back() {
+        // A previous back is still draining its screen's teardown messages.
+        if (visibleScreen == null) return
         if (screens.size > 1) {
-            closeScreen(screens.removeAt(screens.lastIndex))
-            show(screens.last())
+            val stack = screens
+            val removed = stack.removeAt(stack.lastIndex)
+            val target = stack.last()
+            closeScreen(removed) {
+                if (screens === stack && stack.lastOrNull() === target) show(target)
+            }
         } else if (chrome != null && currentTab != 0) {
             selectTab(0)
         } else {
@@ -6542,7 +6622,17 @@ class MainActivity : AppCompatActivity() {
         screen.modalCloseHandlers.keys.removeAll(released)
     }
 
-    private fun closeScreen(screen: Screen) {
+    private fun closeScreens(screens: List<Screen>, done: () -> Unit) {
+        val iterator = screens.iterator()
+        fun next() {
+            if (iterator.hasNext()) closeScreen(iterator.next()) { next() }
+            else done()
+        }
+        next()
+    }
+
+    private fun closeScreen(screen: Screen, done: () -> Unit = {}) {
+        if (!screen.active) { screen.close(done); return }
         CraftNativeHub.unregister(screen.capabilityScope)
         screen.timers.values.forEach(capabilityHandler::removeCallbacks)
         screen.timers.clear()
@@ -6578,7 +6668,13 @@ class MainActivity : AppCompatActivity() {
         screen.flatListRows.clear()
         screen.flatListOwners.clear()
         screen.flatListOwnerByView.clear()
-        screen.close()
+        screen.close {
+            screen.capabilityTimeouts.values.forEach(capabilityHandler::removeCallbacks)
+            screen.capabilityTimeouts.clear()
+            screen.pendingCapabilities.forEach(capabilities::cancel)
+            screen.pendingCapabilities.clear()
+            done()
+        }
     }
 
     @Deprecated("Uses the activity back callback for native route navigation")

package/templates/build.gradle.kts.app.template

@@ -80,6 +80,8 @@ dependencies {
     implementation("androidx.recyclerview:recyclerview:1.3.2")
 {{REFRESH_LAYOUT_DEPENDENCY}}
     implementation("androidx.webkit:webkit:1.12.1")
+    // App Link exclusions hand off to a browser in both renderers.
+    implementation("androidx.browser:browser:1.8.0")
 {{JAVASCRIPT_ENGINE_DEPENDENCY}}
     implementation("com.google.android.material:material:1.11.0")
     implementation("androidx.coordinatorlayout:coordinatorlayout:1.2.0")