craft-native 0.0.435 → 0.0.442

package/dist/android/templates/MainActivityNative.kt.template

@@ -4563,6 +4563,11 @@ class MainActivity : AppCompatActivity() {
         val pressUnderlayShowHandlers = mutableMapOf<View, String>()
         val pressUnderlayHideHandlers = mutableMapOf<View, String>()
         val longPressHandlers = mutableMapOf<View, String>()
+        val accessibilityActionHandlers = mutableMapOf<View, String>()
+        // TalkBack actions are added by id, so removing them on a reconcile
+        // needs the ids back; without this a renamed action stacks up beside
+        // the old one every render.
+        val accessibilityActionIds = mutableMapOf<View, List<Int>>()
         val scrollHandlers = mutableMapOf<View, String>()
         val scrollBeginHandlers = mutableMapOf<View, String>()
         val scrollEndHandlers = mutableMapOf<View, String>()
@@ -4596,6 +4601,9 @@ class MainActivity : AppCompatActivity() {
         val capabilityTimeouts = mutableMapOf<String, Runnable>()
         val audio = CraftNativeAudio()
         val sounds = CraftNativeSounds(view.context)
+        var motion: CraftNativeMotion? = null
+        var barometer: CraftNativeBarometer? = null
+        var pedometer: CraftNativePedometer? = null
         val soundRequestCancellers = mutableMapOf<String, () -> Unit>()
         /** Snapshot writes awaiting the writer thread; close rejects them once. */
         val pendingSyncResults = mutableSetOf<String>()
@@ -4617,6 +4625,9 @@ class MainActivity : AppCompatActivity() {
             soundRequestCancellers.values.toList().forEach { it() }
             soundRequestCancellers.clear()
             sounds.close()
+            motion?.close()
+            barometer?.close()
+            pedometer?.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.
@@ -4688,6 +4699,10 @@ class MainActivity : AppCompatActivity() {
     private var hapticsEnabled = false
     private var clipboardEnabled = false
     private var shakeEnabled = false
+    private var motionSensorsEnabled = false
+    private var barometerEnabled = false
+    private var pedometerEnabled = false
+    private var motionForeground = false
     internal var nativeAppState = "inactive"
         private set
     private var deliveredInitialDeepLink = false
@@ -4761,6 +4776,9 @@ class MainActivity : AppCompatActivity() {
         hapticsEnabled = config.optBoolean("enableHaptics", false)
         clipboardEnabled = config.optBoolean("enableClipboard", false)
         shakeEnabled = config.optBoolean("enableShakeGesture", false)
+        motionSensorsEnabled = config.optBoolean("enableMotionSensors", false)
+        barometerEnabled = config.optBoolean("enableBarometer", false)
+        pedometerEnabled = config.optBoolean("enablePedometer", false)
         // Normally started already by its content provider; this covers a
         // process that skipped providers (instrumentation).
         CraftCrashReporter.start(this)
@@ -5153,6 +5171,30 @@ class MainActivity : AppCompatActivity() {
         activeScreen.view.onLayoutChanged = {
             if (activeScreen.active) emitLayoutEvents(activeScreen)
         }
+        if (motionSensorsEnabled && !headless) {
+            activeScreen.motion = CraftNativeMotion(CraftAndroidMotionSource(this)).apply {
+                emit = { detail ->
+                    if (activeScreen.active && motionForeground) send(activeScreen, "CRAFT_EVENT",
+                        JSONObject().put("event", "craftRawMotionUpdate").put("detail", detail))
+                }
+            }
+        }
+        if (barometerEnabled && !headless) {
+            activeScreen.barometer = CraftNativeBarometer(CraftAndroidMotionSource(this)).apply {
+                emit = { detail ->
+                    if (activeScreen.active) send(activeScreen, "CRAFT_EVENT",
+                        JSONObject().put("event", "craftBarometerUpdate").put("detail", detail))
+                }
+            }
+        }
+        if (pedometerEnabled && !headless) {
+            activeScreen.pedometer = CraftNativePedometer(CraftAndroidMotionSource(this), capabilities::pedometerPermissionGranted).apply {
+                emit = { detail ->
+                    if (activeScreen.active) send(activeScreen, "CRAFT_EVENT",
+                        JSONObject().put("event", "craftPedometerUpdate").put("detail", detail))
+                }
+            }
+        }
         activeScreen.sounds.emit = { payload ->
             if (activeScreen.active) send(activeScreen, "SOUND_EVENT", payload)
         }
@@ -5534,6 +5576,9 @@ class MainActivity : AppCompatActivity() {
     private fun capabilityNames(): JSONArray = capabilities.names().apply {
         services.names().forEach { name -> put(name) }
         put("audio")
+        if (motionSensorsEnabled) put("rawMotionSensors")
+        if (barometerEnabled) put("barometer")
+        if (pedometerEnabled) put("pedometer")
         put("viewFocus")
         put("viewMeasure")
         put("viewScroll")
@@ -6952,6 +6997,7 @@ class MainActivity : AppCompatActivity() {
         CraftNativePointers.configure(control, props, style, control is CraftNativeFlexLayout || control is CraftNativeImageBackgroundView ||
             control is CraftNativeKeyboardAvoidingView || control is CraftNativeScrollView || control is CraftNativeRefreshableFlatList || control is CraftNativeModalView)
         applyAccessibility(control, props, type, explicitKey ?: protocolId ?: path)
+        applyAccessibilityActions(screen, control, props, events, longPressDisabled)
         // One element across an animated change (craft.animation.next).
         control.transitionName = craftNativeOptionalString(props.opt("transitionID"))?.takeIf { it.isNotBlank() }
         val layoutHandler = craftNativeEventName(events, "onLayout")
@@ -7854,6 +7900,54 @@ class MainActivity : AppCompatActivity() {
         field.setSelection(minOf(boundedStart, boundedEnd), maxOf(boundedStart, boundedEnd))
     }
 
+    /**
+     * What a hold offers, published where TalkBack can reach it.
+     *
+     * A long click is invisible to a screen reader: nothing announces that it
+     * is there and nothing can perform it, so an action living only behind a
+     * hold does not exist for anyone driving the screen by assistive
+     * technology. A thread that holds a message for Copy and Report is the
+     * case this was written for; without this the honest mitigation is a
+     * permanently visible button under every message.
+     *
+     * Runs after applyAccessibility, which installs its own delegate and
+     * would drop actions added before it.
+     */
+    private fun applyAccessibilityActions(
+        screen: Screen,
+        control: View,
+        props: JSONObject,
+        events: JSONObject,
+        disabled: Boolean,
+    ) {
+        screen.accessibilityActionIds.remove(control)?.forEach { ViewCompat.removeAccessibilityAction(control, it) }
+        val handler = craftNativeEventName(events, "onAccessibilityAction").takeUnless { disabled } ?: ""
+        val authored = props.optJSONArray("accessibilityActions")
+        if (handler.isBlank() || authored == null || authored.length() == 0) {
+            screen.accessibilityActionHandlers.remove(control)
+            return
+        }
+        screen.accessibilityActionHandlers[control] = handler
+        val ids = mutableListOf<Int>()
+        for (index in 0 until authored.length()) {
+            val entry = authored.optJSONObject(index) ?: continue
+            val name = craftNativeOptionalString(entry.opt("name"))?.takeIf { it.isNotBlank() } ?: continue
+            val label = craftNativeOptionalString(entry.opt("label"))?.takeIf { it.isNotBlank() } ?: name
+            ids += ViewCompat.addAccessibilityAction(control, label) { _, _ ->
+                // Read the handler at firing time: a reconcile can rename it
+                // while the action sits in TalkBack's menu.
+                val current = screen.accessibilityActionHandlers[control]
+                if (current.isNullOrBlank()) {
+                    false
+                } else {
+                    send(screen, "EVENT", JSONObject().put("handlerName", current).put("nativeEvent", JSONObject().put("actionName", name)))
+                    true
+                }
+            }
+        }
+        if (ids.isEmpty()) screen.accessibilityActionHandlers.remove(control) else screen.accessibilityActionIds[control] = ids
+    }
+
     private fun applyAccessibility(view: View, props: JSONObject, type: String, fallbackLabel: String) {
         val testId = craftNativeOptionalString(props.opt("testID"))
         view.tag = testId?.takeIf { it.isNotBlank() } ?: fallbackLabel
@@ -8039,6 +8133,37 @@ class MainActivity : AppCompatActivity() {
         val method = payload.optString("method")
         val perform: ((CraftNativeCapabilityResult) -> Unit) -> Unit = if (module == "View") {
             { completion -> performView(screen, method, args, completion) }
+        } else if (module == "Pedometer") {
+            { completion ->
+                val pedometer = screen.pedometer
+                if (!pedometerEnabled) completion(CraftNativeCapabilityResult(code = "CAPABILITY_DISABLED", message = "Pedometer is disabled"))
+                else if (pedometer == null) completion(CraftNativeCapabilityResult(code = "NEEDS_ACTIVITY", message = "Pedometer needs a visible app"))
+                else if (method in listOf("start", "requestPermission") && !motionForeground) completion(CraftNativeCapabilityResult(code = "APP_INACTIVE", message = "Pedometer needs a foreground app"))
+                else if (method == "requestPermission") capabilities.perform(token, payload.optInt("version", CRAFT_NATIVE_CAPABILITY_PROTOCOL_VERSION), module, method, args, completion)
+                else completion(pedometer.perform(method, args))
+            }
+        } else if (module == "Barometer") {
+            { completion ->
+                val barometer = screen.barometer
+                completion(if (!barometerEnabled) {
+                    CraftNativeCapabilityResult(code = "CAPABILITY_DISABLED", message = "Barometer is disabled")
+                } else if (barometer == null) {
+                    CraftNativeCapabilityResult(code = "NEEDS_ACTIVITY", message = "Barometer needs a visible app")
+                } else if (method == "start" && !motionForeground) {
+                    CraftNativeCapabilityResult(code = "APP_INACTIVE", message = "Barometer needs a foreground app")
+                } else barometer.perform(method, args))
+            }
+        } else if (module == "MotionSensors") {
+            { completion ->
+                val motion = screen.motion
+                completion(if (!motionSensorsEnabled) {
+                    CraftNativeCapabilityResult(code = "CAPABILITY_DISABLED", message = "Motion sensors are disabled")
+                } else if (motion == null) {
+                    CraftNativeCapabilityResult(code = "NEEDS_ACTIVITY", message = "Motion sensors need a visible app")
+                } else if (method == "start" && !motionForeground) {
+                    CraftNativeCapabilityResult(code = "APP_INACTIVE", message = "Motion sensors need a foreground app")
+                } else motion.perform(method, args))
+            }
         } else if (module == "Audio") {
             { completion ->
                 val id = args.optString(0)
@@ -8290,6 +8415,8 @@ class MainActivity : AppCompatActivity() {
     }
 
     override fun onPause() {
+        motionForeground = false
+        allScreens().forEach { it.motion?.stopAll(); it.barometer?.stop("background"); it.pedometer?.stop("background") }
         disarmShakeGesture()
         if (::services.isInitialized) services.pauseVoice()
         nativeAppState = "inactive"
@@ -8350,13 +8477,14 @@ class MainActivity : AppCompatActivity() {
 
     override fun onResume() {
         super.onResume()
+        motionForeground = true
         armShakeGesture()
         if (::services.isInitialized) services.resumed()
     }
 
     override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-        if (::capabilities.isInitialized) { capabilities.onBluetoothPermissions(requestCode); capabilities.onNotificationPermissions(requestCode) }
+        if (::capabilities.isInitialized) { capabilities.onBluetoothPermissions(requestCode); capabilities.onNotificationPermissions(requestCode); capabilities.onPedometerPermissions(requestCode) }
         if (::services.isInitialized) services.onRequestPermissionsResult(requestCode)
     }