diff --git a/Meshtastic/Views/Settings/Settings.swift b/Meshtastic/Views/Settings/Settings.swift index 363842a2..c57f0b3d 100644 --- a/Meshtastic/Views/Settings/Settings.swift +++ b/Meshtastic/Views/Settings/Settings.swift @@ -406,11 +406,13 @@ struct Settings: View { Image(systemName: "gearshape") } } - NavigationLink(value: SettingsNavigationState.tools) { - Label { - Text("Tools") - } icon: { - Image(systemName: "hammer") + if #available(iOS 18, *) { + NavigationLink(value: SettingsNavigationState.tools) { + Label { + Text("Tools") + } icon: { + Image(systemName: "hammer") + } } } NavigationLink(value: SettingsNavigationState.routes) { @@ -581,7 +583,9 @@ struct Settings: View { case .firmwareUpdates: Firmware(node: node) case .tools: - Tools() + if #available(iOS 18, *) { + Tools() + } case .tak: TAKServerConfig() case .takConfig: diff --git a/Meshtastic/Views/Settings/Tools.swift b/Meshtastic/Views/Settings/Tools.swift index 897659d9..c4508deb 100644 --- a/Meshtastic/Views/Settings/Tools.swift +++ b/Meshtastic/Views/Settings/Tools.swift @@ -12,6 +12,7 @@ import CoreNFC import MeshtasticProtobufs import OSLog +@available(iOS 18, *) struct Tools: View { @EnvironmentObject var accessoryManager: AccessoryManager @Environment(\.managedObjectContext) var context @@ -69,6 +70,7 @@ struct Tools: View { } } +@available(iOS 18, *) #Preview { let context = PersistenceController.preview.container.viewContext return Tools() @@ -77,6 +79,7 @@ struct Tools: View { } #if !targetEnvironment(macCatalyst) +@available(iOS 18, *) final class NFCReader: NSObject, ObservableObject, NFCNDEFReaderSessionDelegate { private let logger = Logger(subsystem: "org.meshtastic.app", category: "NFC")