From ba3ef4af3ed5a61730303d08e600d40b12bad798 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Sat, 13 May 2023 20:50:20 -0700 Subject: [PATCH] Managed Device Delete by tile server --- Meshtastic.xcodeproj/project.pbxproj | 4 +- Meshtastic/Enums/AppSettingsEnums.swift | 11 +- .../Helpers/Map/OfflineTileManager.swift | 39 ++ Meshtastic/Helpers/NetworkManager.swift | 1 + .../Meshtastic.xcdatamodeld/.xccurrentversion | 2 +- .../contents | 339 +++++++++++++ .../Persistence/PositionEntityExtension.swift | 1 + Meshtastic/Persistence/UpdateCoreData.swift | 4 +- .../Protobufs/meshtastic/config.pb.swift | 11 + Meshtastic/Views/Settings/AppSettings.swift | 48 +- .../Views/Settings/Config/DeviceConfig.swift | 17 +- Meshtastic/Views/Settings/Settings.swift | 444 +++++++++--------- en.lproj/Localizable.strings | 2 +- 13 files changed, 677 insertions(+), 246 deletions(-) create mode 100644 Meshtastic/Meshtastic.xcdatamodeld/MeshtasticDataModelV13.xcdatamodel/contents diff --git a/Meshtastic.xcodeproj/project.pbxproj b/Meshtastic.xcodeproj/project.pbxproj index e4f36526..35f9264f 100644 --- a/Meshtastic.xcodeproj/project.pbxproj +++ b/Meshtastic.xcodeproj/project.pbxproj @@ -293,6 +293,7 @@ DDB75A152A0594AD006ED576 /* TileOverlay.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TileOverlay.swift; sourceTree = ""; }; DDB75A192A05EB67006ED576 /* alpha.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = alpha.png; sourceTree = ""; }; DDB75A1D2A0B0CD0006ED576 /* LoRaSignalStrengthIndicator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoRaSignalStrengthIndicator.swift; sourceTree = ""; }; + DDB75A1F2A10766D006ED576 /* MeshtasticDataModelV13.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = MeshtasticDataModelV13.xcdatamodel; sourceTree = ""; }; DDBA45EC299ED78100DEEDDC /* MeshtasticDataModelV8.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = MeshtasticDataModelV8.xcdatamodel; sourceTree = ""; }; DDC2E15426CE248E0042C5E4 /* Meshtastic.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Meshtastic.app; sourceTree = BUILT_PRODUCTS_DIR; }; DDC2E15726CE248E0042C5E4 /* MeshtasticApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeshtasticApp.swift; sourceTree = ""; }; @@ -1578,6 +1579,7 @@ DD3CC6BA28E366DF00FA9159 /* Meshtastic.xcdatamodeld */ = { isa = XCVersionGroup; children = ( + DDB75A1F2A10766D006ED576 /* MeshtasticDataModelV13.xcdatamodel */, DDB759E12A04B264006ED576 /* MeshtasticDataModelV12.xcdatamodel */, DDDEE5E229DBE43E00A8E078 /* MeshtasticDataModelV11.xcdatamodel */, DDC94FC329CED7280082EA6E /* MeshtasticDataModelV10.xcdatamodel */, @@ -1591,7 +1593,7 @@ DD5D0A9A2931AD6B00F7EA61 /* MeshtasticDataModelV2.xcdatamodel */, DD3CC6BB28E366DF00FA9159 /* MeshtasticDataModel.xcdatamodel */, ); - currentVersion = DDB759E12A04B264006ED576 /* MeshtasticDataModelV12.xcdatamodel */; + currentVersion = DDB75A1F2A10766D006ED576 /* MeshtasticDataModelV13.xcdatamodel */; name = Meshtastic.xcdatamodeld; path = Meshtastic/Meshtastic.xcdatamodeld; sourceTree = ""; diff --git a/Meshtastic/Enums/AppSettingsEnums.swift b/Meshtastic/Enums/AppSettingsEnums.swift index be2c2850..8044cde8 100644 --- a/Meshtastic/Enums/AppSettingsEnums.swift +++ b/Meshtastic/Enums/AppSettingsEnums.swift @@ -254,11 +254,11 @@ enum MapTileServerLinks: String, CaseIterable, Identifiable { case .openStreetMapHot: return [Int](0...18) case .usgsTopo: - return [Int](6...15) + return [Int](6...16) case .usgsImageryTopo: - return [Int](6...15) + return [Int](6...16) case .usgsImageryOnly: - return [Int](6...15) + return [Int](6...16) case .terrain: return [Int](0...15) case .toner: @@ -268,3 +268,8 @@ enum MapTileServerLinks: String, CaseIterable, Identifiable { } } } + +//enum MapOverlayServerLinks: String, CaseIterable, Identifiable { +// +// +//} diff --git a/Meshtastic/Helpers/Map/OfflineTileManager.swift b/Meshtastic/Helpers/Map/OfflineTileManager.swift index 4c8e5dba..640fa078 100644 --- a/Meshtastic/Helpers/Map/OfflineTileManager.swift +++ b/Meshtastic/Helpers/Map/OfflineTileManager.swift @@ -48,6 +48,32 @@ class OfflineTileManager: ObservableObject { return Double(count) * size } + func getDownloadedSize(for mapTileLink: MapTileServerLinks) -> Double { + + var accumulatedSize: UInt64 = 0 + let mapTiles = try! fileManager.contentsOfDirectory(at: documentsDirectory.appendingPathComponent("tiles"), includingPropertiesForKeys: []) + let matchingTiles = mapTiles.filter { fileName in + let fileNameLower = fileName.absoluteString + return fileNameLower.contains(mapTileLink.id) + } + print("Deleting \(matchingTiles.count) tiles for \(mapTileLink.id)") + for tile in matchingTiles { + let url = documentsDirectory.appendingPathComponent(tile.absoluteString) + accumulatedSize += (try? url.regularFileAllocatedSize()) ?? 0 + } + + return Double(accumulatedSize) + +// let paths = self.computeTileOverlayPaths(boundingBox: boundingBox) +// +// for path in paths { +// let file = "tiles/\(UserDefaults.mapTileServer.id)-z\(path.z)x\(path.x)y\(path.y).png" +// let url = documentsDirectory.appendingPathComponent(file) +// accumulatedSize += (try? url.regularFileAllocatedSize()) ?? 0 +// } +// return Double(accumulatedSize) + } + func getDownloadedSize(for boundingBox: MKMapRect) -> Double { let paths = self.computeTileOverlayPaths(boundingBox: boundingBox) var accumulatedSize: UInt64 = 0 @@ -64,6 +90,19 @@ class OfflineTileManager: ObservableObject { createDirectoriesIfNecessary() } + func remove(for mapTileLink: MapTileServerLinks) { + + let mapTiles = try! fileManager.contentsOfDirectory(at: documentsDirectory.appendingPathComponent("tiles"), includingPropertiesForKeys: []) + let matchingTiles = mapTiles.filter { fileName in + let fileNameLower = fileName.absoluteString + return fileNameLower.contains(mapTileLink.id) + } + print("Deleting \(matchingTiles.count) tiles for \(mapTileLink.id)") + for tile in matchingTiles { + try? fileManager.removeItem(at: tile.absoluteURL) + } + } + func remove(for boundingBox: MKMapRect) { let paths = self.computeTileOverlayPaths(boundingBox: boundingBox) for path in paths { diff --git a/Meshtastic/Helpers/NetworkManager.swift b/Meshtastic/Helpers/NetworkManager.swift index 61d3a70a..040e06a9 100644 --- a/Meshtastic/Helpers/NetworkManager.swift +++ b/Meshtastic/Helpers/NetworkManager.swift @@ -18,6 +18,7 @@ class NetworkManager { pathMonitor.pathUpdateHandler = { guard $0.status == .satisfied else { // No network available + print("Network Not available") return pathMonitor.cancel() } pathMonitor.cancel() diff --git a/Meshtastic/Meshtastic.xcdatamodeld/.xccurrentversion b/Meshtastic/Meshtastic.xcdatamodeld/.xccurrentversion index cfa704c4..17b97ce6 100644 --- a/Meshtastic/Meshtastic.xcdatamodeld/.xccurrentversion +++ b/Meshtastic/Meshtastic.xcdatamodeld/.xccurrentversion @@ -3,6 +3,6 @@ _XCCurrentVersionName - MeshtasticDataModelV12.xcdatamodel + MeshtasticDataModelV13.xcdatamodel diff --git a/Meshtastic/Meshtastic.xcdatamodeld/MeshtasticDataModelV13.xcdatamodel/contents b/Meshtastic/Meshtastic.xcdatamodeld/MeshtasticDataModelV13.xcdatamodel/contents new file mode 100644 index 00000000..b009f304 --- /dev/null +++ b/Meshtastic/Meshtastic.xcdatamodeld/MeshtasticDataModelV13.xcdatamodel/contents @@ -0,0 +1,339 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Meshtastic/Persistence/PositionEntityExtension.swift b/Meshtastic/Persistence/PositionEntityExtension.swift index d9079158..5f96575c 100644 --- a/Meshtastic/Persistence/PositionEntityExtension.swift +++ b/Meshtastic/Persistence/PositionEntityExtension.swift @@ -50,6 +50,7 @@ extension PositionEntity { var annotaton: MKPointAnnotation { let pointAnn = MKPointAnnotation() + if nodeCoordinate != nil { pointAnn.coordinate = nodeCoordinate! } diff --git a/Meshtastic/Persistence/UpdateCoreData.swift b/Meshtastic/Persistence/UpdateCoreData.swift index 696df7b5..f28fb5d5 100644 --- a/Meshtastic/Persistence/UpdateCoreData.swift +++ b/Meshtastic/Persistence/UpdateCoreData.swift @@ -325,6 +325,7 @@ func upsertDeviceConfigPacket(config: Meshtastic.Config.DeviceConfig, nodeNum: I newDeviceConfig.rebroadcastMode = Int32(config.rebroadcastMode.rawValue) newDeviceConfig.nodeInfoBroadcastSecs = Int32(config.nodeInfoBroadcastSecs) newDeviceConfig.doubleTapAsButtonPress = config.doubleTapAsButtonPress + newDeviceConfig.isManaged = config.isManaged fetchedNode[0].deviceConfig = newDeviceConfig } else { fetchedNode[0].deviceConfig?.role = Int32(config.role.rawValue) @@ -333,8 +334,9 @@ func upsertDeviceConfigPacket(config: Meshtastic.Config.DeviceConfig, nodeNum: I fetchedNode[0].deviceConfig?.buttonGpio = Int32(config.buttonGpio) fetchedNode[0].deviceConfig?.buzzerGpio = Int32(config.buzzerGpio) fetchedNode[0].deviceConfig?.rebroadcastMode = Int32(config.rebroadcastMode.rawValue) - fetchedNode[0].deviceConfig?.doubleTapAsButtonPress = config.doubleTapAsButtonPress fetchedNode[0].deviceConfig?.nodeInfoBroadcastSecs = Int32(config.nodeInfoBroadcastSecs) + fetchedNode[0].deviceConfig?.doubleTapAsButtonPress = config.doubleTapAsButtonPress + fetchedNode[0].deviceConfig?.isManaged = config.isManaged } do { try context.save() diff --git a/Meshtastic/Protobufs/meshtastic/config.pb.swift b/Meshtastic/Protobufs/meshtastic/config.pb.swift index 8c502d60..917fb889 100644 --- a/Meshtastic/Protobufs/meshtastic/config.pb.swift +++ b/Meshtastic/Protobufs/meshtastic/config.pb.swift @@ -181,6 +181,11 @@ struct Config { /// Treat double tap interrupt on supported accelerometers as a button press if set to true var doubleTapAsButtonPress: Bool = false + /// + /// If true, device is considered to be "managed" by a mesh administrator + /// Clients should then limit available configuration and administrative options inside the user interface + var isManaged: Bool = false + var unknownFields = SwiftProtobuf.UnknownStorage() /// @@ -1592,6 +1597,7 @@ extension Config.DeviceConfig: SwiftProtobuf.Message, SwiftProtobuf._MessageImpl 6: .standard(proto: "rebroadcast_mode"), 7: .standard(proto: "node_info_broadcast_secs"), 8: .standard(proto: "double_tap_as_button_press"), + 9: .standard(proto: "is_managed"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -1608,6 +1614,7 @@ extension Config.DeviceConfig: SwiftProtobuf.Message, SwiftProtobuf._MessageImpl case 6: try { try decoder.decodeSingularEnumField(value: &self.rebroadcastMode) }() case 7: try { try decoder.decodeSingularUInt32Field(value: &self.nodeInfoBroadcastSecs) }() case 8: try { try decoder.decodeSingularBoolField(value: &self.doubleTapAsButtonPress) }() + case 9: try { try decoder.decodeSingularBoolField(value: &self.isManaged) }() default: break } } @@ -1638,6 +1645,9 @@ extension Config.DeviceConfig: SwiftProtobuf.Message, SwiftProtobuf._MessageImpl if self.doubleTapAsButtonPress != false { try visitor.visitSingularBoolField(value: self.doubleTapAsButtonPress, fieldNumber: 8) } + if self.isManaged != false { + try visitor.visitSingularBoolField(value: self.isManaged, fieldNumber: 9) + } try unknownFields.traverse(visitor: &visitor) } @@ -1650,6 +1660,7 @@ extension Config.DeviceConfig: SwiftProtobuf.Message, SwiftProtobuf._MessageImpl if lhs.rebroadcastMode != rhs.rebroadcastMode {return false} if lhs.nodeInfoBroadcastSecs != rhs.nodeInfoBroadcastSecs {return false} if lhs.doubleTapAsButtonPress != rhs.doubleTapAsButtonPress {return false} + if lhs.isManaged != rhs.isManaged {return false} if lhs.unknownFields != rhs.unknownFields {return false} return true } diff --git a/Meshtastic/Views/Settings/AppSettings.swift b/Meshtastic/Views/Settings/AppSettings.swift index febb27e3..4310d105 100644 --- a/Meshtastic/Views/Settings/AppSettings.swift +++ b/Meshtastic/Views/Settings/AppSettings.swift @@ -16,6 +16,7 @@ struct AppSettings: View { @State var provideLocationInterval: Int = UserDefaults.provideLocationInterval @State private var isPresentingCoreDataResetConfirm = false @State private var isPresentingDeleteMapTilesConfirm = false + @State var selectedTileServer: MapTileServerLinks? = nil var body: some View { VStack { @@ -85,6 +86,27 @@ struct AppSettings: View { } Section(header: Text("App Data")) { + + Button { + isPresentingCoreDataResetConfirm = true + } label: { + Label("clear.app.data", systemImage: "trash") + .foregroundColor(.red) + } + .confirmationDialog( + "are.you.sure", + isPresented: $isPresentingCoreDataResetConfirm, + titleVisibility: .visible + ) { + Button("Erase all app data?", role: .destructive) { + bleManager.disconnectPeripheral() + clearCoreDataDatabase(context: context) + UserDefaults.standard.reset() + UserDefaults.standard.synchronize() + } + } + } + Section(header: Text("Map Tile Data")) { Button { isPresentingDeleteMapTilesConfirm = true } label: { @@ -102,23 +124,15 @@ struct AppSettings: View { print("delete all tiles") } } - - Button { - isPresentingCoreDataResetConfirm = true - } label: { - Label("clear.app.data", systemImage: "trash") - .foregroundColor(.red) - } - .confirmationDialog( - "are.you.sure", - isPresented: $isPresentingCoreDataResetConfirm, - titleVisibility: .visible - ) { - Button("Erase all app data?", role: .destructive) { - bleManager.disconnectPeripheral() - clearCoreDataDatabase(context: context) - UserDefaults.standard.reset() - UserDefaults.standard.synchronize() + ForEach(MapTileServerLinks.allCases, id: \.self) { tsl in + + Button { + tileManager.remove(for: tsl) + totalDownloadedTileSize = tileManager.getAllDownloadedSize() + } label: { + Label("Delete \(tsl.description) Tiles", systemImage: "trash") + .foregroundColor(.red) + .font(.footnote) } } } diff --git a/Meshtastic/Views/Settings/Config/DeviceConfig.swift b/Meshtastic/Views/Settings/Config/DeviceConfig.swift index a8d55d87..0dc8e05d 100644 --- a/Meshtastic/Views/Settings/Config/DeviceConfig.swift +++ b/Meshtastic/Views/Settings/Config/DeviceConfig.swift @@ -26,6 +26,7 @@ struct DeviceConfig: View { @State var debugLogEnabled = false @State var rebroadcastMode = 0 @State var doubleTapAsButtonPress = false + @State var isManaged = false var body: some View { @@ -88,6 +89,13 @@ struct DeviceConfig: View { .toggleStyle(SwitchToggleStyle(tint: .accentColor)) Text("Treat double tap on supported accelerometers as a user button press.") .font(.caption) + + Toggle(isOn: $isManaged) { + Label("Managed Device", systemImage: "gearshape.arrow.triangle.2.circlepath") + } + .toggleStyle(SwitchToggleStyle(tint: .accentColor)) + Text("Enabling Managed mode will restrict access to all radio configurations, such as short/long names, regions, channels, modules, etc. and will only be accessible through the Admin channel. To avoid being locked out, make sure the Admin channel is working properly before enabling it.") + .font(.caption) } Section(header: Text("Debug")) { @@ -217,6 +225,7 @@ struct DeviceConfig: View { dc.buzzerGpio = UInt32(buzzerGPIO) dc.rebroadcastMode = RebroadcastModes(rawValue: rebroadcastMode)?.protoEnumValue() ?? RebroadcastModes.all.protoEnumValue() dc.doubleTapAsButtonPress = doubleTapAsButtonPress + dc.isManaged = isManaged let adminMessageId = bleManager.saveDeviceConfig(config: dc, fromUser: connectedNode!.user!, toUser: node!.user!, adminIndex: connectedNode?.myInfo?.adminIndex ?? 0) if adminMessageId > 0 { @@ -295,12 +304,15 @@ struct DeviceConfig: View { } } .onChange(of: doubleTapAsButtonPress) { newDoubleTapAsButtonPress in - if node != nil && node!.deviceConfig != nil { - if newDoubleTapAsButtonPress != node!.deviceConfig!.doubleTapAsButtonPress { hasChanges = true } } } + .onChange(of: isManaged) { newIsManaged in + if node != nil && node!.deviceConfig != nil { + if newIsManaged != node!.deviceConfig!.isManaged { hasChanges = true } + } + } } func setDeviceValues() { self.deviceRole = Int(node?.deviceConfig?.role ?? 0) @@ -310,6 +322,7 @@ struct DeviceConfig: View { self.buzzerGPIO = Int(node?.deviceConfig?.buzzerGpio ?? 0) self.rebroadcastMode = Int(node?.deviceConfig?.rebroadcastMode ?? 0) self.doubleTapAsButtonPress = node?.deviceConfig?.doubleTapAsButtonPress ?? false + self.isManaged = node?.deviceConfig?.isManaged ?? false self.hasChanges = false } } diff --git a/Meshtastic/Views/Settings/Settings.swift b/Meshtastic/Views/Settings/Settings.swift index c7f3793b..3fa24d14 100644 --- a/Meshtastic/Views/Settings/Settings.swift +++ b/Meshtastic/Views/Settings/Settings.swift @@ -8,7 +8,7 @@ import SwiftUI struct Settings: View { - + @Environment(\.managedObjectContext) var context @EnvironmentObject var bleManager: BLEManager @FetchRequest(sortDescriptors: [NSSortDescriptor(key: "user.longName", ascending: true)], animation: .default) @@ -16,9 +16,9 @@ struct Settings: View { @State private var selectedNode: Int = 0 @State private var connectedNodeNum: Int = 0 @State private var initialLoad: Bool = true - + @State private var selection: SettingsSidebar = .about - + enum SettingsSidebar { case appSettings case shareChannels @@ -41,7 +41,7 @@ struct Settings: View { case adminMessageLog case about } - + var body: some View { NavigationSplitView { List { @@ -50,7 +50,7 @@ struct Settings: View { } label: { Image(systemName: "questionmark.app") .symbolRenderingMode(.hierarchical) - + Text("about.meshtastic") } .tag(SettingsSidebar.about) @@ -63,227 +63,231 @@ struct Settings: View { } .tag(SettingsSidebar.appSettings) let node = nodes.first(where: { $0.num == connectedNodeNum }) - Section("Configure") { - Picker("Configuring Node", selection: $selectedNode) { - if selectedNode == 0 { - Text("Connect to a Node").tag(0) - } - ForEach(nodes) { node in - if node.num == bleManager.connectedPeripheral?.num ?? 0 { - Text("BLE Config: \(node.user?.longName ?? "unknown".localized)") - .tag(Int(node.num)) - } else if node.metadata != nil { - Text("Remote Config: \(node.user?.longName ?? "unknown".localized)") - .tag(Int(node.num)) - } else { - Text("Request Admin: \(node.user?.longName ?? "unknown".localized)") - .tag(Int(node.num)) + if !(node?.deviceConfig?.isManaged ?? false) { + + Section("Configure") { + Picker("Configuring Node", selection: $selectedNode) { + if selectedNode == 0 { + Text("Connect to a Node").tag(0) + } + ForEach(nodes) { node in + if node.num == bleManager.connectedPeripheral?.num ?? 0 { + Text("BLE Config: \(node.user?.longName ?? "unknown".localized)") + .tag(Int(node.num)) + } else if node.metadata != nil { + Text("Remote Config: \(node.user?.longName ?? "unknown".localized)") + .tag(Int(node.num)) + } else { + Text("Request Admin: \(node.user?.longName ?? "unknown".localized)") + .tag(Int(node.num)) + } } } - } - .pickerStyle(.automatic) - .labelsHidden() - .onChange(of: selectedNode) { newValue in - if selectedNode > 0 { - let node = nodes.first(where: { $0.num == newValue }) - let connectedNode = nodes.first(where: { $0.num == connectedNodeNum }) - connectedNodeNum = Int(bleManager.connectedPeripheral != nil ? bleManager.connectedPeripheral?.num ?? 0 : 0) - - if connectedNode != nil && node?.metadata == nil { - let adminMessageId = bleManager.requestDeviceMetadata(fromUser: connectedNode!.user!, toUser: node!.user!, adminIndex: connectedNode!.myInfo!.adminIndex, context: context) - - if adminMessageId > 0 { - print("Sent node metadata request from node details") + .pickerStyle(.automatic) + .labelsHidden() + .onChange(of: selectedNode) { newValue in + if selectedNode > 0 { + let node = nodes.first(where: { $0.num == newValue }) + let connectedNode = nodes.first(where: { $0.num == connectedNodeNum }) + connectedNodeNum = Int(bleManager.connectedPeripheral != nil ? bleManager.connectedPeripheral?.num ?? 0 : 0) + + if connectedNode != nil && node?.metadata == nil { + let adminMessageId = bleManager.requestDeviceMetadata(fromUser: connectedNode!.user!, toUser: node!.user!, adminIndex: connectedNode!.myInfo!.adminIndex, context: context) + + if adminMessageId > 0 { + print("Sent node metadata request from node details") + } } } } } - } - Section("radio.configuration") { - - NavigationLink { - ShareChannels(node: nodes.first(where: { $0.num == connectedNodeNum })) - } label: { - Image(systemName: "qrcode") - .symbolRenderingMode(.hierarchical) - Text("share.channels") + Section("radio.configuration") { + + NavigationLink { + ShareChannels(node: nodes.first(where: { $0.num == connectedNodeNum })) + } label: { + Image(systemName: "qrcode") + .symbolRenderingMode(.hierarchical) + Text("share.channels") + } + .tag(SettingsSidebar.shareChannels) + .disabled(selectedNode > 0 && selectedNode != connectedNodeNum) + + NavigationLink { + UserConfig(node: nodes.first(where: { $0.num == selectedNode })) + } label: { + + Image(systemName: "person.crop.rectangle.fill") + .symbolRenderingMode(.hierarchical) + Text("user") + } + .tag(SettingsSidebar.userConfig) + + NavigationLink { + LoRaConfig(node: nodes.first(where: { $0.num == selectedNode })) + } label: { + Image(systemName: "dot.radiowaves.left.and.right") + .symbolRenderingMode(.hierarchical) + Text("lora") + } + .tag(SettingsSidebar.loraConfig) + + NavigationLink { + Channels(node: nodes.first(where: { $0.num == connectedNodeNum })) + } label: { + Image(systemName: "fibrechannel") + .symbolRenderingMode(.hierarchical) + Text("channels") + } + .tag(SettingsSidebar.channelConfig) + .disabled(selectedNode > 0 && selectedNode != connectedNodeNum) + + NavigationLink { + BluetoothConfig(node: nodes.first(where: { $0.num == selectedNode })) + } label: { + Image(systemName: "antenna.radiowaves.left.and.right") + .symbolRenderingMode(.hierarchical) + Text("bluetooth") + } + .tag(SettingsSidebar.bluetoothConfig) + + NavigationLink { + DeviceConfig(node: nodes.first(where: { $0.num == selectedNode })) + } label: { + Image(systemName: "flipphone") + .symbolRenderingMode(.hierarchical) + Text("device") + } + .tag(SettingsSidebar.deviceConfig) + + NavigationLink { + DisplayConfig(node: nodes.first(where: { $0.num == selectedNode })) + } label: { + Image(systemName: "display") + .symbolRenderingMode(.hierarchical) + Text("display") + } + .tag(SettingsSidebar.displayConfig) + + NavigationLink { + NetworkConfig(node: nodes.first(where: { $0.num == selectedNode })) + } label: { + + Image(systemName: "network") + .symbolRenderingMode(.hierarchical) + Text("network") + } + .tag(SettingsSidebar.networkConfig) + + NavigationLink { + PositionConfig(node: nodes.first(where: { $0.num == selectedNode })) + } label: { + + Image(systemName: "location") + .symbolRenderingMode(.hierarchical) + Text("position") + } + .tag(SettingsSidebar.positionConfig) + } - .tag(SettingsSidebar.shareChannels) - .disabled(selectedNode > 0 && selectedNode != connectedNodeNum) - - NavigationLink { - UserConfig(node: nodes.first(where: { $0.num == selectedNode })) - } label: { - - Image(systemName: "person.crop.rectangle.fill") - .symbolRenderingMode(.hierarchical) - Text("user") + Section("module.configuration") { + + NavigationLink { + CannedMessagesConfig(node: nodes.first(where: { $0.num == selectedNode })) + } label: { + + Image(systemName: "list.bullet.rectangle.fill") + .symbolRenderingMode(.hierarchical) + + Text("canned.messages") + } + .tag(SettingsSidebar.cannedMessagesConfig) + + NavigationLink { + ExternalNotificationConfig(node: nodes.first(where: { $0.num == selectedNode })) + } label: { + Image(systemName: "megaphone") + .symbolRenderingMode(.hierarchical) + Text("external.notification") + } + .tag(SettingsSidebar.externalNotificationConfig) + + NavigationLink { + MQTTConfig(node: nodes.first(where: { $0.num == selectedNode })) + } label: { + Image(systemName: "dot.radiowaves.right") + .symbolRenderingMode(.hierarchical) + Text("mqtt") + } + .tag(SettingsSidebar.mqttConfig) + + NavigationLink { + RangeTestConfig(node: nodes.first(where: { $0.num == selectedNode })) + } label: { + Image(systemName: "point.3.connected.trianglepath.dotted") + .symbolRenderingMode(.hierarchical) + Text("range.test") + } + NavigationLink { + RtttlConfig(node: nodes.first(where: { $0.num == selectedNode })) + } label: { + Image(systemName: "music.note.list") + .symbolRenderingMode(.hierarchical) + Text("ringtone") + } + .tag(SettingsSidebar.ringtoneConfig) + + NavigationLink { + SerialConfig(node: nodes.first(where: { $0.num == selectedNode })) + } label: { + Image(systemName: "terminal") + .symbolRenderingMode(.hierarchical) + Text("serial") + } + .tag(SettingsSidebar.serialConfig) + + NavigationLink { + TelemetryConfig(node: nodes.first(where: { $0.num == selectedNode })) + } label: { + Image(systemName: "chart.xyaxis.line") + .symbolRenderingMode(.hierarchical) + Text("telemetry") + } + .tag(SettingsSidebar.telemetryConfig) } - .tag(SettingsSidebar.userConfig) - - NavigationLink { - LoRaConfig(node: nodes.first(where: { $0.num == selectedNode })) - } label: { - Image(systemName: "dot.radiowaves.left.and.right") - .symbolRenderingMode(.hierarchical) - Text("lora") + + Section(header: Text("logging")) { + NavigationLink { + MeshLog() + } label: { + Image(systemName: "list.bullet.rectangle") + .symbolRenderingMode(.hierarchical) + Text("mesh.log") + } + .tag(SettingsSidebar.meshLog) + + NavigationLink { + let connectedNode = nodes.first(where: { $0.num == connectedNodeNum }) + AdminMessageList(user: connectedNode?.user) + } label: { + Image(systemName: "building.columns") + .symbolRenderingMode(.hierarchical) + Text("admin.log") + } + .tag(SettingsSidebar.adminMessageLog) } - .tag(SettingsSidebar.loraConfig) - - NavigationLink { - Channels(node: nodes.first(where: { $0.num == connectedNodeNum })) - } label: { - Image(systemName: "fibrechannel") - .symbolRenderingMode(.hierarchical) - Text("channels") + Section(header: Text("Firmware")) { + NavigationLink { + Firmware(node: nodes.first(where: { $0.num == connectedNodeNum })) + } label: { + Image(systemName: "arrow.up.arrow.down.square") + .symbolRenderingMode(.hierarchical) + + Text("Firmware Updates") + } + .tag(SettingsSidebar.about) + .disabled(selectedNode > 0 && selectedNode != connectedNodeNum) } - .tag(SettingsSidebar.channelConfig) - .disabled(selectedNode > 0 && selectedNode != connectedNodeNum) - - NavigationLink { - BluetoothConfig(node: nodes.first(where: { $0.num == selectedNode })) - } label: { - Image(systemName: "antenna.radiowaves.left.and.right") - .symbolRenderingMode(.hierarchical) - Text("bluetooth") - } - .tag(SettingsSidebar.bluetoothConfig) - - NavigationLink { - DeviceConfig(node: nodes.first(where: { $0.num == selectedNode })) - } label: { - Image(systemName: "flipphone") - .symbolRenderingMode(.hierarchical) - Text("device") - } - .tag(SettingsSidebar.deviceConfig) - - NavigationLink { - DisplayConfig(node: nodes.first(where: { $0.num == selectedNode })) - } label: { - Image(systemName: "display") - .symbolRenderingMode(.hierarchical) - Text("display") - } - .tag(SettingsSidebar.displayConfig) - - NavigationLink { - NetworkConfig(node: nodes.first(where: { $0.num == selectedNode })) - } label: { - - Image(systemName: "network") - .symbolRenderingMode(.hierarchical) - Text("network") - } - .tag(SettingsSidebar.networkConfig) - - NavigationLink { - PositionConfig(node: nodes.first(where: { $0.num == selectedNode })) - } label: { - - Image(systemName: "location") - .symbolRenderingMode(.hierarchical) - Text("position") - } - .tag(SettingsSidebar.positionConfig) - - } - Section("module.configuration") { - - NavigationLink { - CannedMessagesConfig(node: nodes.first(where: { $0.num == selectedNode })) - } label: { - - Image(systemName: "list.bullet.rectangle.fill") - .symbolRenderingMode(.hierarchical) - - Text("canned.messages") - } - .tag(SettingsSidebar.cannedMessagesConfig) - - NavigationLink { - ExternalNotificationConfig(node: nodes.first(where: { $0.num == selectedNode })) - } label: { - Image(systemName: "megaphone") - .symbolRenderingMode(.hierarchical) - Text("external.notification") - } - .tag(SettingsSidebar.externalNotificationConfig) - - NavigationLink { - MQTTConfig(node: nodes.first(where: { $0.num == selectedNode })) - } label: { - Image(systemName: "dot.radiowaves.right") - .symbolRenderingMode(.hierarchical) - Text("mqtt") - } - .tag(SettingsSidebar.mqttConfig) - - NavigationLink { - RangeTestConfig(node: nodes.first(where: { $0.num == selectedNode })) - } label: { - Image(systemName: "point.3.connected.trianglepath.dotted") - .symbolRenderingMode(.hierarchical) - Text("range.test") - } - NavigationLink { - RtttlConfig(node: nodes.first(where: { $0.num == selectedNode })) - } label: { - Image(systemName: "music.note.list") - .symbolRenderingMode(.hierarchical) - Text("ringtone") - } - .tag(SettingsSidebar.ringtoneConfig) - - NavigationLink { - SerialConfig(node: nodes.first(where: { $0.num == selectedNode })) - } label: { - Image(systemName: "terminal") - .symbolRenderingMode(.hierarchical) - Text("serial") - } - .tag(SettingsSidebar.serialConfig) - - NavigationLink { - TelemetryConfig(node: nodes.first(where: { $0.num == selectedNode })) - } label: { - Image(systemName: "chart.xyaxis.line") - .symbolRenderingMode(.hierarchical) - Text("telemetry") - } - .tag(SettingsSidebar.telemetryConfig) - } - Section(header: Text("logging")) { - NavigationLink { - MeshLog() - } label: { - Image(systemName: "list.bullet.rectangle") - .symbolRenderingMode(.hierarchical) - Text("mesh.log") - } - .tag(SettingsSidebar.meshLog) - - NavigationLink { - let connectedNode = nodes.first(where: { $0.num == connectedNodeNum }) - AdminMessageList(user: connectedNode?.user) - } label: { - Image(systemName: "building.columns") - .symbolRenderingMode(.hierarchical) - Text("admin.log") - } - .tag(SettingsSidebar.adminMessageLog) - } - Section(header: Text("Firmware")) { - NavigationLink { - Firmware(node: nodes.first(where: { $0.num == connectedNodeNum })) - } label: { - Image(systemName: "arrow.up.arrow.down.square") - .symbolRenderingMode(.hierarchical) - - Text("Firmware Updates") - } - .tag(SettingsSidebar.about) - .disabled(selectedNode > 0 && selectedNode != connectedNodeNum) } } .onAppear { @@ -297,11 +301,11 @@ struct Settings: View { .listStyle(GroupedListStyle()) .navigationTitle("settings") .navigationBarItems(leading: - MeshtasticLogo() + MeshtasticLogo() ) } - detail: { - Text("select.menu.item") - } + detail: { + Text("select.menu.item") + } } } diff --git a/en.lproj/Localizable.strings b/en.lproj/Localizable.strings index 80820174..040aa124 100644 --- a/en.lproj/Localizable.strings +++ b/en.lproj/Localizable.strings @@ -139,7 +139,7 @@ "map"="Mesh Map"; "map.type"="Default Type"; "map.centering"="Centering Mode"; -"map.tiles.delete"="Delete Map Tiles"; +"map.tiles.delete"="Delete All Map Tiles"; "map.recentering"="Automatic Re-centering"; "map.usertrackingmode"="User tracking mode"; "map.usertrackingmode.follow"="Follow";