mirror of
https://github.com/wu736139669/hapi.git
synced 2026-10-08 19:19:42 +00:00
- Pairing now allows direct entry/scan with inline progress and error feedback - PairingConfirmView is now deep-link-only for security confirmations - Session list rows: move thinking spinner and unread indicator to trailing edge - Extracted shared PairingAttempt state for reuse - Updated strings: "Continue" → "Pair" button label - Removed unused PendingPairing.source Claude-Session: https://claude.ai/code/session_01ViH4oaLSpTcksxDFEMQgeD
216 lines
7.6 KiB
Swift
216 lines
7.6 KiB
Swift
import HapiClient
|
|
import HapiProtocol
|
|
import SwiftUI
|
|
import UIKit
|
|
import Vision
|
|
import VisionKit
|
|
|
|
/// QR scanning step: a VisionKit live scanner that feeds every recognized
|
|
/// string through ``BindLink/parse(_:)`` (so both the companion deeplink QR
|
|
/// and the web direct-access QR pair) and pairs immediately on success, with
|
|
/// inline progress/error below the scanner. Falls back to guidance when
|
|
/// scanning is unsupported (Simulator, no camera) or camera access is denied.
|
|
struct QRScannerView: View {
|
|
@Environment(\.dismiss) private var dismiss
|
|
@Environment(\.openURL) private var openURL
|
|
@Environment(AppModel.self) private var model
|
|
@State private var attempt = PairingAttempt()
|
|
@State private var cameraDenied = false
|
|
@State private var sawForeignCode = false
|
|
|
|
var body: some View {
|
|
NavigationStack {
|
|
scannerContent
|
|
.navigationTitle("Scan to Pair")
|
|
.navigationBarTitleDisplayMode(.inline)
|
|
.toolbar {
|
|
ToolbarItem(placement: .cancellationAction) {
|
|
Button("Cancel") {
|
|
dismiss()
|
|
}
|
|
}
|
|
}
|
|
.interactiveDismissDisabled(attempt.isPairing)
|
|
}
|
|
}
|
|
|
|
@ViewBuilder
|
|
private var scannerContent: some View {
|
|
if DataScannerViewController.isSupported {
|
|
DataScannerRepresentable(
|
|
isActive: !attempt.isPairing && attempt.failure == nil,
|
|
onScan: handleScannedString
|
|
)
|
|
.ignoresSafeArea(edges: .bottom)
|
|
.overlay(alignment: .bottom) {
|
|
statusBar
|
|
}
|
|
.overlay {
|
|
if cameraDenied {
|
|
cameraDeniedView
|
|
}
|
|
}
|
|
.task {
|
|
// Also triggers the camera permission prompt on first use.
|
|
cameraDenied = !(await DataScannerViewController.isAvailable)
|
|
}
|
|
} else {
|
|
ContentUnavailableView {
|
|
Label("Scanning unavailable", systemImage: "camera")
|
|
} description: {
|
|
Text("This device cannot scan QR codes (for example the Simulator). Go back and use manual entry instead.")
|
|
} actions: {
|
|
Button("Close") {
|
|
dismiss()
|
|
}
|
|
.buttonStyle(.bordered)
|
|
}
|
|
}
|
|
}
|
|
|
|
@ViewBuilder
|
|
private var statusBar: some View {
|
|
if attempt.isPairing {
|
|
HStack(spacing: 8) {
|
|
ProgressView()
|
|
Text("Pairing…")
|
|
}
|
|
.padding(12)
|
|
.frame(maxWidth: .infinity)
|
|
.background(.thinMaterial)
|
|
} else if let failure = attempt.failure {
|
|
VStack(alignment: .leading, spacing: 12) {
|
|
PairingErrorView(failure: failure)
|
|
Button("Scan Again") {
|
|
attempt.failure = nil
|
|
}
|
|
.buttonStyle(.borderedProminent)
|
|
.frame(maxWidth: .infinity)
|
|
}
|
|
.padding(12)
|
|
.frame(maxWidth: .infinity)
|
|
.background(.thinMaterial)
|
|
} else {
|
|
hintBar
|
|
}
|
|
}
|
|
|
|
private var hintBar: some View {
|
|
Text(sawForeignCode
|
|
? String(localized: "That code is not a HAPI pairing QR — scan one printed by the hub.")
|
|
: String(localized: "Point the camera at the pairing QR from the hub terminal or the web app's Companion Pairing settings."))
|
|
.font(.footnote)
|
|
.multilineTextAlignment(.center)
|
|
.foregroundStyle(sawForeignCode ? Color.orange : Color.secondary)
|
|
.padding(12)
|
|
.frame(maxWidth: .infinity)
|
|
.background(.thinMaterial)
|
|
}
|
|
|
|
private var cameraDeniedView: some View {
|
|
ContentUnavailableView {
|
|
Label("Camera access denied", systemImage: "video.slash")
|
|
} description: {
|
|
Text("Allow camera access in Settings to scan the pairing QR, or go back and use manual entry.")
|
|
} actions: {
|
|
if let settingsURL = URL(string: UIApplication.openSettingsURLString) {
|
|
Button("Open Settings") {
|
|
openURL(settingsURL)
|
|
}
|
|
.buttonStyle(.borderedProminent)
|
|
}
|
|
}
|
|
.background(.background)
|
|
}
|
|
|
|
/// Returns whether the payload was accepted (stops further scanning).
|
|
private func handleScannedString(_ raw: String) -> Bool {
|
|
guard !attempt.isPairing, attempt.failure == nil else { return true }
|
|
guard let link = BindLink.parse(raw) else {
|
|
sawForeignCode = true
|
|
return false
|
|
}
|
|
UINotificationFeedbackGenerator().notificationOccurred(.success)
|
|
sawForeignCode = false
|
|
attempt.pair(model, hubUrl: link.hubUrl, accessToken: link.accessToken)
|
|
return true
|
|
}
|
|
}
|
|
|
|
/// `DataScannerViewController` wrapped for SwiftUI, restricted to QR codes.
|
|
/// `isActive` gates scanning so a successful scan freezes the camera while
|
|
/// pairing runs (or its error is showing) and re-arms on "Scan Again".
|
|
private struct DataScannerRepresentable: UIViewControllerRepresentable {
|
|
var isActive: Bool
|
|
var onScan: (String) -> Bool
|
|
|
|
func makeUIViewController(context: Context) -> DataScannerViewController {
|
|
let scanner = DataScannerViewController(
|
|
recognizedDataTypes: [.barcode(symbologies: [.qr])],
|
|
qualityLevel: .balanced,
|
|
recognizesMultipleItems: false,
|
|
isHighlightingEnabled: true
|
|
)
|
|
scanner.delegate = context.coordinator
|
|
return scanner
|
|
}
|
|
|
|
func updateUIViewController(_ scanner: DataScannerViewController, context: Context) {
|
|
context.coordinator.onScan = onScan
|
|
if isActive {
|
|
context.coordinator.hasAccepted = false
|
|
if !scanner.isScanning {
|
|
// Throws when unavailable (permission denied etc.); the
|
|
// SwiftUI layer surfaces that state, so failing quietly here
|
|
// is fine.
|
|
try? scanner.startScanning()
|
|
}
|
|
} else if scanner.isScanning {
|
|
scanner.stopScanning()
|
|
}
|
|
}
|
|
|
|
func makeCoordinator() -> Coordinator {
|
|
Coordinator(onScan: onScan)
|
|
}
|
|
|
|
@MainActor
|
|
final class Coordinator: NSObject, DataScannerViewControllerDelegate {
|
|
var onScan: (String) -> Bool
|
|
var hasAccepted = false
|
|
|
|
init(onScan: @escaping (String) -> Bool) {
|
|
self.onScan = onScan
|
|
}
|
|
|
|
func dataScanner(
|
|
_ dataScanner: DataScannerViewController,
|
|
didAdd addedItems: [RecognizedItem],
|
|
allItems: [RecognizedItem]
|
|
) {
|
|
process(addedItems, scanner: dataScanner)
|
|
}
|
|
|
|
func dataScanner(
|
|
_ dataScanner: DataScannerViewController,
|
|
didUpdate updatedItems: [RecognizedItem],
|
|
allItems: [RecognizedItem]
|
|
) {
|
|
process(updatedItems, scanner: dataScanner)
|
|
}
|
|
|
|
private func process(_ items: [RecognizedItem], scanner: DataScannerViewController) {
|
|
guard !hasAccepted else { return }
|
|
for item in items {
|
|
guard case .barcode(let barcode) = item,
|
|
let payload = barcode.payloadStringValue else { continue }
|
|
if onScan(payload) {
|
|
hasAccepted = true
|
|
scanner.stopScanning()
|
|
return
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|