Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion NativeAppTemplate/Logging/Logger.swift
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ struct Event {
) -> Self {
.init(
source: "\(Source.self)",
action: "Refresh"
action: action
)
}

Expand Down
2 changes: 1 addition & 1 deletion NativeAppTemplate/NFCManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ protocol NFCManagerProtocol: Sendable {
func startReading() async
func startReadingForTesting() async

func startWriting(ndefMessage: sending NFCNDEFMessage, isLock: Bool) async
func startWriting(ndefMessage: NFCNDEFMessage, isLock: Bool) async
}

final class NFCManager: NSObject, ObservableObject, @unchecked Sendable {
Expand Down
5 changes: 1 addition & 4 deletions NativeAppTemplate/UI/App Root/AppTabView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ struct AppTabView<
@Environment(DataManager.self) private var dataManager
@Environment(TabViewModel.self) private var model
@State var navigationPathShops = NavigationPath()
@State var navigationPathStats = NavigationPath()
private let shopListView: () -> ShopListView
private let scanView: () -> ScanView
private let settingsView: () -> SettingsView
Expand Down Expand Up @@ -83,13 +82,11 @@ extension AppTabView: View {
.tint(.accent)
.onChange(of: sessionController.client) {
navigationPathShops = NavigationPath()
navigationPathStats = NavigationPath()
}
.onChange(of: sessionController.shouldPopToRootView) {
if sessionController.shouldPopToRootView {
navigationPathShops = NavigationPath()
navigationPathStats = NavigationPath()
sessionController.shouldPopToRootView = false
sessionController.shouldPopToRootView = false
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ final class ItemTagDetailViewModel {
return
}

let ndefMessage = createNdefMessage(itemTag: itemTag, itemTagType: .server)
nonisolated(unsafe) let ndefMessage = createNdefMessage(itemTag: itemTag, itemTagType: .server)

Task {
await nfcManager.startWriting(ndefMessage: ndefMessage, isLock: isLocked)
Expand All @@ -104,7 +104,7 @@ final class ItemTagDetailViewModel {
return
}

let ndefMessage = createNdefMessage(itemTag: itemTag, itemTagType: .customer)
nonisolated(unsafe) let ndefMessage = createNdefMessage(itemTag: itemTag, itemTagType: .customer)

Task {
await nfcManager.startWriting(ndefMessage: ndefMessage, isLock: isLocked)
Expand Down
Loading