Allow scanning NFC tags from anywhere in app

bitcoinppl · Oct 28, 2024 · 6aadec7 · 6aadec7
1 parent 9378269
commit 6aadec7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/ios/Cove/CoveApp.swift b/ios/Cove/CoveApp.swift
@@ -326,9 +326,17 @@ struct CoveApp: App {
                 id = UUID()
             }
             .onChange(of: scannedCode) { _, scannedCode in
+                // QR code scanning
                 guard let scannedCode else { return }
+                if scannedCode.value.isEmpty { return }
                 handleScannedCode(StringOrData(scannedCode.value))
             }
+            .onChange(of: model.nfcReader.scannedMessage) { _, scannedMessage in
+                // NFC scanning
+                guard let scannedMessage else { return }
+                if scannedMessage.value.isEmpty { return }
+                handleScannedCode(StringOrData(scannedMessage))
+            }
             .alert(
                 alert?.item.title() ?? "Alert",
                 isPresented: showingAlert,

diff --git a/ios/Cove/HomeScreens/SelectedWalletScreen.swift b/ios/Cove/HomeScreens/SelectedWalletScreen.swift
@@ -178,7 +178,7 @@ struct SelectedWalletScreenInner: View {
                 .toolbar {
                     ToolbarItemGroup {
                         Button(action: {
-                            sheetState = PresentableItem(.settings)
+                            app.nfcReader.scan()
                         }) {
                             HStack {
                                 Image(systemName: "wave.3.right")

diff --git a/ios/Cove/MainViewModel.swift b/ios/Cove/MainViewModel.swift
@@ -14,6 +14,7 @@ import SwiftUI
     var selectedNode = Database().globalConfig().selectedNode()
 
     var sheetState: PresentableItem<AppSheetState>? = .none
+    var nfcReader = NFCReader()
 
     // changed when route is reset, to clear lifecycle view state
     var routeId = UUID()