@craft-native/ios 0.0.368 → 0.0.374

package/templates/CraftNativeScreen.swift

@@ -2245,6 +2245,7 @@ private final class CraftNativeMapView: MKMapView, MKMapViewDelegate {
     }
 
     private static func locationPermissionGranted() -> Bool {
+        #if CRAFT_PERMISSION_LOCATION
         let status: CLAuthorizationStatus
         if #available(iOS 14.0, *) {
             status = CLLocationManager().authorizationStatus
@@ -2252,6 +2253,9 @@ private final class CraftNativeMapView: MKMapView, MKMapViewDelegate {
             status = CLLocationManager.authorizationStatus()
         }
         return status == .authorizedAlways || status == .authorizedWhenInUse
+        #else
+        return false
+        #endif
     }
 }
 
@@ -5316,6 +5320,115 @@ private final class CraftNativeButton: UIButton {
     }
 }
 
+/// Opt-in solid switch. Draws only public UIControl content; it neither walks
+/// UISwitch's private views nor changes UIKit animations elsewhere in the app.
+final class CraftNativeSolidSwitch: UIControl {
+    private(set) var isOn = false
+    var onColor: UIColor? { didSet { setNeedsDisplay() } }
+    var offColor: UIColor? { didSet { setNeedsDisplay() } }
+    var thumbColor: UIColor? { didSet { setNeedsDisplay() } }
+    private let naturalSize = UISwitch().intrinsicContentSize
+    private var touchOrigin: CGPoint?
+    private var dragPosition: CGFloat?
+    override var intrinsicContentSize: CGSize { naturalSize }
+    override var isEnabled: Bool {
+        didSet {
+            if !isEnabled { cancelTracking(with: nil) }
+            refreshAccessibility()
+            setNeedsDisplay()
+        }
+    }
+    override var canBecomeFirstResponder: Bool { isEnabled }
+
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        isOpaque = false
+        contentMode = .redraw
+        isAccessibilityElement = true
+        refreshAccessibility()
+    }
+    required init?(coder: NSCoder) { fatalError("init(coder:) has not been implemented") }
+
+    func setOn(_ value: Bool) {
+        isOn = value
+        refreshAccessibility()
+        setNeedsDisplay()
+    }
+
+    func refreshAccessibility() {
+        accessibilityTraits = .button
+        if #available(iOS 17.0, *) { accessibilityTraits.insert(.toggleButton) }
+        if isOn { accessibilityTraits.insert(.selected) }
+        if !isEnabled { accessibilityTraits.insert(.notEnabled) }
+        accessibilityValue = isOn ? "1" : "0"
+    }
+
+    private var trackRect: CGRect {
+        let size = CGSize(width: min(bounds.width, naturalSize.width), height: min(bounds.height, naturalSize.height))
+        return CGRect(x: bounds.midX - size.width / 2, y: bounds.midY - size.height / 2, width: size.width, height: size.height)
+    }
+    var thumbRect: CGRect {
+        let track = trackRect.insetBy(dx: 2, dy: 2)
+        let onRight = effectiveUserInterfaceLayoutDirection != .rightToLeft
+        let position = dragPosition ?? ((isOn == onRight) ? 1 : 0)
+        return CGRect(x: track.minX + (track.width - track.height) * position, y: track.minY, width: track.height, height: track.height)
+    }
+    override func draw(_ rect: CGRect) {
+        let track = trackRect
+        guard track.width > 4, track.height > 4 else { return }
+        (isEnabled ? (isOn ? onColor ?? .systemGreen : offColor ?? .systemGray4) : UIColor.systemGray4).setFill()
+        UIBezierPath(roundedRect: track, cornerRadius: track.height / 2).fill()
+        // The solid variant deliberately ignores thumb alpha. No transient
+        // glass, scaling, fade, implicit layer animation or delayed redraw.
+        (thumbColor ?? .white).withAlphaComponent(1).setFill()
+        UIBezierPath(ovalIn: thumbRect).fill()
+    }
+    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+        super.traitCollectionDidChange(previousTraitCollection)
+        setNeedsDisplay()
+    }
+    override func beginTracking(_ touch: UITouch, with event: UIEvent?) -> Bool {
+        guard isEnabled else { return false }
+        touchOrigin = touch.location(in: self)
+        dragPosition = nil
+        return true
+    }
+    func updateDrag(to point: CGPoint) {
+        let track = trackRect.insetBy(dx: 2, dy: 2)
+        dragPosition = min(1, max(0, (point.x - track.minX - track.height / 2) / max(1, track.width - track.height)))
+        setNeedsDisplay()
+    }
+    override func continueTracking(_ touch: UITouch, with event: UIEvent?) -> Bool {
+        guard isEnabled, let origin = touchOrigin else { return false }
+        let point = touch.location(in: self)
+        if dragPosition != nil || abs(point.x - origin.x) > 6 { updateDrag(to: point) }
+        return true
+    }
+    override func endTracking(_ touch: UITouch?, with event: UIEvent?) {
+        defer { touchOrigin = nil; dragPosition = nil; setNeedsDisplay() }
+        guard isEnabled, let touch, touchOrigin != nil,
+              bounds.insetBy(dx: -10, dy: -10).contains(touch.location(in: self)) else { return }
+        let next = dragPosition.map { ($0 >= 0.5) == (effectiveUserInterfaceLayoutDirection != .rightToLeft) } ?? !isOn
+        if next != isOn { setOn(next); sendActions(for: .valueChanged) }
+    }
+    override func cancelTracking(with event: UIEvent?) {
+        touchOrigin = nil
+        dragPosition = nil
+        setNeedsDisplay()
+    }
+    override func accessibilityActivate() -> Bool {
+        guard isEnabled else { return false }
+        setOn(!isOn)
+        sendActions(for: .valueChanged)
+        return true
+    }
+    override func pressesEnded(_ presses: Set<UIPress>, with event: UIPressesEvent?) {
+        if isEnabled, presses.contains(where: { $0.key?.keyCode == .keyboardSpacebar || $0.key?.keyCode == .keyboardReturnOrEnter }) {
+            _ = accessibilityActivate()
+        } else { super.pressesEnded(presses, with: event) }
+    }
+}
+
 /// A native checkbox button. UIKit has no checkbox control, so use the system
 /// square/checkmark symbols while keeping the control's title and accessibility
 /// state native and keyboard/touch reachable.
@@ -6786,6 +6899,20 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
                             actionSheet: function(options) { return request('Dialog', 'actionSheet', [options || {}], true).then(function(id) { return typeof id === 'string' ? id : null; }); }
                         };
                     }
+                    if (Array.isArray(bridge.capabilities) && bridge.capabilities.indexOf('health') >= 0) {
+                        var health = craft.health || {};
+                        var discardWorkout = function() { return request('Health', 'discardWorkout', []); };
+                        health.discardWorkout = discardWorkout;
+                        Object.defineProperty(craft, 'health', {
+                            configurable: true, enumerable: true,
+                            get: function() { return health; },
+                            set: function(value) {
+                                if (!value || typeof value !== 'object') return;
+                                value.discardWorkout = discardWorkout;
+                                health = value;
+                            }
+                        });
+                    }
                     if (Array.isArray(bridge.capabilities) && bridge.capabilities.indexOf('shortcuts') >= 0) {
                         var shortcuts = {
                             set: function(items) { return request('Shortcuts', 'set', [items]); },
@@ -7017,6 +7144,9 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
                 keep('navigation', {
                     setOptions: function(options) { craftNativeSetOptions(JSON.stringify(options || {})); }
                 });
+                // shortcuts already has a capability-owned accessor above.
+                // Do not wrap it in keep(): its adopt setter would let a
+                // bundle replace native set/clear during bootstrap.
             })();
         """)
     }
@@ -8263,6 +8393,10 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
     private func canReuseView(_ node: [String: Any], previous: RenderedNode) -> Bool {
         let type = canonicalType(node["type"] as? String ?? "View")
         guard previous.type == type else { return false }
+        if type == "Switch" {
+            let props = node["props"] as? [String: Any] ?? [:]
+            return (previous.view is CraftNativeSolidSwitch) == (props["ios_solid"] as? Bool == true)
+        }
         if type == "Text" {
             let props = node["props"] as? [String: Any] ?? [:]
             return (previous.view is CraftNativeSelectableTextView) == (props["selectable"] as? Bool == true)
@@ -8614,6 +8748,16 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             pressable.pressBaseOpacity = number(style["opacity"]) ?? 1
             pressable.pressUnderlayColor = type == "TouchableHighlight" && !disabled ? color(props["underlayColor"]) : nil
         case "Switch":
+            if let toggle = result as? CraftNativeSolidSwitch {
+                if let value = props["value"] as? Bool ?? props["checked"] as? Bool { toggle.setOn(value) }
+                toggle.isEnabled = props["disabled"] as? Bool != true
+                let track = props["trackColor"] as? [String: Any]
+                toggle.onColor = track == nil ? color(style["color"]) : color(track?["true"])
+                toggle.offColor = color(props["ios_backgroundColor"]) ?? color(track?["false"])
+                toggle.thumbColor = color(props["thumbColor"])
+                updateHandler(nonEmptyHandler(events["onValueChange"]) ?? nonEmptyHandler(events["onChange"]), for: toggle)
+                break
+            }
             let toggle = result as! UISwitch
             // A supplied value controls the switch; without one, UIKit owns
             // the state and a reconciliation must not erase a user's tap.
@@ -8928,6 +9072,11 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         case "Modal":
             return CraftNativeModalView()
         case "Switch":
+            if props["ios_solid"] as? Bool == true {
+                let toggle = CraftNativeSolidSwitch()
+                toggle.addTarget(self, action: #selector(solidSwitchChanged(_:)), for: .valueChanged)
+                return toggle
+            }
             let toggle = UISwitch()
             toggle.addTarget(self, action: #selector(switchChanged(_:)), for: .valueChanged)
             return toggle
@@ -10470,6 +10619,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         // Assigning .button changes its legacy AX type into a button while
         // modern XCTest still identifies its UIKit class as a switch.
         if view is UITextView || view is UISwitch { return }
+        if let toggle = view as? CraftNativeSolidSwitch { toggle.refreshAccessibility(); return }
         view.accessibilityTraits = traits
     }
 
@@ -10647,6 +10797,11 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         send(type: "EVENT", payload: ["handlerName": handler, "nativeEvent": ["value": sender.values[index], "index": index]])
     }
 
+    @objc private func solidSwitchChanged(_ sender: CraftNativeSolidSwitch) {
+        guard sender.isEnabled, let handler = handlers[ObjectIdentifier(sender)] else { return }
+        send(type: "EVENT", payload: ["handlerName": handler, "nativeEvent": ["value": sender.isOn]])
+    }
+
     @objc private func switchChanged(_ sender: UISwitch) {
         let id = ObjectIdentifier(sender)
         switchUserValues[id] = sender.isOn

package/templates/CraftNativeServices.swift

@@ -280,12 +280,19 @@ final class CraftNativeSounds {
         var volume: Float
         var paused = false
         var interrupted = false
+        var pending: ((Result<Any, CraftNativeActionError>) -> Void)?
 
         init(player: AVQueuePlayer, volume: Float) {
             self.player = player
             self.volume = volume
         }
 
+        func settle(_ result: Result<Any, CraftNativeActionError>) {
+            let answer = pending
+            pending = nil
+            answer?(result)
+        }
+
         func end() {
             fade?.invalidate()
             fade = nil
@@ -357,33 +364,29 @@ final class CraftNativeSounds {
         let item = AVPlayerItem(url: url)
         let player = AVQueuePlayer()
         let sound = Sound(player: player, volume: volume)
+        sound.pending = answer
         sounds[id] = sound
-        var answered = false
-        let settle: (Result<Any, CraftNativeActionError>) -> Void = { result in
-            guard !answered else { return }
-            answered = true
-            answer(result)
-        }
         let failed: (String) -> Void = { [weak self, weak sound] message in
             guard let self, let sound, self.sounds[id] === sound else { return }
-            self.remove(id)
-            settle(.failure(CraftNativeActionError(code: "AUDIO_ERROR", message: message)))
+            self.remove(id, result: .failure(CraftNativeActionError(code: "AUDIO_ERROR", message: message)))
             self.emit?(["id": id, "event": "error", "message": message])
         }
         if loop {
             let looper = AVPlayerLooper(player: player, templateItem: item)
             sound.looper = looper
-            sound.observation = looper.observe(\.status, options: [.initial, .new]) { looper, _ in
+            sound.observation = looper.observe(\.status, options: [.initial, .new]) { [weak self, weak sound] looper, _ in
                 DispatchQueue.main.async {
-                    if looper.status == .ready { settle(.success(true)) }
+                    guard let self, let sound, self.sounds[id] === sound else { return }
+                    if looper.status == .ready { sound.settle(.success(true)) }
                     else if looper.status == .failed { failed(looper.error?.localizedDescription ?? "The sound could not be played") }
                 }
             }
         } else {
             player.insert(item, after: nil)
-            sound.observation = item.observe(\.status, options: [.initial, .new]) { item, _ in
+            sound.observation = item.observe(\.status, options: [.initial, .new]) { [weak self, weak sound] item, _ in
                 DispatchQueue.main.async {
-                    if item.status == .readyToPlay { settle(.success(true)) }
+                    guard let self, let sound, self.sounds[id] === sound else { return }
+                    if item.status == .readyToPlay { sound.settle(.success(true)) }
                     else if item.status == .failed { failed(item.error?.localizedDescription ?? "The sound could not be played") }
                 }
             }
@@ -451,10 +454,13 @@ final class CraftNativeSounds {
         for id in Array(sounds.keys) { remove(id) }
     }
 
-    private func remove(_ id: String) {
+    private func remove(_ id: String, result: Result<Any, CraftNativeActionError> = .failure(CraftNativeActionError(code: "CANCELLED", message: "Audio playback was stopped or replaced"))) {
         guard let sound = sounds.removeValue(forKey: id) else { return }
         sound.end()
         Self.releaseSession()
+        // Settle after removing the old handle and releasing its resources so
+        // a completion can safely start another sound with the same id.
+        sound.settle(result)
     }
 
     /// Moves the volume in steps on the main run loop, a 30th of a second

package/templates/CraftVoiceRecording.swift

@@ -6,7 +6,9 @@ protocol CraftVoiceRecorder: AnyObject {
     func record(forDuration duration: TimeInterval) -> Bool
     func stop()
 }
+#if CRAFT_PERMISSION_MICROPHONE
 extension AVAudioRecorder: CraftVoiceRecorder {}
+#endif
 
 /// The main thread owns requests; audio and encoder work belong to one serial
 /// queue. Cancellation invalidates a request immediately, even while AVFoundation
@@ -93,12 +95,22 @@ final class CraftVoiceRecording {
 
     init(audioQueue: DispatchQueue = DispatchQueue(label: "craft.voice-recording", qos: .userInitiated),
          startupTimeout: TimeInterval = 15,
-         permission: @escaping (@escaping (Bool) -> Void) -> Void = { AVAudioSession.sharedInstance().requestRecordPermission($0) },
+         permission: @escaping (@escaping (Bool) -> Void) -> Void = { answer in
+             #if CRAFT_PERMISSION_MICROPHONE
+             AVAudioSession.sharedInstance().requestRecordPermission(answer)
+             #else
+             answer(false)
+             #endif
+         },
          makeRecorder: @escaping (URL) throws -> CraftVoiceRecorder = { file in
+             #if CRAFT_PERMISSION_MICROPHONE
              let session = AVAudioSession.sharedInstance()
              try session.setCategory(.record, mode: .measurement)
              try session.setActive(true)
              return try AVAudioRecorder(url: file, settings: [AVFormatIDKey: kAudioFormatMPEG4AAC, AVSampleRateKey: 16000, AVNumberOfChannelsKey: 1, AVEncoderBitRateKey: 32000])
+             #else
+             throw NSError(domain: "CraftVoiceRecording", code: 1, userInfo: [NSLocalizedDescriptionKey: "Microphone was not enabled when this app was built"])
+             #endif
          },
          deactivate: @escaping () -> Void = { try? AVAudioSession.sharedInstance().setActive(false, options: .notifyOthersOnDeactivation) }) {
         Self.prepareForLaunch()